Repository: incubator-mynewt-core Updated Branches: refs/heads/develop ec1af7e76 -> fda3dd6f3 refs/heads/sterly_refactor 0c0f3e129 -> 5d11ead1a
newtmgr; move defs to default commands to nmgr os package header file. 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/895d567e Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/895d567e Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/895d567e Branch: refs/heads/sterly_refactor Commit: 895d567e2862ead08375c41e3f4c731c512baab8 Parents: 7dc40e7 Author: Marko Kiiskila <ma...@runtime.io> Authored: Mon Sep 19 14:40:35 2016 -0700 Committer: Marko Kiiskila <ma...@runtime.io> Committed: Mon Sep 19 14:40:35 2016 -0700 ---------------------------------------------------------------------- libs/newtmgr/include/newtmgr/newtmgr.h | 11 ----------- libs/newtmgr/os/include/nmgr_os/nmgr_os.h | 10 ++++++++++ libs/newtmgr/os/src/newtmgr_os.c | 2 ++ 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/895d567e/libs/newtmgr/include/newtmgr/newtmgr.h ---------------------------------------------------------------------- diff --git a/libs/newtmgr/include/newtmgr/newtmgr.h b/libs/newtmgr/include/newtmgr/newtmgr.h index 85e6c44..ab84806 100644 --- a/libs/newtmgr/include/newtmgr/newtmgr.h +++ b/libs/newtmgr/include/newtmgr/newtmgr.h @@ -61,17 +61,6 @@ #define NMGR_ERR_ENOENT (5) #define NMGR_ERR_EPERUSER (256) - -/* - * Id's for default group commands - */ -#define NMGR_ID_ECHO 0 -#define NMGR_ID_CONS_ECHO_CTRL 1 -#define NMGR_ID_TASKSTATS 2 -#define NMGR_ID_MPSTATS 3 -#define NMGR_ID_DATETIME_STR 4 -#define NMGR_ID_RESET 5 - struct nmgr_hdr { uint8_t nh_op; /* NMGR_OP_XXX */ uint8_t nh_flags; http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/895d567e/libs/newtmgr/os/include/nmgr_os/nmgr_os.h ---------------------------------------------------------------------- diff --git a/libs/newtmgr/os/include/nmgr_os/nmgr_os.h b/libs/newtmgr/os/include/nmgr_os/nmgr_os.h index 2c89237..49b6725 100644 --- a/libs/newtmgr/os/include/nmgr_os/nmgr_os.h +++ b/libs/newtmgr/os/include/nmgr_os/nmgr_os.h @@ -20,6 +20,16 @@ #ifndef _NMGR_OS_H_ #define _NMGR_OS_H_ +/* + * Id's for OS group commands + */ +#define NMGR_ID_ECHO 0 +#define NMGR_ID_CONS_ECHO_CTRL 1 +#define NMGR_ID_TASKSTATS 2 +#define NMGR_ID_MPSTATS 3 +#define NMGR_ID_DATETIME_STR 4 +#define NMGR_ID_RESET 5 + int nmgr_os_groups_register(void); #endif /* _NMGR_OS_H_ */ http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/895d567e/libs/newtmgr/os/src/newtmgr_os.c ---------------------------------------------------------------------- diff --git a/libs/newtmgr/os/src/newtmgr_os.c b/libs/newtmgr/os/src/newtmgr_os.c index 88b6553..cab692b 100644 --- a/libs/newtmgr/os/src/newtmgr_os.c +++ b/libs/newtmgr/os/src/newtmgr_os.c @@ -32,6 +32,8 @@ #include <util/datetime.h> #include <reboot/log_reboot.h> +#include "nmgr_os/nmgr_os.h" + static struct os_callout_func nmgr_reset_callout; static int nmgr_def_echo(struct nmgr_jbuf *);