You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/11/08 00:13:53 UTC
[1/2] incubator-mynewt-core git commit: kernel/os;
remove obsolete macro from os_callout.h
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop fcc53ee44 -> 06c02a55d
kernel/os; remove obsolete macro from os_callout.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/b982aadc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/b982aadc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/b982aadc
Branch: refs/heads/develop
Commit: b982aadca1d67ead266e8ade39a577ded0a6f5cd
Parents: fcc53ee
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Nov 7 16:11:54 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Nov 7 16:11:54 2016 -0800
----------------------------------------------------------------------
kernel/os/include/os/os_callout.h | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/b982aadc/kernel/os/include/os/os_callout.h
----------------------------------------------------------------------
diff --git a/kernel/os/include/os/os_callout.h b/kernel/os/include/os/os_callout.h
index a56654f..3d4e162 100644
--- a/kernel/os/include/os/os_callout.h
+++ b/kernel/os/include/os/os_callout.h
@@ -36,8 +36,6 @@ struct os_callout {
TAILQ_ENTRY(os_callout) c_next;
};
-#define CF_ARG(__cf) ((__cf)->cf_c.c_ev.ev_arg)
-
void os_callout_init(struct os_callout *cf, struct os_eventq *evq,
os_event_fn *ev_cb, void *ev_arg);
void os_callout_stop(struct os_callout *);
[2/2] incubator-mynewt-core git commit: inet_def_service; fix build
Posted by ma...@apache.org.
inet_def_service; fix build
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/06c02a55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/06c02a55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/06c02a55
Branch: refs/heads/develop
Commit: 06c02a55d1771da3e193e18de503a9f831c5c2d0
Parents: b982aad
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Nov 7 16:12:50 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Nov 7 16:12:50 2016 -0800
----------------------------------------------------------------------
.../include/inet_def_service/inet_def_service.h | 3 +--
net/ip/inet_def_service/src/inet_def_service.c | 13 ++++---------
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/06c02a55/net/ip/inet_def_service/include/inet_def_service/inet_def_service.h
----------------------------------------------------------------------
diff --git a/net/ip/inet_def_service/include/inet_def_service/inet_def_service.h b/net/ip/inet_def_service/include/inet_def_service/inet_def_service.h
index eae144c..b78547a 100644
--- a/net/ip/inet_def_service/include/inet_def_service/inet_def_service.h
+++ b/net/ip/inet_def_service/include/inet_def_service/inet_def_service.h
@@ -26,8 +26,7 @@ extern "C" {
struct os_eventq;
-void inet_def_evq_set(struct os_eventq *evq);
-void inet_def_service_init(void);
+void inet_def_service_init(struct os_eventq *evq);
#ifdef __cplusplus
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/06c02a55/net/ip/inet_def_service/src/inet_def_service.c
----------------------------------------------------------------------
diff --git a/net/ip/inet_def_service/src/inet_def_service.c b/net/ip/inet_def_service/src/inet_def_service.c
index 5e082e5..f5fc037 100644
--- a/net/ip/inet_def_service/src/inet_def_service.c
+++ b/net/ip/inet_def_service/src/inet_def_service.c
@@ -102,16 +102,9 @@ static struct inet_def {
static struct os_eventq *
inet_def_evq_get(void)
{
- os_eventq_ensure(&inet_def_evq, inet_def_event_start);
return inet_def_evq;
}
-void
-inet_def_evq_set(struct os_eventq *evq)
-{
- os_eventq_designate(&inet_def_evq, evq, inet_def_event_start);
-}
-
/*
* UDP socket callbacks. Called in context of IP stack task.
*/
@@ -375,7 +368,7 @@ inet_def_event_chargen(struct os_event *ev)
}
static void
-inet_def_event_start(struct os_event *ev)
+inet_def_event_start(void)
{
inet_def_create_srv(INET_DEF_ECHO, ECHO_PORT);
inet_def_create_srv(INET_DEF_DISCARD, DISCARD_PORT);
@@ -383,8 +376,10 @@ inet_def_event_start(struct os_event *ev)
}
void
-inet_def_service_init(void)
+inet_def_service_init(struct os_eventq *evq)
{
+ inet_def_evq = evq;
+ os_eventq_ensure(&inet_def_evq, NULL);
SLIST_INIT(&inet_def.tcp_conns);
}