Repository: incubator-mynewt-core Updated Branches: refs/heads/develop 2ee49799d -> 8cf9cf31c
newtmgr/oicmgr; export g_mgmt_evq. 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/c24d16d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c24d16d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c24d16d7 Branch: refs/heads/develop Commit: c24d16d79ef7e8e06b95d398eb44189e2bfa8202 Parents: abcd250 Author: Marko Kiiskila <ma...@runtime.io> Authored: Fri Oct 7 08:46:53 2016 -0700 Committer: Marko Kiiskila <ma...@runtime.io> Committed: Fri Oct 7 13:21:22 2016 -0700 ---------------------------------------------------------------------- mgmt/newtmgr/src/newtmgr.c | 11 ++++++----- mgmt/oicmgr/src/oicmgr.c | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c24d16d7/mgmt/newtmgr/src/newtmgr.c ---------------------------------------------------------------------- diff --git a/mgmt/newtmgr/src/newtmgr.c b/mgmt/newtmgr/src/newtmgr.c index 15ba79a..2feca5d 100644 --- a/mgmt/newtmgr/src/newtmgr.c +++ b/mgmt/newtmgr/src/newtmgr.c @@ -32,7 +32,8 @@ os_stack_t newtmgr_stack[OS_STACK_ALIGN(MYNEWT_VAL(NEWTMGR_STACK_SIZE))]; -static struct os_eventq g_nmgr_evq; +static struct os_eventq nmgr_evq; +struct os_eventq *g_mgmt_evq = &nmgr_evq; static struct os_task g_nmgr_task; /* @@ -432,7 +433,7 @@ nmgr_task(void *arg) nmgr_jbuf_init(&nmgr_task_jbuf); while (1) { - ev = os_eventq_get(&g_nmgr_evq); + ev = os_eventq_get(&nmgr_evq); switch (ev->ev_type) { case OS_EVENT_T_MQUEUE_DATA: nt = (struct nmgr_transport *) ev->ev_arg; @@ -482,7 +483,7 @@ nmgr_rx_req(struct nmgr_transport *nt, struct os_mbuf *req) { int rc; - rc = os_mqueue_put(&nt->nt_imq, &g_nmgr_evq, req); + rc = os_mqueue_put(&nt->nt_imq, &nmgr_evq, req); if (rc != 0) { os_mbuf_free_chain(req); } @@ -495,7 +496,7 @@ nmgr_task_init(void) { int rc; - os_eventq_init(&g_nmgr_evq); + os_eventq_init(&nmgr_evq); rc = os_task_init(&g_nmgr_task, "newtmgr", nmgr_task, NULL, MYNEWT_VAL(NEWTMGR_TASK_PRIO), OS_WAIT_FOREVER, @@ -504,7 +505,7 @@ nmgr_task_init(void) goto err; } - rc = nmgr_os_groups_register(&g_nmgr_evq); + rc = nmgr_os_groups_register(); if (rc != 0) { goto err; } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c24d16d7/mgmt/oicmgr/src/oicmgr.c ---------------------------------------------------------------------- diff --git a/mgmt/oicmgr/src/oicmgr.c b/mgmt/oicmgr/src/oicmgr.c index 811e9fe..4fde423 100644 --- a/mgmt/oicmgr/src/oicmgr.c +++ b/mgmt/oicmgr/src/oicmgr.c @@ -59,6 +59,7 @@ static struct omgr_state omgr_state = { .os_oc_timer.c_ev.ev_type = OMGR_OC_TIMER, .os_oc_timer.c_evq = &omgr_state.os_evq }; +struct os_eventq *g_mgmt_evq = &omgr_state.os_evq; static os_stack_t oicmgr_stack[OICMGR_STACK_SZ]; @@ -369,7 +370,7 @@ oicmgr_init(void) goto err; } - rc = nmgr_os_groups_register(&o->os_evq); + rc = nmgr_os_groups_register(); if (rc != 0) { goto err; }
