You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/11/10 22:39:18 UTC
[11/50] [abbrv] incubator-mynewt-core git commit: inet_def_service;
fix build
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/master
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);
}