This is an automated email from the ASF dual-hosted git repository. sjanc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 6401af2081aa433b13840ae1814972c414d93d80 Author: Szymon Janc <[email protected]> AuthorDate: Mon Oct 12 15:11:33 2026 +0200 mgmt/mcumgr: Fix coding style This makes code imported from apache-mynewt-mcumgr repository (mcumgr packages and smp_svr and omp_svr sample applications) compliant with clang-format coding style. No functional changes. Assisted-by: Claude:claude-opus-5-5 --- apps/omp_svr/src/gatt_svr.c | 14 +- apps/omp_svr/src/main.c | 105 +++++++-------- apps/omp_svr/src/misc.c | 4 +- apps/omp_svr/src/omp_svr.h | 12 +- apps/smp_svr/src/gatt_svr.c | 77 ++++++----- apps/smp_svr/src/main.c | 60 ++++----- apps/smp_svr/src/smp_svr.h | 12 +- mgmt/mcumgr/cmd/fs_mgmt/include/fs_mgmt/fs_mgmt.h | 4 +- mgmt/mcumgr/cmd/fs_mgmt/src/fs_mgmt.c | 70 +++++----- mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/image.h | 24 ++-- .../cmd/img_mgmt/include/img_mgmt/img_mgmt.h | 84 ++++++------ .../cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c | 24 ++-- .../img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c | 8 +- mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt.c | 47 ++++--- mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_priv.h | 2 +- mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c | 34 ++--- .../cmd/log_mgmt/include/log_mgmt/log_mgmt.h | 29 ++-- mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c | 147 ++++++++++----------- mgmt/mcumgr/cmd/os_mgmt/include/os_mgmt/os_mgmt.h | 16 +-- mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c | 7 +- .../cmd/stat_mgmt/include/stat_mgmt/stat_mgmt.h | 6 +- mgmt/mcumgr/cmd/stat_mgmt/src/stat_mgmt.c | 23 ++-- mgmt/mcumgr/mgmt/include/mgmt/endian.h | 4 +- mgmt/mcumgr/mgmt/include/mgmt/mgmt.h | 97 +++++++------- mgmt/mcumgr/mgmt/src/mgmt.c | 9 +- mgmt/mcumgr/omp/include/omp/omp.h | 5 +- mgmt/mcumgr/omp/include/omp/omp_priv.h | 6 +- mgmt/mcumgr/omp/src/omp.c | 7 +- mgmt/mcumgr/smp/src/smp.c | 14 +- 29 files changed, 432 insertions(+), 519 deletions(-) diff --git a/apps/omp_svr/src/gatt_svr.c b/apps/omp_svr/src/gatt_svr.c index ec74376bf..ceae6cdcc 100644 --- a/apps/omp_svr/src/gatt_svr.c +++ b/apps/omp_svr/src/gatt_svr.c @@ -33,22 +33,20 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) switch (ctxt->op) { case BLE_GATT_REGISTER_OP_SVC: MODLOG_DFLT(DEBUG, "registered service %s with handle=%d\n", - ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf), - ctxt->svc.handle); + ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf), ctxt->svc.handle); break; case BLE_GATT_REGISTER_OP_CHR: - MODLOG_DFLT(DEBUG, "registering characteristic %s with " - "def_handle=%d val_handle=%d\n", + MODLOG_DFLT(DEBUG, + "registering characteristic %s with " + "def_handle=%d val_handle=%d\n", ble_uuid_to_str(ctxt->chr.chr_def->uuid, buf), - ctxt->chr.def_handle, - ctxt->chr.val_handle); + ctxt->chr.def_handle, ctxt->chr.val_handle); break; case BLE_GATT_REGISTER_OP_DSC: MODLOG_DFLT(DEBUG, "registering descriptor %s with handle=%d\n", - ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf), - ctxt->dsc.handle); + ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf), ctxt->dsc.handle); break; default: diff --git a/apps/omp_svr/src/main.c b/apps/omp_svr/src/main.c index 367e177d7..1bb375597 100644 --- a/apps/omp_svr/src/main.c +++ b/apps/omp_svr/src/main.c @@ -54,14 +54,14 @@ #endif /* !ARCH_sim */ /* Task 1 */ -#define TASK1_PRIO (8) -#define TASK1_STACK_SIZE OS_STACK_ALIGN(192) +#define TASK1_PRIO (8) +#define TASK1_STACK_SIZE OS_STACK_ALIGN(192) static struct os_task task1; static volatile int g_task1_loops; /* Task 2 */ -#define TASK2_PRIO (9) -#define TASK2_STACK_SIZE OS_STACK_ALIGN(64) +#define TASK2_PRIO (9) +#define TASK2_STACK_SIZE OS_STACK_ALIGN(64) static struct os_task task2; static volatile int g_task2_loops; @@ -73,28 +73,26 @@ static struct os_sem g_test_sem; static int g_led_pin; STATS_SECT_START(gpio_stats) -STATS_SECT_ENTRY(toggles) + STATS_SECT_ENTRY(toggles) STATS_SECT_END static STATS_SECT_DECL(gpio_stats) g_stats_gpio_toggle; STATS_NAME_START(gpio_stats) -STATS_NAME(gpio_stats, toggles) + STATS_NAME(gpio_stats, toggles) STATS_NAME_END(gpio_stats) static char *test_conf_get(int argc, char **argv, char *val, int max_len); static int test_conf_set(int argc, char **argv, char *val); static int test_conf_commit(void); static int test_conf_export(void (*export_func)(char *name, char *val), - enum conf_export_tgt tgt); - -static struct conf_handler test_conf_handler = { - .ch_name = "test", - .ch_get = test_conf_get, - .ch_set = test_conf_set, - .ch_commit = test_conf_commit, - .ch_export = test_conf_export -}; + enum conf_export_tgt tgt); + +static struct conf_handler test_conf_handler = { .ch_name = "test", + .ch_get = test_conf_get, + .ch_set = test_conf_set, + .ch_commit = test_conf_commit, + .ch_export = test_conf_export }; static uint8_t test8; static uint8_t test8_shadow; @@ -154,24 +152,21 @@ static int omp_svr_gap_event(struct ble_gap_event *event, void *arg); static void omp_svr_print_conn_desc(struct ble_gap_conn_desc *desc) { - MODLOG_DFLT(INFO, "handle=%d our_ota_addr_type=%d our_ota_addr=", - desc->conn_handle, desc->our_ota_addr.type); + MODLOG_DFLT(INFO, "handle=%d our_ota_addr_type=%d our_ota_addr=", desc->conn_handle, + desc->our_ota_addr.type); print_addr(desc->our_ota_addr.val); - MODLOG_DFLT(INFO, " our_id_addr_type=%d our_id_addr=", - desc->our_id_addr.type); + MODLOG_DFLT(INFO, " our_id_addr_type=%d our_id_addr=", desc->our_id_addr.type); print_addr(desc->our_id_addr.val); - MODLOG_DFLT(INFO, " peer_ota_addr_type=%d peer_ota_addr=", - desc->peer_ota_addr.type); + MODLOG_DFLT(INFO, + " peer_ota_addr_type=%d peer_ota_addr=", desc->peer_ota_addr.type); print_addr(desc->peer_ota_addr.val); - MODLOG_DFLT(INFO, " peer_id_addr_type=%d peer_id_addr=", - desc->peer_id_addr.type); + MODLOG_DFLT(INFO, " peer_id_addr_type=%d peer_id_addr=", desc->peer_id_addr.type); print_addr(desc->peer_id_addr.val); - MODLOG_DFLT(INFO, " conn_itvl=%d conn_latency=%d supervision_timeout=%d " + MODLOG_DFLT(INFO, + " conn_itvl=%d conn_latency=%d supervision_timeout=%d " "encrypted=%d authenticated=%d bonded=%d\n", - desc->conn_itvl, desc->conn_latency, - desc->supervision_timeout, - desc->sec_state.encrypted, - desc->sec_state.authenticated, + desc->conn_itvl, desc->conn_latency, desc->supervision_timeout, + desc->sec_state.encrypted, desc->sec_state.authenticated, desc->sec_state.bonded); } @@ -210,8 +205,7 @@ omp_svr_advertise(void) * o Discoverability in forthcoming advertisement (general) * o BLE-only (BR/EDR unsupported). */ - fields.flags = BLE_HS_ADV_F_DISC_GEN | - BLE_HS_ADV_F_BREDR_UNSUP; + fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP; /* Indicate that the TX power level field should be included; have the * stack fill this value automatically. This is done by assiging the @@ -225,9 +219,7 @@ omp_svr_advertise(void) fields.name_len = strlen(name); fields.name_is_complete = 1; - fields.uuids16 = (ble_uuid16_t[]){ - BLE_UUID16_INIT(GATT_SVR_SVC_ALERT_UUID) - }; + fields.uuids16 = (ble_uuid16_t[]){ BLE_UUID16_INIT(GATT_SVR_SVC_ALERT_UUID) }; fields.num_uuids16 = 1; fields.uuids16_is_complete = 1; @@ -241,8 +233,8 @@ omp_svr_advertise(void) memset(&adv_params, 0, sizeof adv_params); adv_params.conn_mode = BLE_GAP_CONN_MODE_UND; adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN; - rc = ble_gap_adv_start(own_addr_type, NULL, BLE_HS_FOREVER, - &adv_params, omp_svr_gap_event, NULL); + rc = ble_gap_adv_start(own_addr_type, NULL, BLE_HS_FOREVER, &adv_params, + omp_svr_gap_event, NULL); if (rc != 0) { MODLOG_DFLT(ERROR, "error enabling advertisement; rc=%d\n", rc); return; @@ -280,7 +272,6 @@ omp_svr_gap_event(struct ble_gap_event *event, void *arg) rc = ble_gap_conn_find(event->connect.conn_handle, &desc); assert(rc == 0); omp_svr_print_conn_desc(&desc); - } MODLOG_DFLT(INFO, "\n"); @@ -301,8 +292,7 @@ omp_svr_gap_event(struct ble_gap_event *event, void *arg) case BLE_GAP_EVENT_CONN_UPDATE: /* The central has updated the connection parameters. */ - MODLOG_DFLT(INFO, "connection updated; status=%d ", - event->conn_update.status); + MODLOG_DFLT(INFO, "connection updated; status=%d ", event->conn_update.status); rc = ble_gap_conn_find(event->connect.conn_handle, &desc); assert(rc == 0); omp_svr_print_conn_desc(&desc); @@ -310,8 +300,7 @@ omp_svr_gap_event(struct ble_gap_event *event, void *arg) return 0; case BLE_GAP_EVENT_ADV_COMPLETE: - MODLOG_DFLT(INFO, "advertise complete; reason=%d", - event->adv_complete.reason); + MODLOG_DFLT(INFO, "advertise complete; reason=%d", event->adv_complete.reason); omp_svr_advertise(); return 0; @@ -326,22 +315,18 @@ omp_svr_gap_event(struct ble_gap_event *event, void *arg) return 0; case BLE_GAP_EVENT_SUBSCRIBE: - MODLOG_DFLT(INFO, "subscribe event; conn_handle=%d attr_handle=%d " - "reason=%d prevn=%d curn=%d previ=%d curi=%d\n", - event->subscribe.conn_handle, - event->subscribe.attr_handle, - event->subscribe.reason, - event->subscribe.prev_notify, - event->subscribe.cur_notify, - event->subscribe.prev_indicate, + MODLOG_DFLT(INFO, + "subscribe event; conn_handle=%d attr_handle=%d " + "reason=%d prevn=%d curn=%d previ=%d curi=%d\n", + event->subscribe.conn_handle, event->subscribe.attr_handle, + event->subscribe.reason, event->subscribe.prev_notify, + event->subscribe.cur_notify, event->subscribe.prev_indicate, event->subscribe.cur_indicate); return 0; case BLE_GAP_EVENT_MTU: MODLOG_DFLT(INFO, "mtu update event; conn_handle=%d cid=%d mtu=%d\n", - event->mtu.conn_handle, - event->mtu.channel_id, - event->mtu.value); + event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value); return 0; case BLE_GAP_EVENT_REPEAT_PAIRING: @@ -417,8 +402,8 @@ task1_handler(void *arg) /* Toggle the LED */ prev_pin_state = hal_gpio_read(g_led_pin); curr_pin_state = hal_gpio_toggle(g_led_pin); - MODLOG_DFLT(INFO, "GPIO %d: %u to %u\n", g_led_pin, - prev_pin_state, curr_pin_state); + MODLOG_DFLT(INFO, "GPIO %d: %u to %u\n", g_led_pin, prev_pin_state, + curr_pin_state); STATS_INC(g_stats_gpio_toggle, toggles); /* Release semaphore to task 2 */ @@ -472,17 +457,17 @@ init_tasks(void) /* Initialize global test semaphore */ os_sem_init(&g_test_sem, 0); - pstack = malloc(sizeof(os_stack_t)*TASK1_STACK_SIZE); + pstack = malloc(sizeof(os_stack_t) * TASK1_STACK_SIZE); assert(pstack); - os_task_init(&task1, "task1", task1_handler, NULL, - TASK1_PRIO, OS_WAIT_FOREVER, pstack, TASK1_STACK_SIZE); + os_task_init(&task1, "task1", task1_handler, NULL, TASK1_PRIO, + OS_WAIT_FOREVER, pstack, TASK1_STACK_SIZE); - pstack = malloc(sizeof(os_stack_t)*TASK2_STACK_SIZE); + pstack = malloc(sizeof(os_stack_t) * TASK2_STACK_SIZE); assert(pstack); - os_task_init(&task2, "task2", task2_handler, NULL, - TASK2_PRIO, OS_WAIT_FOREVER, pstack, TASK2_STACK_SIZE); + os_task_init(&task2, "task2", task2_handler, NULL, TASK2_PRIO, + OS_WAIT_FOREVER, pstack, TASK2_STACK_SIZE); oc_main_init((oc_handler_t *)&omgr_oc_handler); } @@ -535,7 +520,7 @@ main(int argc, char **argv) { void *entry; rc = split_app_go(&entry, true); - if(rc == 0) { + if (rc == 0) { hal_system_start(entry); } } diff --git a/apps/omp_svr/src/misc.c b/apps/omp_svr/src/misc.c index 27ab0aa0a..a15442e4f 100644 --- a/apps/omp_svr/src/misc.c +++ b/apps/omp_svr/src/misc.c @@ -38,6 +38,6 @@ print_addr(const void *addr) const uint8_t *u8p; u8p = addr; - MODLOG_DFLT(INFO, "%02x:%02x:%02x:%02x:%02x:%02x", - u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]); + MODLOG_DFLT(INFO, "%02x:%02x:%02x:%02x:%02x:%02x", u8p[5], u8p[4], u8p[3], + u8p[2], u8p[1], u8p[0]); } diff --git a/apps/omp_svr/src/omp_svr.h b/apps/omp_svr/src/omp_svr.h index 69c40e7b7..7223c9159 100644 --- a/apps/omp_svr/src/omp_svr.h +++ b/apps/omp_svr/src/omp_svr.h @@ -31,12 +31,12 @@ struct ble_hs_cfg; struct ble_gatt_register_ctxt; /** GATT server. */ -#define GATT_SVR_SVC_ALERT_UUID 0x1811 -#define GATT_SVR_CHR_SUP_NEW_ALERT_CAT_UUID 0x2A47 -#define GATT_SVR_CHR_NEW_ALERT 0x2A46 -#define GATT_SVR_CHR_SUP_UNR_ALERT_CAT_UUID 0x2A48 -#define GATT_SVR_CHR_UNR_ALERT_STAT_UUID 0x2A45 -#define GATT_SVR_CHR_ALERT_NOT_CTRL_PT 0x2A44 +#define GATT_SVR_SVC_ALERT_UUID 0x1811 +#define GATT_SVR_CHR_SUP_NEW_ALERT_CAT_UUID 0x2A47 +#define GATT_SVR_CHR_NEW_ALERT 0x2A46 +#define GATT_SVR_CHR_SUP_UNR_ALERT_CAT_UUID 0x2A48 +#define GATT_SVR_CHR_UNR_ALERT_STAT_UUID 0x2A45 +#define GATT_SVR_CHR_ALERT_NOT_CTRL_PT 0x2A44 void gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg); int gatt_svr_init(void); diff --git a/apps/smp_svr/src/gatt_svr.c b/apps/smp_svr/src/gatt_svr.c index 5d4fa7aeb..ed6888ace 100644 --- a/apps/smp_svr/src/gatt_svr.c +++ b/apps/smp_svr/src/gatt_svr.c @@ -36,49 +36,50 @@ /* 59462f12-9543-9999-12c8-58b459a2712d */ static const ble_uuid128_t gatt_svr_svc_sec_test_uuid = - BLE_UUID128_INIT(0x2d, 0x71, 0xa2, 0x59, 0xb4, 0x58, 0xc8, 0x12, - 0x99, 0x99, 0x43, 0x95, 0x12, 0x2f, 0x46, 0x59); + BLE_UUID128_INIT(0x2d, 0x71, 0xa2, 0x59, 0xb4, 0x58, 0xc8, 0x12, 0x99, + 0x99, 0x43, 0x95, 0x12, 0x2f, 0x46, 0x59); /* 5c3a659e-897e-45e1-b016-007107c96df6 */ static const ble_uuid128_t gatt_svr_chr_sec_test_rand_uuid = - BLE_UUID128_INIT(0xf6, 0x6d, 0xc9, 0x07, 0x71, 0x00, 0x16, 0xb0, - 0xe1, 0x45, 0x7e, 0x89, 0x9e, 0x65, 0x3a, 0x5c); + BLE_UUID128_INIT(0xf6, 0x6d, 0xc9, 0x07, 0x71, 0x00, 0x16, 0xb0, 0xe1, + 0x45, 0x7e, 0x89, 0x9e, 0x65, 0x3a, 0x5c); /* 5c3a659e-897e-45e1-b016-007107c96df7 */ static const ble_uuid128_t gatt_svr_chr_sec_test_static_uuid = - BLE_UUID128_INIT(0xf7, 0x6d, 0xc9, 0x07, 0x71, 0x00, 0x16, 0xb0, - 0xe1, 0x45, 0x7e, 0x89, 0x9e, 0x65, 0x3a, 0x5c); + BLE_UUID128_INIT(0xf7, 0x6d, 0xc9, 0x07, 0x71, 0x00, 0x16, 0xb0, 0xe1, + 0x45, 0x7e, 0x89, 0x9e, 0x65, 0x3a, 0x5c); static uint8_t gatt_svr_sec_test_static_val; -static int -gatt_svr_chr_access_sec_test(uint16_t conn_handle, uint16_t attr_handle, - struct ble_gatt_access_ctxt *ctxt, - void *arg); +static int gatt_svr_chr_access_sec_test(uint16_t conn_handle, uint16_t attr_handle, + struct ble_gatt_access_ctxt *ctxt, void *arg); static const struct ble_gatt_svc_def gatt_svr_svcs[] = { { - /*** Service: Security test. */ + /*** Service: Security test. */ .type = BLE_GATT_SVC_TYPE_PRIMARY, - .uuid = &gatt_svr_svc_sec_test_uuid.u, - .characteristics = (struct ble_gatt_chr_def[]) { { - /*** Characteristic: Random number generator. */ - .uuid = &gatt_svr_chr_sec_test_rand_uuid.u, - .access_cb = gatt_svr_chr_access_sec_test, - .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_READ_ENC, - }, { - /*** Characteristic: Static value. */ - .uuid = &gatt_svr_chr_sec_test_static_uuid.u, - .access_cb = gatt_svr_chr_access_sec_test, - .flags = BLE_GATT_CHR_F_READ | - BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_WRITE_ENC, - }, { - 0, /* No more characteristics in this service. */ - } }, - }, + .uuid = &gatt_svr_svc_sec_test_uuid.u, + .characteristics = + (struct ble_gatt_chr_def[]){ + { + /*** Characteristic: Random number generator. */ + .uuid = &gatt_svr_chr_sec_test_rand_uuid.u, + .access_cb = gatt_svr_chr_access_sec_test, + .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_READ_ENC, + }, + { + /*** Characteristic: Static value. */ + .uuid = &gatt_svr_chr_sec_test_static_uuid.u, + .access_cb = gatt_svr_chr_access_sec_test, + .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_WRITE_ENC, + }, + { + 0, /* No more characteristics in this service. */ + } }, + }, { - 0, /* No more services. */ + 0, /* No more services. */ }, }; @@ -104,8 +105,7 @@ gatt_svr_chr_write(struct os_mbuf *om, uint16_t min_len, uint16_t max_len, static int gatt_svr_chr_access_sec_test(uint16_t conn_handle, uint16_t attr_handle, - struct ble_gatt_access_ctxt *ctxt, - void *arg) + struct ble_gatt_access_ctxt *ctxt, void *arg) { const ble_uuid_t *uuid; int rand_num; @@ -134,8 +134,7 @@ gatt_svr_chr_access_sec_test(uint16_t conn_handle, uint16_t attr_handle, return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; case BLE_GATT_ACCESS_OP_WRITE_CHR: - rc = gatt_svr_chr_write(ctxt->om, - sizeof gatt_svr_sec_test_static_val, + rc = gatt_svr_chr_write(ctxt->om, sizeof gatt_svr_sec_test_static_val, sizeof gatt_svr_sec_test_static_val, &gatt_svr_sec_test_static_val, NULL); return rc; @@ -161,22 +160,20 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) switch (ctxt->op) { case BLE_GATT_REGISTER_OP_SVC: MODLOG_DFLT(DEBUG, "registered service %s with handle=%d\n", - ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf), - ctxt->svc.handle); + ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf), ctxt->svc.handle); break; case BLE_GATT_REGISTER_OP_CHR: - MODLOG_DFLT(DEBUG, "registering characteristic %s with " - "def_handle=%d val_handle=%d\n", + MODLOG_DFLT(DEBUG, + "registering characteristic %s with " + "def_handle=%d val_handle=%d\n", ble_uuid_to_str(ctxt->chr.chr_def->uuid, buf), - ctxt->chr.def_handle, - ctxt->chr.val_handle); + ctxt->chr.def_handle, ctxt->chr.val_handle); break; case BLE_GATT_REGISTER_OP_DSC: MODLOG_DFLT(DEBUG, "registering descriptor %s with handle=%d\n", - ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf), - ctxt->dsc.handle); + ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf), ctxt->dsc.handle); break; default: diff --git a/apps/smp_svr/src/main.c b/apps/smp_svr/src/main.c old mode 100755 new mode 100644 index 43d75d919..351af5411 --- a/apps/smp_svr/src/main.c +++ b/apps/smp_svr/src/main.c @@ -40,14 +40,14 @@ #else #include <mcu/mcu_sim.h> -#endif /* !ARCH_sim */ +#endif /* !ARCH_sim */ /* smp_svr uses the first "peruser" log module. */ -#define SMP_SVR_LOG_MODULE (LOG_MODULE_PERUSER + 0) +#define SMP_SVR_LOG_MODULE (LOG_MODULE_PERUSER + 0) /* Convenience macro for logging to the smp_svr module. */ -#define SMP_SVR_LOG(lvl, ...) \ - LOG_ ## lvl(&smp_svr_log, SMP_SVR_LOG_MODULE, __VA_ARGS__) +#define SMP_SVR_LOG(lvl, ...) \ + LOG_##lvl(&smp_svr_log, SMP_SVR_LOG_MODULE, __VA_ARGS__) /** Log data. */ struct log smp_svr_log; @@ -61,8 +61,8 @@ print_addr(const void *addr) const uint8_t *u8p; u8p = addr; - SMP_SVR_LOG(INFO, "%02x:%02x:%02x:%02x:%02x:%02x", - u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]); + SMP_SVR_LOG(INFO, "%02x:%02x:%02x:%02x:%02x:%02x", u8p[5], u8p[4], u8p[3], + u8p[2], u8p[1], u8p[0]); } /** @@ -71,24 +71,21 @@ print_addr(const void *addr) static void smp_svr_print_conn_desc(struct ble_gap_conn_desc *desc) { - SMP_SVR_LOG(INFO, "handle=%d our_ota_addr_type=%d our_ota_addr=", - desc->conn_handle, desc->our_ota_addr.type); + SMP_SVR_LOG(INFO, "handle=%d our_ota_addr_type=%d our_ota_addr=", desc->conn_handle, + desc->our_ota_addr.type); print_addr(desc->our_ota_addr.val); - SMP_SVR_LOG(INFO, " our_id_addr_type=%d our_id_addr=", - desc->our_id_addr.type); + SMP_SVR_LOG(INFO, " our_id_addr_type=%d our_id_addr=", desc->our_id_addr.type); print_addr(desc->our_id_addr.val); - SMP_SVR_LOG(INFO, " peer_ota_addr_type=%d peer_ota_addr=", - desc->peer_ota_addr.type); + SMP_SVR_LOG(INFO, + " peer_ota_addr_type=%d peer_ota_addr=", desc->peer_ota_addr.type); print_addr(desc->peer_ota_addr.val); - SMP_SVR_LOG(INFO, " peer_id_addr_type=%d peer_id_addr=", - desc->peer_id_addr.type); + SMP_SVR_LOG(INFO, " peer_id_addr_type=%d peer_id_addr=", desc->peer_id_addr.type); print_addr(desc->peer_id_addr.val); - SMP_SVR_LOG(INFO, " conn_itvl=%d conn_latency=%d supervision_timeout=%d " + SMP_SVR_LOG(INFO, + " conn_itvl=%d conn_latency=%d supervision_timeout=%d " "encrypted=%d authenticated=%d bonded=%d\n", - desc->conn_itvl, desc->conn_latency, - desc->supervision_timeout, - desc->sec_state.encrypted, - desc->sec_state.authenticated, + desc->conn_itvl, desc->conn_latency, desc->supervision_timeout, + desc->sec_state.encrypted, desc->sec_state.authenticated, desc->sec_state.bonded); } @@ -106,7 +103,6 @@ smp_svr_advertise(void) const char *name; int rc; - /* Figure out address to use while advertising (no privacy for now) */ rc = ble_hs_id_infer_auto(0, &own_addr_type); if (rc != 0) { @@ -127,8 +123,7 @@ smp_svr_advertise(void) * o Discoverability in forthcoming advertisement (general) * o BLE-only (BR/EDR unsupported). */ - fields.flags = BLE_HS_ADV_F_DISC_GEN | - BLE_HS_ADV_F_BREDR_UNSUP; + fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP; /* Indicate that the TX power level field should be included; have the * stack fill this value automatically. This is done by assiging the @@ -152,8 +147,8 @@ smp_svr_advertise(void) memset(&adv_params, 0, sizeof adv_params); adv_params.conn_mode = BLE_GAP_CONN_MODE_UND; adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN; - rc = ble_gap_adv_start(own_addr_type, NULL, BLE_HS_FOREVER, - &adv_params, smp_svr_gap_event, NULL); + rc = ble_gap_adv_start(own_addr_type, NULL, BLE_HS_FOREVER, &adv_params, + smp_svr_gap_event, NULL); if (rc != 0) { SMP_SVR_LOG(ERROR, "error enabling advertisement; rc=%d\n", rc); return; @@ -185,8 +180,8 @@ smp_svr_gap_event(struct ble_gap_event *event, void *arg) case BLE_GAP_EVENT_CONNECT: /* A new connection was established or a connection attempt failed. */ SMP_SVR_LOG(INFO, "connection %s; status=%d ", - event->connect.status == 0 ? "established" : "failed", - event->connect.status); + event->connect.status == 0 ? "established" : "failed", + event->connect.status); if (event->connect.status == 0) { rc = ble_gap_conn_find(event->connect.conn_handle, &desc); assert(rc == 0); @@ -211,8 +206,7 @@ smp_svr_gap_event(struct ble_gap_event *event, void *arg) case BLE_GAP_EVENT_CONN_UPDATE: /* The central has updated the connection parameters. */ - SMP_SVR_LOG(INFO, "connection updated; status=%d ", - event->conn_update.status); + SMP_SVR_LOG(INFO, "connection updated; status=%d ", event->conn_update.status); rc = ble_gap_conn_find(event->connect.conn_handle, &desc); assert(rc == 0); smp_svr_print_conn_desc(&desc); @@ -220,8 +214,7 @@ smp_svr_gap_event(struct ble_gap_event *event, void *arg) return 0; case BLE_GAP_EVENT_ADV_COMPLETE: - SMP_SVR_LOG(INFO, "advertise complete; reason=%d", - event->adv_complete.reason); + SMP_SVR_LOG(INFO, "advertise complete; reason=%d", event->adv_complete.reason); smp_svr_advertise(); return 0; @@ -237,9 +230,7 @@ smp_svr_gap_event(struct ble_gap_event *event, void *arg) case BLE_GAP_EVENT_MTU: SMP_SVR_LOG(INFO, "mtu update event; conn_handle=%d cid=%d mtu=%d\n", - event->mtu.conn_handle, - event->mtu.channel_id, - event->mtu.value); + event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value); return 0; case BLE_GAP_EVENT_REPEAT_PAIRING: @@ -302,8 +293,7 @@ main(int argc, char **argv) sysinit(); /* Initialize the smp_svr log. */ - log_register("smp_svr", &smp_svr_log, &log_console_handler, NULL, - LOG_SYSLEVEL); + log_register("smp_svr", &smp_svr_log, &log_console_handler, NULL, LOG_SYSLEVEL); #ifndef ARCH_sim /* Initialize the NimBLE host configuration. */ diff --git a/apps/smp_svr/src/smp_svr.h b/apps/smp_svr/src/smp_svr.h index 52b7b5e1a..96631b4fd 100644 --- a/apps/smp_svr/src/smp_svr.h +++ b/apps/smp_svr/src/smp_svr.h @@ -31,12 +31,12 @@ struct ble_hs_cfg; struct ble_gatt_register_ctxt; /** GATT server. */ -#define GATT_SVR_SVC_ALERT_UUID 0x1811 -#define GATT_SVR_CHR_SUP_NEW_ALERT_CAT_UUID 0x2A47 -#define GATT_SVR_CHR_NEW_ALERT 0x2A46 -#define GATT_SVR_CHR_SUP_UNR_ALERT_CAT_UUID 0x2A48 -#define GATT_SVR_CHR_UNR_ALERT_STAT_UUID 0x2A45 -#define GATT_SVR_CHR_ALERT_NOT_CTRL_PT 0x2A44 +#define GATT_SVR_SVC_ALERT_UUID 0x1811 +#define GATT_SVR_CHR_SUP_NEW_ALERT_CAT_UUID 0x2A47 +#define GATT_SVR_CHR_NEW_ALERT 0x2A46 +#define GATT_SVR_CHR_SUP_UNR_ALERT_CAT_UUID 0x2A48 +#define GATT_SVR_CHR_UNR_ALERT_STAT_UUID 0x2A45 +#define GATT_SVR_CHR_ALERT_NOT_CTRL_PT 0x2A44 void gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg); int gatt_svr_init(void); diff --git a/mgmt/mcumgr/cmd/fs_mgmt/include/fs_mgmt/fs_mgmt.h b/mgmt/mcumgr/cmd/fs_mgmt/include/fs_mgmt/fs_mgmt.h index 38173fd23..7c8934890 100644 --- a/mgmt/mcumgr/cmd/fs_mgmt/include/fs_mgmt/fs_mgmt.h +++ b/mgmt/mcumgr/cmd/fs_mgmt/include/fs_mgmt/fs_mgmt.h @@ -27,11 +27,11 @@ extern "C" { /** * Command IDs for file system management group. */ -#define FS_MGMT_ID_FILE 0 +#define FS_MGMT_ID_FILE 0 /** * @brief Registers the file system management command handler group. - */ + */ void fs_mgmt_register_group(void); #ifdef __cplusplus diff --git a/mgmt/mcumgr/cmd/fs_mgmt/src/fs_mgmt.c b/mgmt/mcumgr/cmd/fs_mgmt/src/fs_mgmt.c index 95a283f64..996f9b330 100644 --- a/mgmt/mcumgr/cmd/fs_mgmt/src/fs_mgmt.c +++ b/mgmt/mcumgr/cmd/fs_mgmt/src/fs_mgmt.c @@ -46,7 +46,7 @@ static const struct mgmt_handler fs_mgmt_handlers[] = { }, }; -#define FS_MGMT_HANDLER_CNT \ +#define FS_MGMT_HANDLER_CNT \ (sizeof fs_mgmt_handlers / sizeof fs_mgmt_handlers[0]) static struct mgmt_group fs_mgmt_group = { @@ -71,16 +71,16 @@ fs_mgmt_file_download(struct mgmt_ctxt *ctxt) const struct cbor_attr_t dload_attr[] = { { - .attribute = "off", - .type = CborAttrUnsignedIntegerType, - .addr.uinteger = &off, - }, + .attribute = "off", + .type = CborAttrUnsignedIntegerType, + .addr.uinteger = &off, + }, { - .attribute = "name", - .type = CborAttrTextStringType, - .addr.string = path, - .len = sizeof path, - }, + .attribute = "name", + .type = CborAttrTextStringType, + .addr.string = path, + .len = sizeof path, + }, { 0 }, }; @@ -101,8 +101,7 @@ fs_mgmt_file_download(struct mgmt_ctxt *ctxt) } /* Read the requested chunk from the file. */ - rc = fs_mgmt_impl_read(path, off, FS_MGMT_DL_CHUNK_SIZE, - file_data, &bytes_read); + rc = fs_mgmt_impl_read(path, off, FS_MGMT_DL_CHUNK_SIZE, file_data, &bytes_read); if (rc != 0) { return rc; } @@ -163,31 +162,23 @@ fs_mgmt_file_upload(struct mgmt_ctxt *ctxt) int rc; const struct cbor_attr_t uload_attr[5] = { - [0] = { - .attribute = "off", - .type = CborAttrUnsignedIntegerType, - .addr.uinteger = &off, - .nodefault = true - }, - [1] = { - .attribute = "data", - .type = CborAttrByteStringType, - .addr.bytestring.data = file_data, - .addr.bytestring.len = &data_len, - .len = sizeof(file_data) - }, - [2] = { - .attribute = "len", - .type = CborAttrUnsignedIntegerType, - .addr.uinteger = &len, - .nodefault = true - }, - [3] = { - .attribute = "name", - .type = CborAttrTextStringType, - .addr.string = file_name, - .len = sizeof(file_name) - }, + [0] = { .attribute = "off", + .type = CborAttrUnsignedIntegerType, + .addr.uinteger = &off, + .nodefault = true }, + [1] = { .attribute = "data", + .type = CborAttrByteStringType, + .addr.bytestring.data = file_data, + .addr.bytestring.len = &data_len, + .len = sizeof(file_data) }, + [2] = { .attribute = "len", + .type = CborAttrUnsignedIntegerType, + .addr.uinteger = &len, + .nodefault = true }, + [3] = { .attribute = "name", + .type = CborAttrTextStringType, + .addr.string = file_name, + .len = sizeof(file_name) }, [4] = { 0 }, }; @@ -211,11 +202,10 @@ fs_mgmt_file_upload(struct mgmt_ctxt *ctxt) if (!fs_mgmt_ctxt.uploading) { return MGMT_ERR_EINVAL; } - + if (off != fs_mgmt_ctxt.off) { /* Invalid offset. Drop the data and send the expected offset. */ - return fs_mgmt_file_upload_rsp(ctxt, MGMT_ERR_EINVAL, - fs_mgmt_ctxt.off); + return fs_mgmt_file_upload_rsp(ctxt, MGMT_ERR_EINVAL, fs_mgmt_ctxt.off); } } diff --git a/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/image.h b/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/image.h index 6de917a1b..308547cbb 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/image.h +++ b/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/image.h @@ -26,21 +26,21 @@ extern "C" { #endif -#define IMAGE_MAGIC 0x96f3b83d -#define IMAGE_TLV_INFO_MAGIC 0x6907 -#define IMAGE_TLV_PROT_INFO_MAGIC 0x6908 +#define IMAGE_MAGIC 0x96f3b83d +#define IMAGE_TLV_INFO_MAGIC 0x6907 +#define IMAGE_TLV_PROT_INFO_MAGIC 0x6908 -#define IMAGE_HEADER_SIZE 32 +#define IMAGE_HEADER_SIZE 32 /** Image header flags. */ -#define IMAGE_F_NON_BOOTABLE 0x00000010 /* Split image app. */ -#define IMAGE_F_ROM_FIXED_ADDR 0x00000100 +#define IMAGE_F_NON_BOOTABLE 0x00000010 /* Split image app. */ +#define IMAGE_F_ROM_FIXED_ADDR 0x00000100 /** Image trailer TLV types. */ -#define IMAGE_TLV_SHA256 0x10 /* SHA256 of image hdr and body */ +#define IMAGE_TLV_SHA256 0x10 /* SHA256 of image hdr and body */ /** Image TLV-specific definitions. */ -#define IMAGE_HASH_LEN 32 +#define IMAGE_HASH_LEN 32 struct image_version { uint8_t iv_major; @@ -64,14 +64,14 @@ struct image_header { /** Image TLV header. All fields in little endian. */ struct image_tlv_info { uint16_t it_magic; - uint16_t it_tlv_tot; /* size of TLV area (including tlv_info header) */ + uint16_t it_tlv_tot; /* size of TLV area (including tlv_info header) */ }; /** Image trailer TLV format. All fields in little endian. */ struct image_tlv { - uint8_t it_type; /* IMAGE_TLV_[...]. */ - uint8_t _pad; - uint16_t it_len; /* Data length (not including TLV header). */ + uint8_t it_type; /* IMAGE_TLV_[...]. */ + uint8_t _pad; + uint16_t it_len; /* Data length (not including TLV header). */ }; _Static_assert(sizeof(struct image_header) == IMAGE_HEADER_SIZE, diff --git a/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/img_mgmt.h b/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/img_mgmt.h index d76d2f610..26c44801f 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/img_mgmt.h +++ b/mgmt/mcumgr/cmd/img_mgmt/include/img_mgmt/img_mgmt.h @@ -30,59 +30,59 @@ struct image_version; extern "C" { #endif -#define IMG_MGMT_HASH_STR 48 -#define IMG_MGMT_HASH_LEN 32 -#define IMG_MGMT_DATA_SHA_LEN 32 /* SHA256 */ +#define IMG_MGMT_HASH_STR 48 +#define IMG_MGMT_HASH_LEN 32 +#define IMG_MGMT_DATA_SHA_LEN 32 /* SHA256 */ /* * Image state flags */ -#define IMG_MGMT_STATE_F_PENDING 0x01 -#define IMG_MGMT_STATE_F_CONFIRMED 0x02 -#define IMG_MGMT_STATE_F_ACTIVE 0x04 -#define IMG_MGMT_STATE_F_PERMANENT 0x08 +#define IMG_MGMT_STATE_F_PENDING 0x01 +#define IMG_MGMT_STATE_F_CONFIRMED 0x02 +#define IMG_MGMT_STATE_F_ACTIVE 0x04 +#define IMG_MGMT_STATE_F_PERMANENT 0x08 -#define IMG_MGMT_VER_MAX_STR_LEN 25 /* 255.255.65535.4294967295\0 */ +#define IMG_MGMT_VER_MAX_STR_LEN 25 /* 255.255.65535.4294967295\0 */ /* * Swap Types for image management state machine */ -#define IMG_MGMT_SWAP_TYPE_NONE 0 -#define IMG_MGMT_SWAP_TYPE_TEST 1 -#define IMG_MGMT_SWAP_TYPE_PERM 2 -#define IMG_MGMT_SWAP_TYPE_REVERT 3 +#define IMG_MGMT_SWAP_TYPE_NONE 0 +#define IMG_MGMT_SWAP_TYPE_TEST 1 +#define IMG_MGMT_SWAP_TYPE_PERM 2 +#define IMG_MGMT_SWAP_TYPE_REVERT 3 /** * Command IDs for image management group. */ -#define IMG_MGMT_ID_STATE 0 -#define IMG_MGMT_ID_UPLOAD 1 -#define IMG_MGMT_ID_FILE 2 -#define IMG_MGMT_ID_CORELIST 3 -#define IMG_MGMT_ID_CORELOAD 4 -#define IMG_MGMT_ID_ERASE 5 +#define IMG_MGMT_ID_STATE 0 +#define IMG_MGMT_ID_UPLOAD 1 +#define IMG_MGMT_ID_FILE 2 +#define IMG_MGMT_ID_CORELIST 3 +#define IMG_MGMT_ID_CORELOAD 4 +#define IMG_MGMT_ID_ERASE 5 /* * IMG_MGMT_ID_UPLOAD statuses. */ -#define IMG_MGMT_ID_UPLOAD_STATUS_START 0 -#define IMG_MGMT_ID_UPLOAD_STATUS_ONGOING 1 -#define IMG_MGMT_ID_UPLOAD_STATUS_COMPLETE 2 +#define IMG_MGMT_ID_UPLOAD_STATUS_START 0 +#define IMG_MGMT_ID_UPLOAD_STATUS_ONGOING 1 +#define IMG_MGMT_ID_UPLOAD_STATUS_COMPLETE 2 /** No status determined (e.g., request rejected before processing). */ -#define IMG_MGMT_ID_UPLOAD_STATUS_NONE (-1) +#define IMG_MGMT_ID_UPLOAD_STATUS_NONE (-1) extern struct img_mgmt_state g_img_mgmt_state; /** Represents an individual upload request. */ struct img_mgmt_upload_req { - unsigned long long int image; /* 0 by default */ - unsigned long long int off; /* -1 if unspecified */ - unsigned long long int size; /* -1 if unspecified */ + unsigned long long int image; /* 0 by default */ + unsigned long long int off; /* -1 if unspecified */ + unsigned long long int size; /* -1 if unspecified */ size_t data_len; size_t data_sha_len; uint8_t img_data[IMG_MGMT_UL_CHUNK_SIZE]; uint8_t data_sha[IMG_MGMT_DATA_SHA_LEN]; - bool upgrade; /* Only allow greater version numbers. */ + bool upgrade; /* Only allow greater version numbers. */ }; /** Global state for upload in progress. */ @@ -118,12 +118,12 @@ struct img_mgmt_upload_action { /** * @brief Registers the image management command handler group. - */ + */ void img_mgmt_register_group(void); /** * @brief Unregisters the image management command handler group. - */ + */ void img_mgmt_unregister_group(void); /* @@ -184,10 +184,10 @@ int img_mgmt_state_any_pending(void); uint8_t img_mgmt_state_flags(int query_slot); /** - * @brief Sets the pending flag for the specified image slot. That is, the system - * will swap to the specified image on the next reboot. If the permanent - * argument is specified, the system doesn't require a confirm after the swap - * occurs. + * @brief Sets the pending flag for the specified image slot. That is, the + * system will swap to the specified image on the next reboot. If the + * permanent argument is specified, the system doesn't require a confirm after + * the swap occurs. * * @param slot Image slot to set pending * @param permanent If set no confirm is required after image swap @@ -268,16 +268,16 @@ extern const char *img_mgmt_err_str_flash_write_failed; extern const char *img_mgmt_err_str_downgrade; extern const char *img_mgmt_err_str_image_bad_flash_addr; #else -#define img_mgmt_error_rsp(ctxt, rc, rsn) (rc) -#define img_mgmt_err_str_app_reject NULL -#define img_mgmt_err_str_hdr_malformed NULL -#define img_mgmt_err_str_magic_mismatch NULL -#define img_mgmt_err_str_no_slot NULL -#define img_mgmt_err_str_flash_open_failed NULL -#define img_mgmt_err_str_flash_erase_failed NULL -#define img_mgmt_err_str_flash_write_failed NULL -#define img_mgmt_err_str_downgrade NULL -#define img_mgmt_err_str_image_bad_flash_addr NULL +#define img_mgmt_error_rsp(ctxt, rc, rsn) (rc) +#define img_mgmt_err_str_app_reject NULL +#define img_mgmt_err_str_hdr_malformed NULL +#define img_mgmt_err_str_magic_mismatch NULL +#define img_mgmt_err_str_no_slot NULL +#define img_mgmt_err_str_flash_open_failed NULL +#define img_mgmt_err_str_flash_erase_failed NULL +#define img_mgmt_err_str_flash_write_failed NULL +#define img_mgmt_err_str_downgrade NULL +#define img_mgmt_err_str_image_bad_flash_addr NULL #endif #ifdef __cplusplus diff --git a/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c b/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c index 5be1dfbb2..1fda6a670 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c +++ b/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt.c @@ -98,7 +98,6 @@ img_mgmt_vercmp(const struct image_version *a, const struct image_version *b) return 0; } - /** * Verifies an upload request and indicates the actions that should be taken * during processing of the request. This is a "read only" function in the @@ -115,8 +114,7 @@ img_mgmt_vercmp(const struct image_version *a, const struct image_version *b) */ int img_mgmt_impl_upload_inspect(const struct img_mgmt_upload_req *req, - struct img_mgmt_upload_action *action, - const char **errstr) + struct img_mgmt_upload_action *action, const char **errstr) { const struct image_header *hdr; const struct flash_area *fa; @@ -172,8 +170,7 @@ img_mgmt_impl_upload_inspect(const struct img_mgmt_upload_req *req, */ if ((req->data_sha_len > 0) && (g_img_mgmt_state.area_id != -1)) { if ((g_img_mgmt_state.data_sha_len == req->data_sha_len) && - !memcmp(g_img_mgmt_state.data_sha, req->data_sha, - req->data_sha_len)) { + !memcmp(g_img_mgmt_state.data_sha, req->data_sha, req->data_sha_len)) { return 0; } } @@ -214,7 +211,7 @@ img_mgmt_impl_upload_inspect(const struct img_mgmt_upload_req *req, } #if MYNEWT_VAL(IMG_MGMT_LAZY_ERASE) - (void) empty; + (void)empty; #else rc = flash_area_open(action->area_id, &fa); if (rc) { @@ -318,8 +315,7 @@ img_mgmt_impl_write_pending(int slot, bool permanent) /* Unconfirmed slots are always runable. A confirmed slot can only be * run if it is a loader in a split image setup. */ - if (state_flags & IMG_MGMT_STATE_F_CONFIRMED && - (slot != 0 || !split_app_active)) { + if (state_flags & IMG_MGMT_STATE_F_CONFIRMED && (slot != 0 || !split_app_active)) { return MGMT_ERR_EBADSTATE; } @@ -391,8 +387,7 @@ img_mgmt_impl_write_confirmed(void) } int -img_mgmt_impl_read(int slot, unsigned int offset, void *dst, - unsigned int num_bytes) +img_mgmt_impl_read(int slot, unsigned int offset, void *dst, unsigned int num_bytes) { const struct flash_area *fa; int area_id; @@ -432,8 +427,7 @@ img_mgmt_impl_write_image_data(unsigned int offset, const void *data, /* Check if there any unerased target sectors, if not clean them. */ while ((fa->fa_off + offset + num_bytes) > g_img_mgmt_state.sector_end) { - rc = flash_area_getnext_sector(fa->fa_id, &g_img_mgmt_state.sector_id, - §or); + rc = flash_area_getnext_sector(fa->fa_id, &g_img_mgmt_state.sector_id, §or); if (rc) { goto err; } @@ -532,8 +526,8 @@ img_mgmt_impl_erase_if_needed(uint32_t off, uint32_t len) } while ((cfa->fa_off + off + len) > g_img_mgmt_state.sector_end) { - rc = flash_area_getnext_sector(cfa->fa_id, - &g_img_mgmt_state.sector_id, §or); + rc = flash_area_getnext_sector(cfa->fa_id, &g_img_mgmt_state.sector_id, + §or); if (rc) { goto done; } @@ -579,7 +573,7 @@ img_mgmt_impl_erased_val(int slot, uint8_t *erased_val) rc = flash_area_open(flash_area_id_from_image_slot(slot), &fa); if (rc != 0) { - return MGMT_ERR_EUNKNOWN; + return MGMT_ERR_EUNKNOWN; } *erased_val = flash_area_erased_val(fa); diff --git a/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c b/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c index c74d8b81e..8ded48ffa 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c +++ b/mgmt/mcumgr/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c @@ -63,10 +63,10 @@ * } */ -#define IMG_MGMT_LOG_EV_UPSTART "upstart" -#define IMG_MGMT_LOG_EV_UPDONE "updone" -#define IMG_MGMT_LOG_EV_PEND "pend" -#define IMG_MGMT_LOG_EV_CONF "conf" +#define IMG_MGMT_LOG_EV_UPSTART "upstart" +#define IMG_MGMT_LOG_EV_UPDONE "updone" +#define IMG_MGMT_LOG_EV_PEND "pend" +#define IMG_MGMT_LOG_EV_CONF "conf" static int img_mgmt_log_gen(const char *ev, int status, const uint8_t *hash) diff --git a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt.c b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt.c index b9b61a2a1..fbda7510d 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt.c +++ b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt.c @@ -54,7 +54,7 @@ static const struct mgmt_handler img_mgmt_handlers[] = { }, }; -#define IMG_MGMT_HANDLER_CNT \ +#define IMG_MGMT_HANDLER_CNT \ sizeof(img_mgmt_handlers) / sizeof(img_mgmt_handlers[0]) static struct mgmt_group img_mgmt_group = { @@ -79,8 +79,7 @@ const char *img_mgmt_err_str_image_bad_flash_addr = "img addr mismatch"; * Finds the TLVs in the specified image slot, if any. */ static int -img_mgmt_find_tlvs(int slot, size_t *start_off, size_t *end_off, - uint16_t magic) +img_mgmt_find_tlvs(int slot, size_t *start_off, size_t *end_off, uint16_t magic) { struct image_tlv_info tlv_info; int rc; @@ -114,10 +113,10 @@ img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash, { #if IMG_MGMT_DUMMY_HDR - uint8_t dummy_hash[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, - 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, - 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, - 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}; + uint8_t dummy_hash[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, + 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, + 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, + 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; if (!hash && !ver && !flags) { return 0; @@ -175,10 +174,10 @@ img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash, *flags = hdr.ih_flags; } - /* Read the image's TLVs. We first try to find the protected TLVs, if the protected - * TLV does not exist, we try to find non-protected TLV which also contains the hash - * TLV. All images are required to have a hash TLV. If the hash is missing, the image - * is considered invalid. + /* Read the image's TLVs. We first try to find the protected TLVs, if the + * protected TLV does not exist, we try to find non-protected TLV which + * also contains the hash TLV. All images are required to have a hash TLV. + * If the hash is missing, the image is considered invalid. */ data_off = hdr.ih_hdr_size + hdr.ih_img_size; if (data_off < hdr.ih_img_size) { @@ -187,8 +186,8 @@ img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash, rc = img_mgmt_find_tlvs(image_slot, &data_off, &data_end, IMAGE_TLV_PROT_INFO_MAGIC); if (!rc) { - /* The data offset should start after the header bytes after the end of the protected TLV, - * if one exists. + /* The data offset should start after the header bytes after the end of + * the protected TLV, if one exists. */ data_off = data_end - sizeof(struct image_tlv_info); } @@ -224,8 +223,7 @@ img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash, if (data_off + IMAGE_HASH_LEN > data_end) { return MGMT_ERR_EUNKNOWN; } - rc = img_mgmt_impl_read(image_slot, data_off, hash, - IMAGE_HASH_LEN); + rc = img_mgmt_impl_read(image_slot, data_off, hash, IMAGE_HASH_LEN); if (rc != 0) { return MGMT_ERR_EUNKNOWN; } @@ -287,8 +285,8 @@ img_mgmt_error_rsp(struct mgmt_ctxt *ctxt, int rc, const char *rsn) { /* * This is an error response so returning a different error when failed to - * encode other error probably does not make much sense - just ignore errors - * here. + * encode other error probably does not make much sense - just ignore + * errors here. */ cbor_encode_text_stringz(&ctxt->encoder, "rsn"); cbor_encode_text_stringz(&ctxt->encoder, rsn); @@ -319,7 +317,7 @@ img_mgmt_erase(struct mgmt_ctxt *ctxt) return MGMT_ERR_EBADSTATE; } } - + rc = img_mgmt_impl_erase_slot(); if (!rc) { @@ -501,9 +499,9 @@ img_mgmt_upload(struct mgmt_ctxt *ctxt) cmd_status_arg.status = IMG_MGMT_ID_UPLOAD_STATUS_START; /* - * We accept SHA trimmed to any length by client since it's up to client - * to make sure provided data are good enough to avoid collisions when - * resuming upload. + * We accept SHA trimmed to any length by client since it's up to + * client to make sure provided data are good enough to avoid + * collisions when resuming upload. */ g_img_mgmt_state.data_sha_len = req.data_sha_len; memcpy(g_img_mgmt_state.data_sha, req.data_sha, req.data_sha_len); @@ -544,7 +542,8 @@ img_mgmt_upload(struct mgmt_ctxt *ctxt) last = true; } - rc = img_mgmt_impl_write_image_data(req.off, req.img_data, action.write_bytes, last); + rc = img_mgmt_impl_write_image_data(req.off, req.img_data, + action.write_bytes, last); if (rc != 0) { rc = MGMT_ERR_EUNKNOWN; errstr = img_mgmt_err_str_flash_write_failed; @@ -562,7 +561,8 @@ img_mgmt_upload(struct mgmt_ctxt *ctxt) end: - img_mgmt_upload_log(req.off == 0, g_img_mgmt_state.off == g_img_mgmt_state.size, rc); + img_mgmt_upload_log(req.off == 0, + g_img_mgmt_state.off == g_img_mgmt_state.size, rc); mgmt_evt(MGMT_EVT_OP_CMD_STATUS, MGMT_GROUP_ID_IMAGE, IMG_MGMT_ID_UPLOAD, &cmd_status_arg); @@ -619,7 +619,6 @@ img_mgmt_register_callbacks(const img_mgmt_dfu_callbacks_t *cb_struct) img_mgmt_dfu_callbacks_fn = cb_struct; } - int img_mgmt_my_version(struct image_version *ver) { diff --git a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_priv.h b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_priv.h index 7e6e78407..363984f71 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_priv.h +++ b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_priv.h @@ -6,7 +6,7 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, diff --git a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c index a5c888449..1047b9507 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c +++ b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c @@ -105,8 +105,8 @@ img_mgmt_slot_in_use(int slot) uint8_t state_flags; state_flags = img_mgmt_state_flags(slot); - return state_flags & IMG_MGMT_STATE_F_ACTIVE || - state_flags & IMG_MGMT_STATE_F_CONFIRMED || + return state_flags & IMG_MGMT_STATE_F_ACTIVE || + state_flags & IMG_MGMT_STATE_F_CONFIRMED || state_flags & IMG_MGMT_STATE_F_PENDING; } @@ -148,9 +148,9 @@ done: } if (permanent) { - (void) img_mgmt_impl_log_confirm(rc, hashp); + (void)img_mgmt_impl_log_confirm(rc, hashp); } else { - (void) img_mgmt_impl_log_pending(rc, hashp); + (void)img_mgmt_impl_log_pending(rc, hashp); } return rc; @@ -176,7 +176,7 @@ img_mgmt_state_confirm(void) rc = MGMT_ERR_EUNKNOWN; } - img_mgmt_dfu_confirmed(); + img_mgmt_dfu_confirmed(); err: return img_mgmt_impl_log_confirm(rc, NULL); } @@ -201,8 +201,7 @@ img_mgmt_state_read(struct mgmt_ctxt *ctxt) err = 0; err |= cbor_encode_text_stringz(&ctxt->encoder, "images"); - err |= cbor_encoder_create_array(&ctxt->encoder, &images, - CborIndefiniteLength); + err |= cbor_encoder_create_array(&ctxt->encoder, &images, CborIndefiniteLength); for (i = 0; i < 2 * IMG_MGMT_UPDATABLE_IMAGE_NUMBER; i++) { rc = img_mgmt_read_info(i, &ver, hash, &flags); @@ -212,8 +211,7 @@ img_mgmt_state_read(struct mgmt_ctxt *ctxt) state_flags = img_mgmt_state_flags(i); - err |= cbor_encoder_create_map(&images, &image, - CborIndefiniteLength); + err |= cbor_encoder_create_map(&images, &image, CborIndefiniteLength); #if IMG_MGMT_UPDATABLE_IMAGE_NUMBER > 1 err |= cbor_encode_text_stringz(&image, "image"); @@ -236,28 +234,22 @@ img_mgmt_state_read(struct mgmt_ctxt *ctxt) if (!IMG_MGMT_FRUGAL_LIST || (state_flags & IMG_MGMT_STATE_F_PENDING)) { err |= cbor_encode_text_stringz(&image, "pending"); - err |= cbor_encode_boolean(&image, - state_flags & IMG_MGMT_STATE_F_PENDING); + err |= cbor_encode_boolean(&image, state_flags & IMG_MGMT_STATE_F_PENDING); } - if (!IMG_MGMT_FRUGAL_LIST || - (state_flags & IMG_MGMT_STATE_F_CONFIRMED)) { + if (!IMG_MGMT_FRUGAL_LIST || (state_flags & IMG_MGMT_STATE_F_CONFIRMED)) { err |= cbor_encode_text_stringz(&image, "confirmed"); - err |= cbor_encode_boolean(&image, - state_flags & IMG_MGMT_STATE_F_CONFIRMED); + err |= cbor_encode_boolean(&image, state_flags & IMG_MGMT_STATE_F_CONFIRMED); } if (!IMG_MGMT_FRUGAL_LIST || (state_flags & IMG_MGMT_STATE_F_ACTIVE)) { err |= cbor_encode_text_stringz(&image, "active"); - err |= cbor_encode_boolean(&image, - state_flags & IMG_MGMT_STATE_F_ACTIVE); + err |= cbor_encode_boolean(&image, state_flags & IMG_MGMT_STATE_F_ACTIVE); } - if (!IMG_MGMT_FRUGAL_LIST || - (state_flags & IMG_MGMT_STATE_F_PERMANENT)) { + if (!IMG_MGMT_FRUGAL_LIST || (state_flags & IMG_MGMT_STATE_F_PERMANENT)) { err |= cbor_encode_text_stringz(&image, "permanent"); - err |= cbor_encode_boolean(&image, - state_flags & IMG_MGMT_STATE_F_PERMANENT); + err |= cbor_encode_boolean(&image, state_flags & IMG_MGMT_STATE_F_PERMANENT); } err |= cbor_encoder_close_container(&images, &image); diff --git a/mgmt/mcumgr/cmd/log_mgmt/include/log_mgmt/log_mgmt.h b/mgmt/mcumgr/cmd/log_mgmt/include/log_mgmt/log_mgmt.h index 6d046cd9b..1494e6426 100644 --- a/mgmt/mcumgr/cmd/log_mgmt/include/log_mgmt/log_mgmt.h +++ b/mgmt/mcumgr/cmd/log_mgmt/include/log_mgmt/log_mgmt.h @@ -30,13 +30,13 @@ extern "C" { * LOG MGMT specific error codes, 0 -> 6, 8 are same as mcumgr, * 7 and 9 are different for backwards compatibility with newtmgr. */ -#define LOG_MGMT_ERR_EOK (0) -#define LOG_MGMT_ERR_EUNKNOWN (1) -#define LOG_MGMT_ERR_ENOMEM (2) -#define LOG_MGMT_ERR_EINVAL (3) +#define LOG_MGMT_ERR_EOK (0) +#define LOG_MGMT_ERR_EUNKNOWN (1) +#define LOG_MGMT_ERR_ENOMEM (2) +#define LOG_MGMT_ERR_EINVAL (3) #define LOG_MGMT_ERR_ETIMEOUT (4) #define LOG_MGMT_ERR_ENOENT (5) -#define LOG_MGMT_ERR_EBADSTATE (6) /* Current state disallows command. */ +#define LOG_MGMT_ERR_EBADSTATE (6) /* Current state disallows command. */ #define LOG_MGMT_ERR_ECORRUPT (7) #define LOG_MGMT_ERR_ENOTSUP (8) #define LOG_MGMT_ERR_EMSGSIZE (9) @@ -53,22 +53,21 @@ extern "C" { #define LOG_MGMT_ID_LOGS_LIST 5 /** @brief Log output is streamed without retention (e.g., console). */ -#define LOG_MGMT_TYPE_STREAM 0 +#define LOG_MGMT_TYPE_STREAM 0 /** @brief Log entries are stored in RAM. */ -#define LOG_MGMT_TYPE_MEMORY 1 +#define LOG_MGMT_TYPE_MEMORY 1 /** @brief Log entries are persisted across reboots. */ -#define LOG_MGMT_TYPE_STORAGE 2 +#define LOG_MGMT_TYPE_STORAGE 2 /* @brief Flags used to indicate type of data in reserved payload. */ -#define LOG_MGMT_FLAGS_IMG_HASH (1 << 0) +#define LOG_MGMT_FLAGS_IMG_HASH (1 << 0) /* @brief Log entry types. */ -#define LOG_MGMT_ETYPE_STRING 0 -#define LOG_MGMT_ETYPE_CBOR 1 -#define LOG_MGMT_ETYPE_BINARY 2 - +#define LOG_MGMT_ETYPE_STRING 0 +#define LOG_MGMT_ETYPE_CBOR 1 +#define LOG_MGMT_ETYPE_BINARY 2 /** @brief Generic descriptor for an OS-specific log. */ struct log_mgmt_log { @@ -87,8 +86,8 @@ struct log_mgmt_entry { size_t len; uint8_t module; uint8_t level; - uint8_t type:4; - uint8_t flags:4; + uint8_t type : 4; + uint8_t flags : 4; const uint8_t *imghash; size_t offset; size_t chunklen; diff --git a/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c b/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c index 398c6ec3b..4adcc4173 100644 --- a/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c +++ b/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c @@ -59,14 +59,14 @@ static mgmt_handler_fn log_mgmt_level_list; static mgmt_handler_fn log_mgmt_logs_list; static struct mgmt_handler log_mgmt_handlers[] = { - [LOG_MGMT_ID_SHOW] = { log_mgmt_show, NULL }, - [LOG_MGMT_ID_CLEAR] = { NULL, log_mgmt_clear }, - [LOG_MGMT_ID_MODULE_LIST] = { log_mgmt_module_list, NULL }, - [LOG_MGMT_ID_LEVEL_LIST] = { log_mgmt_level_list, NULL }, - [LOG_MGMT_ID_LOGS_LIST] = { log_mgmt_logs_list, NULL }, + [LOG_MGMT_ID_SHOW] = { log_mgmt_show, NULL }, + [LOG_MGMT_ID_CLEAR] = { NULL, log_mgmt_clear }, + [LOG_MGMT_ID_MODULE_LIST] = { log_mgmt_module_list, NULL }, + [LOG_MGMT_ID_LEVEL_LIST] = { log_mgmt_level_list, NULL }, + [LOG_MGMT_ID_LOGS_LIST] = { log_mgmt_logs_list, NULL }, }; -#define LOG_MGMT_HANDLER_CNT \ +#define LOG_MGMT_HANDLER_CNT \ sizeof log_mgmt_handlers / sizeof log_mgmt_handlers[0] static struct mgmt_group log_mgmt_group = { @@ -129,9 +129,9 @@ log_mgmt_encode_entry(CborEncoder *enc, const struct log_mgmt_entry *entry, /* * Write entry data as byte string. Since this may not fit into single - * chunk of data we will write as indefinite-length byte string which is - * basically a indefinite-length container with definite-length strings - * inside. + * chunk of data we will write as indefinite-length byte string which + * is basically a indefinite-length container with definite-length + * strings inside. */ err |= cbor_encoder_create_indef_byte_string(&lmec->mapenc, &lmec->msgenc); if (out_len != NULL) { @@ -152,33 +152,33 @@ log_mgmt_encode_entry(CborEncoder *enc, const struct log_mgmt_entry *entry, * The else case is executed for non-first chunks of data to be encoded * * Write entry data as byte string. Since this may not fit into single - * chunk of data we will write as indefinite-length byte string which is - * basically a indefinite-length container with definite-length strings - * inside. + * chunk of data we will write as indefinite-length byte string which + * is basically a indefinite-length container with definite-length + * strings inside. */ err |= cbor_encode_byte_string(&lmec->msgenc, entry->data, entry->chunklen); bytes_encoded = entry->chunklen; - } - - /* - * Containers need to get closed when encoding is done, the only way to know at - * this point in the code that encoding is done is using the number of bytes - * that got encoded and comparing it to the length of the entry - */ - if (entry->offset + bytes_encoded >= entry->len) { - err |= cbor_encoder_close_container(&lmec->mapenc, &lmec->msgenc); - err |= cbor_encoder_close_container(enc, &lmec->mapenc); - } - - if (out_len) { - *out_len = cbor_encode_bytes_written(enc) - len; - } - - if (err != 0) { - return LOG_MGMT_ERR_ENOMEM; - } - - return LOG_MGMT_ERR_EOK; + } + + /* + * Containers need to get closed when encoding is done, the only way to + * know at this point in the code that encoding is done is using the number + * of bytes that got encoded and comparing it to the length of the entry + */ + if (entry->offset + bytes_encoded >= entry->len) { + err |= cbor_encoder_close_container(&lmec->mapenc, &lmec->msgenc); + err |= cbor_encoder_close_container(enc, &lmec->mapenc); + } + + if (out_len) { + *out_len = cbor_encode_bytes_written(enc) - len; + } + + if (err != 0) { + return LOG_MGMT_ERR_ENOMEM; + } + + return LOG_MGMT_ERR_EOK; } static int @@ -266,11 +266,9 @@ log_encode_entries(const struct log_mgmt_log *log, CborEncoder *enc, cbor_cnt_writer_init(&cnt_writer); cbor_encoder_init(&cnt_encoder, &cnt_writer.enc, 0); err |= cbor_encode_text_stringz(&cnt_encoder, "entries"); - err |= cbor_encoder_create_array(&cnt_encoder, &entries, - CborIndefiniteLength); + err |= cbor_encoder_create_array(&cnt_encoder, &entries, CborIndefiniteLength); err |= cbor_encoder_close_container(&cnt_encoder, &entries); - rsp_len = cbor_encode_bytes_written(enc) + - cbor_encode_bytes_written(&cnt_encoder); + rsp_len = cbor_encode_bytes_written(enc) + cbor_encode_bytes_written(&cnt_encoder); if (rsp_len > LOG_MGMT_MAX_RSP_LEN) { /* No entries were processed, don't update watermark */ return LOG_MGMT_ERR_EUNKNOWN; @@ -279,17 +277,16 @@ log_encode_entries(const struct log_mgmt_log *log, CborEncoder *enc, err |= cbor_encode_text_stringz(enc, "entries"); err |= cbor_encoder_create_array(enc, &entries, CborIndefiniteLength); - filter = (struct log_mgmt_filter) { + filter = (struct log_mgmt_filter){ .min_timestamp = timestamp, .min_index = index, }; - ctxt = (struct log_walk_ctxt) { + ctxt = (struct log_walk_ctxt){ .enc = &entries, .rsp_len = cbor_encode_bytes_written(enc), }; - rc = log_mgmt_impl_foreach_entry(log->name, &filter, - log_mgmt_cb_encode, &ctxt); + rc = log_mgmt_impl_foreach_entry(log->name, &filter, log_mgmt_cb_encode, &ctxt); if (rc < 0) { /* * If we receive negative error code from the walk function, @@ -361,24 +358,24 @@ log_mgmt_show(struct mgmt_ctxt *ctxt) const struct cbor_attr_t attr[] = { { - .attribute = "log_name", - .type = CborAttrTextStringType, - .addr.string = name, - .len = sizeof(name), - }, + .attribute = "log_name", + .type = CborAttrTextStringType, + .addr.string = name, + .len = sizeof(name), + }, { - .attribute = "ts", - .type = CborAttrIntegerType, - .addr.integer = ×tamp, - }, + .attribute = "ts", + .type = CborAttrIntegerType, + .addr.integer = ×tamp, + }, { - .attribute = "index", - .type = CborAttrUnsignedIntegerType, - .addr.uinteger = &index, - }, + .attribute = "index", + .type = CborAttrUnsignedIntegerType, + .addr.uinteger = &index, + }, { - .attribute = NULL, - }, + .attribute = NULL, + }, }; name[0] = '\0'; @@ -404,11 +401,10 @@ log_mgmt_show(struct mgmt_ctxt *ctxt) err |= cbor_encode_uint(&ctxt->encoder, next_idx); err |= cbor_encode_text_stringz(&ctxt->encoder, "logs"); - err |= cbor_encoder_create_array(&ctxt->encoder, &logs, - CborIndefiniteLength); + err |= cbor_encoder_create_array(&ctxt->encoder, &logs, CborIndefiniteLength); /* Iterate list of logs, encoding each that matches the client request. */ - for (log_idx = 0; ; log_idx++) { + for (log_idx = 0;; log_idx++) { rc = log_mgmt_impl_get_log(log_idx, &log); if (rc == LOG_MGMT_ERR_ENOENT) { /* Log list fully iterated. */ @@ -469,10 +465,9 @@ log_mgmt_module_list(struct mgmt_ctxt *ctxt) err |= cbor_encode_text_stringz(&ctxt->encoder, "rc"); err |= cbor_encode_int(&ctxt->encoder, LOG_MGMT_ERR_EOK); err |= cbor_encode_text_stringz(&ctxt->encoder, "module_map"); - err |= cbor_encoder_create_map(&ctxt->encoder, &modules, - CborIndefiniteLength); + err |= cbor_encoder_create_map(&ctxt->encoder, &modules, CborIndefiniteLength); - for (module = 0; ; module++) { + for (module = 0;; module++) { rc = log_mgmt_impl_get_module(module, &module_name); if (rc == LOG_MGMT_ERR_ENOENT) { break; @@ -513,10 +508,9 @@ log_mgmt_logs_list(struct mgmt_ctxt *ctxt) err |= cbor_encode_text_stringz(&ctxt->encoder, "rc"); err |= cbor_encode_int(&ctxt->encoder, LOG_MGMT_ERR_EOK); err |= cbor_encode_text_stringz(&ctxt->encoder, "log_list"); - err |= cbor_encoder_create_array(&ctxt->encoder, &log_list, - CborIndefiniteLength); + err |= cbor_encoder_create_array(&ctxt->encoder, &log_list, CborIndefiniteLength); - for (log_idx = 0; ; log_idx++) { + for (log_idx = 0;; log_idx++) { rc = log_mgmt_impl_get_log(log_idx, &log); if (rc == LOG_MGMT_ERR_ENOENT) { break; @@ -556,10 +550,9 @@ log_mgmt_level_list(struct mgmt_ctxt *ctxt) err |= cbor_encode_text_stringz(&ctxt->encoder, "rc"); err |= cbor_encode_int(&ctxt->encoder, LOG_MGMT_ERR_EOK); err |= cbor_encode_text_stringz(&ctxt->encoder, "level_map"); - err |= cbor_encoder_create_map(&ctxt->encoder, &level_map, - CborIndefiniteLength); + err |= cbor_encoder_create_map(&ctxt->encoder, &level_map, CborIndefiniteLength); - for (level = 0; ; level++) { + for (level = 0;; level++) { rc = log_mgmt_impl_get_level(level, &level_name); if (rc == LOG_MGMT_ERR_ENOENT) { break; @@ -591,21 +584,17 @@ static int log_mgmt_clear(struct mgmt_ctxt *ctxt) { struct log_mgmt_log log; - char name[LOG_MGMT_NAME_LEN] = {0}; + char name[LOG_MGMT_NAME_LEN] = { 0 }; int name_len; int log_idx; int rc; const struct cbor_attr_t attr[] = { - { - .attribute = "log_name", - .type = CborAttrTextStringType, - .addr.string = name, - .len = sizeof(name) - }, - { - .attribute = NULL - }, + { .attribute = "log_name", + .type = CborAttrTextStringType, + .addr.string = name, + .len = sizeof(name) }, + { .attribute = NULL }, }; name[0] = '\0'; @@ -615,7 +604,7 @@ log_mgmt_clear(struct mgmt_ctxt *ctxt) } name_len = strlen(name); - for (log_idx = 0; ; log_idx++) { + for (log_idx = 0;; log_idx++) { rc = log_mgmt_impl_get_log(log_idx, &log); if (rc == LOG_MGMT_ERR_ENOENT) { return 0; diff --git a/mgmt/mcumgr/cmd/os_mgmt/include/os_mgmt/os_mgmt.h b/mgmt/mcumgr/cmd/os_mgmt/include/os_mgmt/os_mgmt.h index 0c85cbe4d..1c3100e33 100644 --- a/mgmt/mcumgr/cmd/os_mgmt/include/os_mgmt/os_mgmt.h +++ b/mgmt/mcumgr/cmd/os_mgmt/include/os_mgmt/os_mgmt.h @@ -27,14 +27,14 @@ extern "C" { /** * Command IDs for OS management group. */ -#define OS_MGMT_ID_ECHO 0 -#define OS_MGMT_ID_CONS_ECHO_CTRL 1 -#define OS_MGMT_ID_TASKSTAT 2 -#define OS_MGMT_ID_MPSTAT 3 -#define OS_MGMT_ID_DATETIME_STR 4 -#define OS_MGMT_ID_RESET 5 +#define OS_MGMT_ID_ECHO 0 +#define OS_MGMT_ID_CONS_ECHO_CTRL 1 +#define OS_MGMT_ID_TASKSTAT 2 +#define OS_MGMT_ID_MPSTAT 3 +#define OS_MGMT_ID_DATETIME_STR 4 +#define OS_MGMT_ID_RESET 5 -#define OS_MGMT_TASK_NAME_LEN 32 +#define OS_MGMT_TASK_NAME_LEN 32 struct os_mgmt_task_info { uint8_t oti_prio; @@ -52,7 +52,7 @@ struct os_mgmt_task_info { /** * @brief Registers the OS management command handler group. - */ + */ void os_mgmt_register_group(void); #ifdef __cplusplus diff --git a/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c b/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c index b43fa3c56..c5e20d33e 100644 --- a/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c +++ b/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c @@ -65,7 +65,7 @@ static const struct mgmt_handler os_mgmt_group_handlers[] = { }, }; -#define OS_MGMT_GROUP_SZ \ +#define OS_MGMT_GROUP_SZ \ (sizeof os_mgmt_group_handlers / sizeof os_mgmt_group_handlers[0]) static struct mgmt_group os_mgmt_group = { @@ -170,14 +170,13 @@ os_mgmt_taskstat_read(struct mgmt_ctxt *ctxt) err = 0; err |= cbor_encode_text_stringz(&ctxt->encoder, "tasks"); - err |= cbor_encoder_create_map(&ctxt->encoder, &tasks_map, - CborIndefiniteLength); + err |= cbor_encoder_create_map(&ctxt->encoder, &tasks_map, CborIndefiniteLength); if (err != 0) { return MGMT_ERR_ENOMEM; } /* Iterate the list of tasks, encoding each. */ - for (task_idx = 0; ; task_idx++) { + for (task_idx = 0;; task_idx++) { rc = os_mgmt_impl_task_info(task_idx, &task_info); if (rc == MGMT_ERR_ENOENT) { /* No more tasks to encode. */ diff --git a/mgmt/mcumgr/cmd/stat_mgmt/include/stat_mgmt/stat_mgmt.h b/mgmt/mcumgr/cmd/stat_mgmt/include/stat_mgmt/stat_mgmt.h index f0f76fb3e..10e4c1638 100644 --- a/mgmt/mcumgr/cmd/stat_mgmt/include/stat_mgmt/stat_mgmt.h +++ b/mgmt/mcumgr/cmd/stat_mgmt/include/stat_mgmt/stat_mgmt.h @@ -27,8 +27,8 @@ extern "C" { /** * Command IDs for statistics management group. */ -#define STAT_MGMT_ID_SHOW 0 -#define STAT_MGMT_ID_LIST 1 +#define STAT_MGMT_ID_SHOW 0 +#define STAT_MGMT_ID_LIST 1 /** * @brief Represents a single value in a statistics group. @@ -40,7 +40,7 @@ struct stat_mgmt_entry { /** * @brief Registers the statistics management command handler group. - */ + */ void stat_mgmt_register_group(void); #ifdef __cplusplus diff --git a/mgmt/mcumgr/cmd/stat_mgmt/src/stat_mgmt.c b/mgmt/mcumgr/cmd/stat_mgmt/src/stat_mgmt.c index 57ef216ea..7fad709e5 100644 --- a/mgmt/mcumgr/cmd/stat_mgmt/src/stat_mgmt.c +++ b/mgmt/mcumgr/cmd/stat_mgmt/src/stat_mgmt.c @@ -34,7 +34,7 @@ static struct mgmt_handler stat_mgmt_handlers[] = { [STAT_MGMT_ID_LIST] = { stat_mgmt_list, NULL }, }; -#define STAT_MGMT_HANDLER_CNT \ +#define STAT_MGMT_HANDLER_CNT \ sizeof stat_mgmt_handlers / sizeof stat_mgmt_handlers[0] static struct mgmt_group stat_mgmt_group = { @@ -74,12 +74,10 @@ stat_mgmt_show(struct mgmt_ctxt *ctxt) int rc; struct cbor_attr_t attrs[] = { - { - .attribute = "name", - .type = CborAttrTextStringType, - .addr.string = stat_name, - .len = sizeof(stat_name) - }, + { .attribute = "name", + .type = CborAttrTextStringType, + .addr.string = stat_name, + .len = sizeof(stat_name) }, { NULL }, }; @@ -95,11 +93,9 @@ stat_mgmt_show(struct mgmt_ctxt *ctxt) err |= cbor_encode_text_stringz(&ctxt->encoder, stat_name); err |= cbor_encode_text_stringz(&ctxt->encoder, "fields"); - err |= cbor_encoder_create_map(&ctxt->encoder, &map_enc, - CborIndefiniteLength); + err |= cbor_encoder_create_map(&ctxt->encoder, &map_enc, CborIndefiniteLength); - rc = stat_mgmt_impl_foreach_entry(stat_name, stat_mgmt_cb_encode, - &map_enc); + rc = stat_mgmt_impl_foreach_entry(stat_name, stat_mgmt_cb_encode, &map_enc); err |= cbor_encoder_close_container(&ctxt->encoder, &map_enc); if (err != 0) { @@ -125,13 +121,12 @@ stat_mgmt_list(struct mgmt_ctxt *ctxt) err |= cbor_encode_text_stringz(&ctxt->encoder, "rc"); err |= cbor_encode_int(&ctxt->encoder, MGMT_ERR_EOK); err |= cbor_encode_text_stringz(&ctxt->encoder, "stat_list"); - err |= cbor_encoder_create_array(&ctxt->encoder, &arr_enc, - CborIndefiniteLength); + err |= cbor_encoder_create_array(&ctxt->encoder, &arr_enc, CborIndefiniteLength); /* Iterate the list of stat groups, encoding each group's name in the CBOR * array. */ - for (i = 0; ; i++) { + for (i = 0;; i++) { rc = stat_mgmt_impl_get_group(i, &group_name); if (rc == MGMT_ERR_ENOENT) { /* No more stat groups. */ diff --git a/mgmt/mcumgr/mgmt/include/mgmt/endian.h b/mgmt/mcumgr/mgmt/include/mgmt/endian.h index ad9bd344b..2665b8152 100644 --- a/mgmt/mcumgr/mgmt/include/mgmt/endian.h +++ b/mgmt/mcumgr/mgmt/include/mgmt/endian.h @@ -40,9 +40,7 @@ extern "C" { /* Little endian. */ #ifndef ntohs -#define ntohs(x) ((uint16_t) \ - ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8))) +#define ntohs(x) ((uint16_t)((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))) #endif #ifndef htons diff --git a/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h b/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h index cb7e896dc..b0fc2dd33 100644 --- a/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h +++ b/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h @@ -28,68 +28,68 @@ extern "C" { #endif /* MTU for newtmgr responses */ -#define MGMT_MAX_MTU 1024 +#define MGMT_MAX_MTU 1024 /** Opcodes; encoded in first byte of header. */ -#define MGMT_OP_READ 0 -#define MGMT_OP_READ_RSP 1 -#define MGMT_OP_WRITE 2 -#define MGMT_OP_WRITE_RSP 3 +#define MGMT_OP_READ 0 +#define MGMT_OP_READ_RSP 1 +#define MGMT_OP_WRITE 2 +#define MGMT_OP_WRITE_RSP 3 /** * The first 64 groups are reserved for system level mcumgr commands. * Per-user commands are then defined after group 64. */ -#define MGMT_GROUP_ID_OS 0 -#define MGMT_GROUP_ID_IMAGE 1 -#define MGMT_GROUP_ID_STAT 2 -#define MGMT_GROUP_ID_CONFIG 3 -#define MGMT_GROUP_ID_LOG 4 -#define MGMT_GROUP_ID_CRASH 5 -#define MGMT_GROUP_ID_SPLIT 6 -#define MGMT_GROUP_ID_RUN 7 -#define MGMT_GROUP_ID_FS 8 -#define MGMT_GROUP_ID_SHELL 9 -#define MGMT_GROUP_ID_PERUSER 64 +#define MGMT_GROUP_ID_OS 0 +#define MGMT_GROUP_ID_IMAGE 1 +#define MGMT_GROUP_ID_STAT 2 +#define MGMT_GROUP_ID_CONFIG 3 +#define MGMT_GROUP_ID_LOG 4 +#define MGMT_GROUP_ID_CRASH 5 +#define MGMT_GROUP_ID_SPLIT 6 +#define MGMT_GROUP_ID_RUN 7 +#define MGMT_GROUP_ID_FS 8 +#define MGMT_GROUP_ID_SHELL 9 +#define MGMT_GROUP_ID_PERUSER 64 /** * mcumgr error codes. */ -#define MGMT_ERR_EOK 0 -#define MGMT_ERR_EUNKNOWN 1 -#define MGMT_ERR_ENOMEM 2 -#define MGMT_ERR_EINVAL 3 -#define MGMT_ERR_ETIMEOUT 4 -#define MGMT_ERR_ENOENT 5 -#define MGMT_ERR_EBADSTATE 6 /* Current state disallows command. */ -#define MGMT_ERR_EMSGSIZE 7 /* Response too large. */ -#define MGMT_ERR_ENOTSUP 8 /* Command not supported. */ -#define MGMT_ERR_ECORRUPT 9 /* Corrupt */ -#define MGMT_ERR_EPERUSER 256 +#define MGMT_ERR_EOK 0 +#define MGMT_ERR_EUNKNOWN 1 +#define MGMT_ERR_ENOMEM 2 +#define MGMT_ERR_EINVAL 3 +#define MGMT_ERR_ETIMEOUT 4 +#define MGMT_ERR_ENOENT 5 +#define MGMT_ERR_EBADSTATE 6 /* Current state disallows command. */ +#define MGMT_ERR_EMSGSIZE 7 /* Response too large. */ +#define MGMT_ERR_ENOTSUP 8 /* Command not supported. */ +#define MGMT_ERR_ECORRUPT 9 /* Corrupt */ +#define MGMT_ERR_EPERUSER 256 -#define MGMT_HDR_SIZE 8 +#define MGMT_HDR_SIZE 8 /* * MGMT event opcodes. */ -#define MGMT_EVT_OP_CMD_RECV 0x01 -#define MGMT_EVT_OP_CMD_STATUS 0x02 -#define MGMT_EVT_OP_CMD_DONE 0x03 +#define MGMT_EVT_OP_CMD_RECV 0x01 +#define MGMT_EVT_OP_CMD_STATUS 0x02 +#define MGMT_EVT_OP_CMD_DONE 0x03 struct mgmt_hdr { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - uint8_t nh_op:3; /* MGMT_OP_[...] */ - uint8_t _res1:5; + uint8_t nh_op : 3; /* MGMT_OP_[...] */ + uint8_t _res1 : 5; #endif #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - uint8_t _res1:5; - uint8_t nh_op:3; /* MGMT_OP_[...] */ + uint8_t _res1 : 5; + uint8_t nh_op : 3; /* MGMT_OP_[...] */ #endif - uint8_t nh_flags; /* Reserved for future flags */ - uint16_t nh_len; /* Length of the payload */ - uint16_t nh_group; /* MGMT_GROUP_ID_[...] */ - uint8_t nh_seq; /* Sequence number */ - uint8_t nh_id; /* Message ID within group */ + uint8_t nh_flags; /* Reserved for future flags */ + uint16_t nh_len; /* Length of the payload */ + uint16_t nh_group; /* MGMT_GROUP_ID_[...] */ + uint8_t nh_seq; /* Sequence number */ + uint8_t nh_id; /* Message ID within group */ }; #define nmgr_hdr mgmt_hdr @@ -105,7 +105,7 @@ struct mgmt_evt_op_cmd_status_arg { * MGMT_EVT_OP_CMD_DONE argument */ struct mgmt_evt_op_cmd_done_arg { - int err; /* MGMT_ERR_[...] */ + int err; /* MGMT_ERR_[...] */ }; /** @typedef mgmt_on_evt_cb @@ -118,8 +118,7 @@ struct mgmt_evt_op_cmd_done_arg { * @param id Message ID within group. * @param arg Optional event argument. */ -typedef void mgmt_on_evt_cb(uint8_t opcode, uint16_t group, uint8_t id, - void *arg); +typedef void mgmt_on_evt_cb(uint8_t opcode, uint16_t group, uint8_t id, void *arg); /** @typedef mgmt_alloc_rsp_fn * @brief Allocates a buffer suitable for holding a response. @@ -286,8 +285,7 @@ struct mgmt_group { * @return Newly-allocated buffer on success * NULL on failure. */ -void *mgmt_streamer_alloc_rsp(struct mgmt_streamer *streamer, - const void *src_buf); +void *mgmt_streamer_alloc_rsp(struct mgmt_streamer *streamer, const void *src_buf); /** * @brief Uses the specified streamer to trim data from the front of a buffer. @@ -299,8 +297,7 @@ void *mgmt_streamer_alloc_rsp(struct mgmt_streamer *streamer, * @param buf The buffer to trim. * @param len The number of bytes to remove. */ -void mgmt_streamer_trim_front(struct mgmt_streamer *streamer, void *buf, - size_t len); +void mgmt_streamer_trim_front(struct mgmt_streamer *streamer, void *buf, size_t len); /** * @brief Uses the specified streamer to reset a buffer to a length of 0. @@ -371,8 +368,7 @@ void mgmt_register_group(struct mgmt_group *group); * * @param group The group to register. */ -void -mgmt_unregister_group(struct mgmt_group *group); +void mgmt_unregister_group(struct mgmt_group *group); /** * @brief Finds a registered command handler. @@ -383,8 +379,7 @@ mgmt_unregister_group(struct mgmt_group *group); * @return The requested command handler on success; * NULL on failure. */ -const struct mgmt_handler *mgmt_find_handler(uint16_t group_id, - uint16_t command_id); +const struct mgmt_handler *mgmt_find_handler(uint16_t group_id, uint16_t command_id); /** * @brief Encodes a response status into the specified management context. diff --git a/mgmt/mcumgr/mgmt/src/mgmt.c b/mgmt/mcumgr/mgmt/src/mgmt.c index 361211a44..d652089ac 100644 --- a/mgmt/mcumgr/mgmt/src/mgmt.c +++ b/mgmt/mcumgr/mgmt/src/mgmt.c @@ -175,9 +175,12 @@ int mgmt_err_from_cbor(int cbor_status) { switch (cbor_status) { - case CborNoError: return MGMT_ERR_EOK; - case CborErrorOutOfMemory: return MGMT_ERR_ENOMEM; - default: return MGMT_ERR_EUNKNOWN; + case CborNoError: + return MGMT_ERR_EOK; + case CborErrorOutOfMemory: + return MGMT_ERR_ENOMEM; + default: + return MGMT_ERR_EUNKNOWN; } } diff --git a/mgmt/mcumgr/omp/include/omp/omp.h b/mgmt/mcumgr/omp/include/omp/omp.h index 82502af24..ae99ef7e1 100644 --- a/mgmt/mcumgr/omp/include/omp/omp.h +++ b/mgmt/mcumgr/omp/include/omp/omp.h @@ -54,7 +54,7 @@ struct mgmt_hdr; * @param retval The return value for the request. * @param arg Optional streamer argument. */ -typedef void omp_tx_rsp_fn(struct omp_streamer *stmr, int retval, void* arg); +typedef void omp_tx_rsp_fn(struct omp_streamer *stmr, int retval, void *arg); /** * @brief Decodes, encodes, and transmits OMP requests and responses. @@ -76,7 +76,6 @@ struct omp_state { void *request; }; - /** * @brief Processes a single OMP request packet and sends all corresponding * responses. @@ -99,7 +98,7 @@ int omp_impl_process_request_packet(struct omp_state *omgr_st, void *req); * * @param cv Ptr to CoberValue * @param out_hdr Ptr to management header to be filled in - */ + */ int omp_read_hdr(struct CborValue *cv, struct mgmt_hdr *out_hdr); #ifdef __cplusplus diff --git a/mgmt/mcumgr/omp/include/omp/omp_priv.h b/mgmt/mcumgr/omp/include/omp/omp_priv.h index 4147cb7fa..85ce8355f 100644 --- a/mgmt/mcumgr/omp/include/omp/omp_priv.h +++ b/mgmt/mcumgr/omp/include/omp/omp_priv.h @@ -27,11 +27,9 @@ extern "C" { #endif int omp_encode_mgmt_hdr(struct CborEncoder *enc, struct mgmt_hdr hdr); -int omp_send_err_rsp(struct CborEncoder *enc, - const struct mgmt_hdr *hdr, +int omp_send_err_rsp(struct CborEncoder *enc, const struct mgmt_hdr *hdr, int mgmt_status); -int omp_process_mgmt_hdr(struct mgmt_hdr *req_hdr, - struct mgmt_hdr *rsp_hdr, +int omp_process_mgmt_hdr(struct mgmt_hdr *req_hdr, struct mgmt_hdr *rsp_hdr, struct mgmt_ctxt *ctxt); #ifdef __cplusplus diff --git a/mgmt/mcumgr/omp/src/omp.c b/mgmt/mcumgr/omp/src/omp.c index 5dedf3cef..c305f7539 100644 --- a/mgmt/mcumgr/omp/src/omp.c +++ b/mgmt/mcumgr/omp/src/omp.c @@ -51,9 +51,7 @@ omp_encode_mgmt_hdr(struct CborEncoder *enc, struct mgmt_hdr hdr) } int -omp_send_err_rsp(struct CborEncoder *enc, - const struct mgmt_hdr *hdr, - int mgmt_status) +omp_send_err_rsp(struct CborEncoder *enc, const struct mgmt_hdr *hdr, int mgmt_status) { int rc; @@ -107,8 +105,7 @@ omp_read_hdr(struct CborValue *cv, struct mgmt_hdr *out_hdr) } int -omp_process_mgmt_hdr(struct mgmt_hdr *req_hdr, - struct mgmt_hdr *rsp_hdr, +omp_process_mgmt_hdr(struct mgmt_hdr *req_hdr, struct mgmt_hdr *rsp_hdr, struct mgmt_ctxt *ctxt) { int rc = 0; diff --git a/mgmt/mcumgr/smp/src/smp.c b/mgmt/mcumgr/smp/src/smp.c index 5ae0fc4d8..0af163c5a 100644 --- a/mgmt/mcumgr/smp/src/smp.c +++ b/mgmt/mcumgr/smp/src/smp.c @@ -56,7 +56,7 @@ smp_rsp_op(uint8_t req_op) static void smp_init_rsp_hdr(const struct mgmt_hdr *req_hdr, struct mgmt_hdr *rsp_hdr) { - *rsp_hdr = (struct mgmt_hdr) { + *rsp_hdr = (struct mgmt_hdr){ .nh_len = 0, .nh_flags = 0, .nh_op = smp_rsp_op(req_hdr->nh_op), @@ -86,15 +86,13 @@ smp_write_hdr(struct smp_streamer *streamer, const struct mgmt_hdr *src_hdr) { int rc; - rc = mgmt_streamer_write_at(&streamer->mgmt_stmr, 0, src_hdr, - sizeof *src_hdr); + rc = mgmt_streamer_write_at(&streamer->mgmt_stmr, 0, src_hdr, sizeof *src_hdr); return mgmt_err_from_cbor(rc); } static int smp_build_err_rsp(struct smp_streamer *streamer, - const struct mgmt_hdr *req_hdr, - int status) + const struct mgmt_hdr *req_hdr, int status) { struct CborEncoder map; struct mgmt_ctxt cbuf; @@ -168,8 +166,7 @@ smp_handle_single_payload(struct mgmt_ctxt *cbuf, /* Begin response payload. Response fields are inserted into the root * map as key value pairs. */ - rc = cbor_encoder_create_map(&cbuf->encoder, &payload_encoder, - CborIndefiniteLength); + rc = cbor_encoder_create_map(&cbuf->encoder, &payload_encoder, CborIndefiniteLength); rc = mgmt_err_from_cbor(rc); if (rc != 0) { return rc; @@ -373,8 +370,7 @@ smp_process_request_packet(struct smp_streamer *streamer, void *req) smp_align4(req_hdr.nh_len)); cmd_done_arg.err = MGMT_ERR_EOK; - mgmt_evt(MGMT_EVT_OP_CMD_DONE, req_hdr.nh_group, req_hdr.nh_id, - &cmd_done_arg); + mgmt_evt(MGMT_EVT_OP_CMD_DONE, req_hdr.nh_group, req_hdr.nh_id, &cmd_done_arg); } if (rc != 0 && valid_hdr) {
