boot_serial; has it's own copy of nmgr_hdr. Update to match mgmt/newtmgr.
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/06cdc215 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/06cdc215 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/06cdc215 Branch: refs/heads/develop Commit: 06cdc215b4d38760304ed0cdc6d117bb1e69ffad Parents: 938101b Author: Marko Kiiskila <ma...@runtime.io> Authored: Thu Feb 9 15:28:07 2017 -0800 Committer: Marko Kiiskila <ma...@runtime.io> Committed: Thu Feb 9 15:28:07 2017 -0800 ---------------------------------------------------------------------- boot/boot_serial/src/boot_serial_priv.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/06cdc215/boot/boot_serial/src/boot_serial_priv.h ---------------------------------------------------------------------- diff --git a/boot/boot_serial/src/boot_serial_priv.h b/boot/boot_serial/src/boot_serial_priv.h index 3888fdd..04bf414 100644 --- a/boot/boot_serial/src/boot_serial_priv.h +++ b/boot/boot_serial/src/boot_serial_priv.h @@ -41,8 +41,6 @@ extern "C" { #define NMGR_OP_READ 0 #define NMGR_OP_WRITE 2 -#define NMGR_F_CBOR_RSP_COMPLETE 0x01 - #define MGMT_GROUP_ID_DEFAULT 0 #define MGMT_GROUP_ID_IMAGE 1 @@ -50,7 +48,14 @@ extern "C" { #define NMGR_ID_RESET 5 struct nmgr_hdr { - uint8_t nh_op; /* NMGR_OP_XXX */ +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + uint8_t nh_op:3; /* NMGR_OP_XXX */ + uint8_t _res1:5; +#endif +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + uint8_t _res1:5; + uint8_t nh_op:3; /* NMGR_OP_XXX */ +#endif uint8_t nh_flags; uint16_t nh_len; /* length of the payload */ uint16_t nh_group; /* NMGR_GROUP_XXX */