From aed0e2873ef7cd45023c8a63c7fc2a565b999950 Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Sat, 10 Jun 2023 19:44:11 +0300 Subject: [PATCH] apps: fix style issues in code Add missing FAR and CODE to pointers Remove FAR for non-pointer variables Remove extra spaces and align the parameters Add do {} while(0) wrapper in macro Use nitems to calculate number of elements in arrays Signed-off-by: Petro Karashchenko --- canutils/libobd2/obd_waitresponse.c | 4 +- examples/usrsocktest/usrsocktest_daemon.c | 2 +- examples/usrsocktest/usrsocktest_main.c | 2 +- include/lte/lapi.h | 2 +- include/lte/lte_lwm2m.h | 14 +- include/wireless/iwpan.h | 2 +- include/wireless/wapi.h | 2 +- lte/alt1250/alt1250_atcmd.c | 281 +++++++------- lte/alt1250/alt1250_atcmd.h | 168 ++++---- lte/alt1250/alt1250_container.c | 8 +- lte/alt1250/alt1250_container.h | 22 +- lte/alt1250/alt1250_dbg.h | 8 +- lte/alt1250/alt1250_devevent.c | 8 +- lte/alt1250/alt1250_devif.c | 4 +- lte/alt1250/alt1250_devif.h | 4 +- lte/alt1250/alt1250_main.c | 13 +- lte/alt1250/alt1250_postproc.h | 4 +- lte/alt1250/alt1250_reset_seq.c | 23 +- lte/alt1250/alt1250_select.c | 24 +- lte/alt1250/alt1250_socket.c | 2 +- lte/alt1250/alt1250_socket.h | 89 +++-- lte/alt1250/alt1250_usockevent.c | 4 +- lte/alt1250/alt1250_usockif.c | 3 +- lte/alt1250/alt1250_util.c | 4 +- lte/alt1250/callback_handlers/alt1250_evt.c | 367 +++++++++--------- lte/alt1250/callback_handlers/alt1250_evt.h | 7 +- .../usock_handlers/alt1250_closehdlr.c | 4 +- .../usock_handlers/alt1250_connecthdlr.c | 8 +- .../usock_handlers/alt1250_getsocknamehdlr.c | 8 +- .../usock_handlers/alt1250_getsockopthdlr.c | 8 +- .../usock_handlers/alt1250_sockethdlr.c | 8 +- netutils/ftpd/ftpd.c | 2 +- nshlib/nsh_proccmds.c | 6 +- system/trace/trace_dump.c | 4 +- testing/drivertest/drivertest_uart.c | 10 +- 35 files changed, 615 insertions(+), 514 deletions(-) diff --git a/canutils/libobd2/obd_waitresponse.c b/canutils/libobd2/obd_waitresponse.c index bb25638e8..d000a5a19 100644 --- a/canutils/libobd2/obd_waitresponse.c +++ b/canutils/libobd2/obd_waitresponse.c @@ -92,10 +92,10 @@ int obd_wait_response(FAR struct obd_dev_s *dev, uint8_t opmode, uint8_t pid, return -EAGAIN; } - #ifdef CONFIG_DEBUG_INFO +#ifdef CONFIG_DEBUG_INFO printf(" ID: %4u DLC: %u\n", dev->can_rxmsg.cm_hdr.ch_id, dev->can_rxmsg.cm_hdr.ch_dlc); - #endif +#endif msgdlc = dev->can_rxmsg.cm_hdr.ch_dlc; diff --git a/examples/usrsocktest/usrsocktest_daemon.c b/examples/usrsocktest/usrsocktest_daemon.c index 272aa9401..e2b15888b 100644 --- a/examples/usrsocktest/usrsocktest_daemon.c +++ b/examples/usrsocktest/usrsocktest_daemon.c @@ -50,7 +50,7 @@ ****************************************************************************/ #ifndef dbg - #define dbg _warn +# define dbg _warn #endif #define usrsocktest_dbg(...) ((void)0) diff --git a/examples/usrsocktest/usrsocktest_main.c b/examples/usrsocktest/usrsocktest_main.c index d7024c292..2d854d87a 100644 --- a/examples/usrsocktest/usrsocktest_main.c +++ b/examples/usrsocktest/usrsocktest_main.c @@ -49,7 +49,7 @@ ****************************************************************************/ #ifndef dbg - #define dbg _warn +# define dbg _warn #endif #define usrsocktest_dbg(...) ((void)0) diff --git a/include/lte/lapi.h b/include/lte/lapi.h index 7e3b7b091..bf1310578 100644 --- a/include/lte/lapi.h +++ b/include/lte/lapi.h @@ -36,7 +36,7 @@ * Public Types ****************************************************************************/ - #ifdef __cplusplus +#ifdef __cplusplus #define EXTERN extern "C" extern "C" { diff --git a/include/lte/lte_lwm2m.h b/include/lte/lte_lwm2m.h index c61e2b3d1..4bbc793a5 100644 --- a/include/lte/lte_lwm2m.h +++ b/include/lte/lte_lwm2m.h @@ -233,26 +233,26 @@ struct lwm2mstub_serverinfo_s char security_key[LWM2MSTUB_MAX_SEQKEY]; }; -typedef void (*lwm2mstub_write_cb_t)(int seq_no, int srv_id, +typedef CODE void (*lwm2mstub_write_cb_t)(int seq_no, int srv_id, FAR struct lwm2mstub_instance_s *inst, FAR char *value, int len); -typedef void (*lwm2mstub_read_cb_t)(int seq_no, int srv_id, +typedef CODE void (*lwm2mstub_read_cb_t)(int seq_no, int srv_id, FAR struct lwm2mstub_instance_s *inst); -typedef void (*lwm2mstub_exec_cb_t)(int seq_no, int srv_id, +typedef CODE void (*lwm2mstub_exec_cb_t)(int seq_no, int srv_id, FAR struct lwm2mstub_instance_s *inst); -typedef void (*lwm2mstub_ovstart_cb_t)(int seq_no, int srv_id, +typedef CODE void (*lwm2mstub_ovstart_cb_t)(int seq_no, int srv_id, FAR struct lwm2mstub_instance_s *inst, FAR char *token, FAR struct lwm2mstub_ovcondition_s *cond); -typedef void (*lwm2mstub_ovstop_cb_t)(int seq_no, int srv_id, +typedef CODE void (*lwm2mstub_ovstop_cb_t)(int seq_no, int srv_id, FAR struct lwm2mstub_instance_s *inst, FAR char *token); -typedef void (*lwm2mstub_operation_cb_t)(int event); +typedef CODE void (*lwm2mstub_operation_cb_t)(int event); -typedef void (*lwm2mstub_fwupstate_cb_t)(int event); +typedef CODE void (*lwm2mstub_fwupstate_cb_t)(int event); #ifdef __cplusplus #define EXTERN extern "C" diff --git a/include/wireless/iwpan.h b/include/wireless/iwpan.h index 84df05419..a6561b673 100644 --- a/include/wireless/iwpan.h +++ b/include/wireless/iwpan.h @@ -37,7 +37,7 @@ * Public Data ****************************************************************************/ - #ifdef __cplusplus +#ifdef __cplusplus #define EXTERN extern "C" extern "C" { diff --git a/include/wireless/wapi.h b/include/wireless/wapi.h index 696294e95..4f8ed9cf2 100644 --- a/include/wireless/wapi.h +++ b/include/wireless/wapi.h @@ -312,7 +312,7 @@ enum wapi_pta_prio_e * Public Data ****************************************************************************/ - #ifdef __cplusplus +#ifdef __cplusplus #define EXTERN extern "C" extern "C" { diff --git a/lte/alt1250/alt1250_atcmd.c b/lte/alt1250/alt1250_atcmd.c index fcf52c54c..472256ee6 100644 --- a/lte/alt1250/alt1250_atcmd.c +++ b/lte/alt1250/alt1250_atcmd.c @@ -241,7 +241,7 @@ static int send_internal_at_command(FAR struct alt1250_s *dev, set_container_argument(container, inparam, nitems(inparam)); set_container_response(container, atcmd_oargs, nitems(atcmd_oargs)); set_container_postproc(container, postproc_internal_atcmd, - (unsigned long)&postproc_argument); + (unsigned long)&postproc_argument); err_alt1250("Internal ATCMD : %s\n", dev->tx_buff); @@ -261,7 +261,7 @@ static int send_internal_at_command(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_reset(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, "ATZ\r"); @@ -273,12 +273,12 @@ int lwm2mstub_send_reset(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setenable(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool en) + FAR struct alt_container_s *container, bool en) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%SETACFG=modem_apps.LWM2M.AppEnable,\"%s\"\r", - en ? "true" : "false"); + "AT%%SETACFG=modem_apps.LWM2M.AppEnable,\"%s\"\r", + en ? "true" : "false"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -287,10 +287,11 @@ int lwm2mstub_send_setenable(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getenable(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, FAR int32_t *usock_result) + FAR struct alt_container_s *container, + FAR int32_t *usock_result) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=modem_apps.LWM2M.AppEnable\r"); + "AT%%GETACFG=modem_apps.LWM2M.AppEnable\r"); return send_internal_at_command(dev, container, -1, NULL, 0, usock_result); } @@ -299,11 +300,11 @@ int lwm2mstub_send_getenable(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getnamemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=LWM2M.Config.NameMode\r"); + "AT%%GETACFG=LWM2M.Config.NameMode\r"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -312,11 +313,12 @@ int lwm2mstub_send_getnamemode(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setnamemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int mode) + FAR struct alt_container_s *container, + int mode) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%SETACFG=LWM2M.Config.NameMode,%d\r", mode); + "AT%%SETACFG=LWM2M.Config.NameMode,%d\r", mode); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -325,11 +327,11 @@ int lwm2mstub_send_setnamemode(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getversion(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=LWM2M.Config.Version\r"); + "AT%%GETACFG=LWM2M.Config.Version\r"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -338,7 +340,8 @@ int lwm2mstub_send_getversion(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setversion(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool is_v1_1) + FAR struct alt_container_s *container, + bool is_v1_1) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, @@ -351,11 +354,11 @@ int lwm2mstub_send_setversion(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getwriteattr(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=LWM2M.HostObjects.HostEnableWriteAttrURCMode\r"); + "AT%%GETACFG=LWM2M.HostObjects.HostEnableWriteAttrURCMode\r"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -364,12 +367,13 @@ int lwm2mstub_send_getwriteattr(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setwriteattr(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool en) + FAR struct alt_container_s *container, + bool en) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, "AT%%SETACFG=LWM2M.HostObjects.HostEnableWriteAttrURCMode,\"%s\"\r", - en ? "true" : "false"); + en ? "true" : "false"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -378,11 +382,11 @@ int lwm2mstub_send_setwriteattr(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getautoconnect(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=LWM2M.Config.AutoConnect\r"); + "AT%%GETACFG=LWM2M.Config.AutoConnect\r"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -391,12 +395,13 @@ int lwm2mstub_send_getautoconnect(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setautoconnect(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool en) + FAR struct alt_container_s *container, + bool en) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%SETACFG=LWM2M.Config.AutoConnect,\"%s\"\r", - en ? "true" : "false"); + "AT%%SETACFG=LWM2M.Config.AutoConnect,\"%s\"\r", + en ? "true" : "false"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -405,11 +410,11 @@ int lwm2mstub_send_setautoconnect(FAR struct alt1250_s *dev, ****************************************************************************/ int ltenwop_send_getnwop(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%NWOPER?\r"); + "AT%%NWOPER?\r"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -418,11 +423,11 @@ int ltenwop_send_getnwop(FAR struct alt1250_s *dev, ****************************************************************************/ int ltenwop_send_setnwoptp(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int32_t dummy; snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%NWOPER=\"TRUPHONE\"\r"); + "AT%%NWOPER=\"TRUPHONE\"\r"); return send_internal_at_command(dev, container, -1, NULL, 0, &dummy); } @@ -431,11 +436,11 @@ int ltenwop_send_setnwoptp(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getqueuemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=LWM2M.TransportBindings_1_1.Queue\r"); + "AT%%GETACFG=LWM2M.TransportBindings_1_1.Queue\r"); return send_internal_at_command(dev, container, usockid, atcmdreply_true_false, 0, ures); } @@ -445,12 +450,12 @@ int lwm2mstub_send_getqueuemode(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setqueuemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int en) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int en) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%SETACFG=LWM2M.TransportBindings_1_1.Queue,%s\r", - (en == 1) ? "true" : "false"); + "AT%%SETACFG=LWM2M.TransportBindings_1_1.Queue,%s\r", + (en == 1) ? "true" : "false"); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); } @@ -460,11 +465,11 @@ int lwm2mstub_send_setqueuemode(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_m2mopev(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, bool en) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, bool en) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MOPEV=%c,100\r", en ? '1' : '0'); + "AT%%LWM2MOPEV=%c,100\r", en ? '1' : '0'); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); } @@ -474,11 +479,11 @@ int lwm2mstub_send_m2mopev(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_m2mev(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, bool en) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, bool en) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MEV=%c\r", en ? '1' : '0'); + "AT%%LWM2MEV=%c\r", en ? '1' : '0'); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); } @@ -488,11 +493,11 @@ int lwm2mstub_send_m2mev(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_m2mobjcmd(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, bool en) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, bool en) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MOBJCMD=%c\r", en ? '1' : '0'); + "AT%%LWM2MOBJCMD=%c\r", en ? '1' : '0'); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); } @@ -502,13 +507,13 @@ int lwm2mstub_send_m2mobjcmd(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getepname(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=LWM2M.Config.Name\r"); - return send_internal_at_command(dev, container, usockid, - proc, arg, ures); + "AT%%GETACFG=LWM2M.Config.Name\r"); + return send_internal_at_command(dev, container, usockid, proc, arg, ures); } /**************************************************************************** @@ -516,13 +521,13 @@ int lwm2mstub_send_getepname(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getsrvinfo(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MCMD=SERVERSINFO\r"); - return send_internal_at_command(dev, container, usockid, - proc, arg, ures); + "AT%%LWM2MCMD=SERVERSINFO\r"); + return send_internal_at_command(dev, container, usockid, proc, arg, ures); } /**************************************************************************** @@ -530,14 +535,14 @@ int lwm2mstub_send_getsrvinfo(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getresource(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - FAR char *resource) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + FAR char *resource) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MCMD=GET_RESOURCE,%s\r", resource); - return send_internal_at_command(dev, container, usockid, proc, - arg, ures); + "AT%%LWM2MCMD=GET_RESOURCE,%s\r", resource); + return send_internal_at_command(dev, container, usockid, proc, arg, ures); } /**************************************************************************** @@ -545,13 +550,13 @@ int lwm2mstub_send_getresource(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getsupobjs(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%GETACFG=LWM2M.Config.SupportedObjects\r"); - return send_internal_at_command(dev, container, usockid, proc, - arg, ures); + "AT%%GETACFG=LWM2M.Config.SupportedObjects\r"); + return send_internal_at_command(dev, container, usockid, proc, arg, ures); } /**************************************************************************** @@ -559,12 +564,13 @@ int lwm2mstub_send_getsupobjs(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getobjdef(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - uint16_t objid) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + uint16_t objid) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MOBJDEF=GET,%d\r", objid); + "AT%%LWM2MOBJDEF=GET,%d\r", objid); return send_internal_at_command(dev, container, usockid, proc, arg, ures); } @@ -574,12 +580,12 @@ int lwm2mstub_send_getobjdef(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_changerat(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int rat) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int rat) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%setacfg=radiom.config.preferred_rat_list,\"%s\"\r", - (rat == LTE_RAT_CATM) ? "CATM" : "NBIOT"); + "AT%%setacfg=radiom.config.preferred_rat_list,\"%s\"\r", + (rat == LTE_RAT_CATM) ? "CATM" : "NBIOT"); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); @@ -590,13 +596,13 @@ int lwm2mstub_send_changerat(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_getrat(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%getacfg=radiom.config.preferred_rat_list\r"); - return send_internal_at_command(dev, container, usockid, proc, - arg, ures); + "AT%%getacfg=radiom.config.preferred_rat_list\r"); + return send_internal_at_command(dev, container, usockid, proc, arg, ures); } /**************************************************************************** @@ -604,11 +610,12 @@ int lwm2mstub_send_getrat(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setepname(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, FAR const char *epname) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + FAR const char *epname) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%SETACFG=\"LWM2M.Config.Name\",\"%s\"\r", epname); + "AT%%SETACFG=\"LWM2M.Config.Name\",\"%s\"\r", epname); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); } @@ -618,13 +625,13 @@ int lwm2mstub_send_setepname(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_bsstart(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MBSCMD=\"START\"\r"); - return send_internal_at_command(dev, container, usockid, - proc, arg, ures); + "AT%%LWM2MBSCMD=\"START\"\r"); + return send_internal_at_command(dev, container, usockid, proc, arg, ures); } /**************************************************************************** @@ -632,13 +639,13 @@ int lwm2mstub_send_bsstart(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_bsdelete(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MBSCMD=\"DELETE\"\r"); - return send_internal_at_command(dev, container, usockid, - proc, arg, ures); + "AT%%LWM2MBSCMD=\"DELETE\"\r"); + return send_internal_at_command(dev, container, usockid, proc, arg, ures); } /**************************************************************************** @@ -646,17 +653,18 @@ int lwm2mstub_send_bsdelete(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_bscreateobj0(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - FAR struct lwm2mstub_serverinfo_s *info) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + FAR struct lwm2mstub_serverinfo_s *info) { int i; int pos; pos = snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MBSCMD=\"CREATE\",0,0,0,\"%s\",1,\"%s\",2,%d", - info->server_uri, info->bootstrap ? "true" : "false", - info->security_mode); + "AT%%LWM2MBSCMD=\"CREATE\",0,0,0,\"%s\",1,\"%s\",2,%d", + info->server_uri, info->bootstrap ? "true" : "false", + info->security_mode); if (info->security_mode != LWM2MSTUB_SECUREMODE_NOSEC) { @@ -695,13 +703,14 @@ int lwm2mstub_send_bscreateobj0(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_bscreateobj1(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - FAR struct lwm2mstub_serverinfo_s *info) + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + FAR struct lwm2mstub_serverinfo_s *info) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MBSCMD=\"CREATE\",1,0,0,0,1,%lu%s\r", info->lifetime, - info->nonip ? ",7,\"N\",22,\"N\"" : ""); + "AT%%LWM2MBSCMD=\"CREATE\",1,0,0,0,1,%lu%s\r", info->lifetime, + info->nonip ? ",7,\"N\",22,\"N\"" : ""); return send_internal_at_command(dev, container, usockid, proc, arg, ures); } @@ -715,7 +724,7 @@ int lwm2mstub_send_bsdone(FAR struct alt1250_s *dev, int16_t usockid, FAR int32_t *ures) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MBSCMD=\"DONE\"\r"); + "AT%%LWM2MBSCMD=\"DONE\"\r"); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); } @@ -725,12 +734,13 @@ int lwm2mstub_send_bsdone(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setsupobjs(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, FAR uint16_t *objids, int objnum) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + FAR uint16_t *objids, int objnum) { int pos; pos = snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%SETACFG=LWM2M.Config.SupportedObjects,0;1"); + "AT%%SETACFG=LWM2M.Config.SupportedObjects,0;1"); while (objnum > 0) { @@ -758,14 +768,15 @@ int lwm2mstub_send_setsupobjs(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_setobjdef(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, uint16_t objid, int resnum, - FAR struct lwm2mstub_resource_s *resucs) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + uint16_t objid, int resnum, + FAR struct lwm2mstub_resource_s *resucs) { int pos; pos = snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MOBJDEF=SET,%d", objid); + "AT%%LWM2MOBJDEF=SET,%d", objid); while (resnum > 0) { @@ -798,15 +809,15 @@ int lwm2mstub_send_setobjdef(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_registration(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int cmd) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int cmd) { snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MCMD=%s\r", - cmd == LWM2MSTUB_CONNECT_REGISTER ? "REGISTER" : - cmd == LWM2MSTUB_CONNECT_DEREGISTER ? "DEREGISTER" : - cmd == LWM2MSTUB_CONNECT_REREGISTER ? "REGISTERUPD" : - "BOOTSTARP"); + "AT%%LWM2MCMD=%s\r", + cmd == LWM2MSTUB_CONNECT_REGISTER ? "REGISTER" : + cmd == LWM2MSTUB_CONNECT_DEREGISTER ? "DEREGISTER" : + cmd == LWM2MSTUB_CONNECT_REREGISTER ? "REGISTERUPD" : + "BOOTSTARP"); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); @@ -817,9 +828,11 @@ int lwm2mstub_send_registration(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_evrespwvalue(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int seq_no, int resp, - FAR struct lwm2mstub_instance_s *inst, FAR char *retval) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + int seq_no, int resp, + FAR struct lwm2mstub_instance_s *inst, + FAR char *retval) { int pos; FAR const char *resp_str = get_m2mrespstr(resp); @@ -831,17 +844,17 @@ int lwm2mstub_send_evrespwvalue(FAR struct alt1250_s *dev, } pos = snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MOBJRSP=%d,\"%s\",\"/%d/%d/%d", seq_no, resp_str, - inst->object_id, inst->object_inst, inst->res_id); + "AT%%LWM2MOBJRSP=%d,\"%s\",\"/%d/%d/%d", seq_no, resp_str, + inst->object_id, inst->object_inst, inst->res_id); if (inst->res_inst >= 0) { pos += snprintf((FAR char *)&dev->tx_buff[pos], _TX_BUFF_SIZE - pos, - "/%d", inst->res_inst); + "/%d", inst->res_inst); } snprintf((FAR char *)&dev->tx_buff[pos], _TX_BUFF_SIZE - pos, - "\",\"%s\"\r", retval); + "\",\"%s\"\r", retval); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); @@ -852,9 +865,10 @@ int lwm2mstub_send_evrespwvalue(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_evresponse(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int seq_no, int resp, - FAR struct lwm2mstub_instance_s *inst) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int seq_no, + int resp, + FAR struct lwm2mstub_instance_s *inst) { int pos; FAR const char *resp_str = get_m2mrespstr(resp); @@ -866,13 +880,13 @@ int lwm2mstub_send_evresponse(FAR struct alt1250_s *dev, } pos = snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MOBJRSP=%d,\"%s\",\"/%d/%d/%d", seq_no, resp_str, - inst->object_id, inst->object_inst, inst->res_id); + "AT%%LWM2MOBJRSP=%d,\"%s\",\"/%d/%d/%d", seq_no, resp_str, + inst->object_id, inst->object_inst, inst->res_id); if (inst->res_inst >= 0) { pos += snprintf((FAR char *)&dev->tx_buff[pos], _TX_BUFF_SIZE - pos, - "/%d", inst->res_inst); + "/%d", inst->res_inst); } snprintf((FAR char *)&dev->tx_buff[pos], _TX_BUFF_SIZE - pos, "\"\r"); @@ -886,8 +900,9 @@ int lwm2mstub_send_evresponse(FAR struct alt1250_s *dev, ****************************************************************************/ int lwm2mstub_send_evrespwoinst(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int seq_no, int resp) + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + int seq_no, int resp) { FAR const char *resp_str = get_m2mrespstr(resp); @@ -898,7 +913,7 @@ int lwm2mstub_send_evrespwoinst(FAR struct alt1250_s *dev, } snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE, - "AT%%LWM2MOBJRSP=%d,\"%s\"\r", seq_no, resp_str); + "AT%%LWM2MOBJRSP=%d,\"%s\"\r", seq_no, resp_str); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); @@ -935,7 +950,7 @@ int lwm2mstub_send_objevent(FAR struct alt1250_s *dev, } snprintf((FAR char *)&dev->tx_buff[pos], _TX_BUFF_SIZE - pos, - "\",\"%s\"\r", retval); + "\",\"%s\"\r", retval); return send_internal_at_command(dev, container, usockid, atcmdreply_ok_error, 0, ures); diff --git a/lte/alt1250/alt1250_atcmd.h b/lte/alt1250/alt1250_atcmd.h index ee7b846ed..86c6cb7f8 100644 --- a/lte/alt1250/alt1250_atcmd.h +++ b/lte/alt1250/alt1250_atcmd.h @@ -50,7 +50,7 @@ typedef int (*atcmd_postproc_t)(FAR struct alt1250_s *dev, struct atreply_truefalse_s { FAR const char *target_str; - FAR bool result; + bool result; }; /**************************************************************************** @@ -66,150 +66,174 @@ int check_atreply_ok(FAR char *reply, int len, void *arg); int check_atreply_truefalse(FAR char *reply, int len, void *arg); int lwm2mstub_send_reset(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container); + FAR struct alt_container_s *container); int lwm2mstub_send_getenable(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, FAR int32_t *usock_result); + FAR struct alt_container_s *container, + FAR int32_t *usock_result); int lwm2mstub_send_setenable(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool en); + FAR struct alt_container_s *container, bool en); int lwm2mstub_send_getnamemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container); + FAR struct alt_container_s *container); int lwm2mstub_send_setnamemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int mode); + FAR struct alt_container_s *container, + int mode); int lwm2mstub_send_getversion(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container); + FAR struct alt_container_s *container); int lwm2mstub_send_setversion(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool is_v1_1); + FAR struct alt_container_s *container, + bool is_v1_1); int lwm2mstub_send_getwriteattr(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container); + FAR struct alt_container_s *container); int lwm2mstub_send_setwriteattr(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool en); + FAR struct alt_container_s *container, + bool en); int lwm2mstub_send_getautoconnect(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container); + FAR struct alt_container_s *container); int lwm2mstub_send_setautoconnect(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, bool en); + FAR struct alt_container_s *container, + bool en); int ltenwop_send_getnwop(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container); + FAR struct alt_container_s *container); int ltenwop_send_setnwoptp(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container); + FAR struct alt_container_s *container); int lwm2mstub_send_getqueuemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures); int lwm2mstub_send_setqueuemode(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int en); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int en); int lwm2mstub_send_m2mopev(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, bool en); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, bool en); int lwm2mstub_send_m2mobjcmd(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, bool en); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, bool en); int lwm2mstub_send_m2mev(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, bool en); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, bool en); int lwm2mstub_send_getepname(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures); int lwm2mstub_send_getsrvinfo(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures); int lwm2mstub_send_getresource(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - FAR char *resource); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + FAR char *resource); int lwm2mstub_send_getsupobjs(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures); int lwm2mstub_send_getobjdef(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - uint16_t objid); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + uint16_t objid); int lwm2mstub_send_setepname(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, FAR const char * epname); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + FAR const char *epname); int lwm2mstub_send_bsstart(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures); int lwm2mstub_send_bsdelete(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures); int lwm2mstub_send_bscreateobj0(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - FAR struct lwm2mstub_serverinfo_s *info); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + FAR struct lwm2mstub_serverinfo_s *info); int lwm2mstub_send_bscreateobj1(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures, - FAR struct lwm2mstub_serverinfo_s *info); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures, + FAR struct lwm2mstub_serverinfo_s *info); int lwm2mstub_send_bsdone(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures); int lwm2mstub_send_setsupobjs(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, FAR uint16_t *objids, int objnum); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + FAR uint16_t *objids, int objnum); int lwm2mstub_send_setobjdef(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, uint16_t objid, int resnum, - FAR struct lwm2mstub_resource_s *resucs); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + uint16_t objid, int resnum, + FAR struct lwm2mstub_resource_s *resucs); int lwm2mstub_send_registration(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int cmd); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int cmd); int lwm2mstub_send_evrespwvalue(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int seq_no, int resp, - FAR struct lwm2mstub_instance_s *inst, char *retval); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + int seq_no, int resp, + FAR struct lwm2mstub_instance_s *inst, + FAR char *retval); int lwm2mstub_send_evresponse(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int seq_no, int resp, - FAR struct lwm2mstub_instance_s *inst); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int seq_no, + int resp, + FAR struct lwm2mstub_instance_s *inst); int lwm2mstub_send_evrespwoinst(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int seq_no, int resp); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + int seq_no, int resp); int lwm2mstub_send_objevent(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, char *token, FAR struct lwm2mstub_instance_s *inst, - char *retval); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, + FAR char *token, + FAR struct lwm2mstub_instance_s *inst, + FAR char *retval); int lwm2mstub_send_changerat(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - FAR int32_t *ures, int rat); + FAR struct alt_container_s *container, + int16_t usockid, FAR int32_t *ures, int rat); int lwm2mstub_send_getrat(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container, int16_t usockid, - atcmd_postproc_t proc, unsigned long arg, FAR int32_t *ures); + FAR struct alt_container_s *container, + int16_t usockid, atcmd_postproc_t proc, + unsigned long arg, FAR int32_t *ures); #endif /* __APPS_LTE_ALT1250_ALT1250_ATCMD_H */ diff --git a/lte/alt1250/alt1250_container.c b/lte/alt1250/alt1250_container.c index aa058019c..5c2850110 100644 --- a/lte/alt1250/alt1250_container.c +++ b/lte/alt1250/alt1250_container.c @@ -100,7 +100,7 @@ void container_free(FAR struct alt_container_s *container) ****************************************************************************/ void set_container_ids(FAR struct alt_container_s *container, - int16_t usockid, uint32_t cmdid) + int16_t usockid, uint32_t cmdid) { container->sock = usockid; container->cmdid = cmdid; @@ -111,7 +111,7 @@ void set_container_ids(FAR struct alt_container_s *container, ****************************************************************************/ void set_container_argument(FAR struct alt_container_s *container, - FAR void *argparams[], size_t paramsz) + FAR void *argparams[], size_t paramsz) { container->inparam = argparams; container->inparamlen = paramsz; @@ -122,7 +122,7 @@ void set_container_argument(FAR struct alt_container_s *container, ****************************************************************************/ void set_container_response(FAR struct alt_container_s *container, - FAR void *respparams[], size_t paramsz) + FAR void *respparams[], size_t paramsz) { container->outparam = respparams; container->outparamlen = paramsz; @@ -133,7 +133,7 @@ void set_container_response(FAR struct alt_container_s *container, ****************************************************************************/ void set_container_postproc(FAR struct alt_container_s *container, - FAR postproc_hdlr_t func, unsigned long arg) + FAR postproc_hdlr_t func, unsigned long arg) { FAR struct postproc_s *pp = (FAR struct postproc_s *)container->priv; pp->hdlr = func; diff --git a/lte/alt1250/alt1250_container.h b/lte/alt1250/alt1250_container.h index 43b5db761..4bb884e1d 100644 --- a/lte/alt1250/alt1250_container.h +++ b/lte/alt1250/alt1250_container.h @@ -34,13 +34,13 @@ * Pre-processor Definitions ****************************************************************************/ -#define CONTAINER_SOCKETID(c) ((c)->sock) -#define CONTAINER_CMDID(c) ((c)->cmdid) -#define CONTAINER_ARGUMENT(c) ((c)->inparam) -#define CONTAINER_ARGSIZE(c) ((c)->inparamlen) -#define CONTAINER_RESPONSE(c) ((c)->outparam) -#define CONTAINER_RESPSIZE(c) ((c)->outparamlen) -#define CONTAINER_RESPRES(c) ((c)->result) +#define CONTAINER_SOCKETID(c) ((c)->sock) +#define CONTAINER_CMDID(c) ((c)->cmdid) +#define CONTAINER_ARGUMENT(c) ((c)->inparam) +#define CONTAINER_ARGSIZE(c) ((c)->inparamlen) +#define CONTAINER_RESPONSE(c) ((c)->outparam) +#define CONTAINER_RESPSIZE(c) ((c)->outparamlen) +#define CONTAINER_RESPRES(c) ((c)->result) #define CONTAINER_POSTPROC(c) ((FAR struct postproc_s *)(c)->priv) /**************************************************************************** @@ -54,16 +54,16 @@ FAR struct alt_container_s *container_alloc(void); void clear_container(FAR struct alt_container_s *container); void set_container_ids(FAR struct alt_container_s *container, - int16_t usockid, uint32_t cmdid); + int16_t usockid, uint32_t cmdid); void set_container_argument(FAR struct alt_container_s *container, - FAR void *inparams[], size_t paramsz); + FAR void *inparams[], size_t paramsz); void set_container_response(FAR struct alt_container_s *container, - FAR void *outparams[], size_t paramsz); + FAR void *outparams[], size_t paramsz); void set_container_postproc(FAR struct alt_container_s *container, - FAR postproc_hdlr_t func, unsigned long priv); + FAR postproc_hdlr_t func, unsigned long priv); void container_free(FAR struct alt_container_s *container); void container_free_all(FAR struct alt_container_s *head); diff --git a/lte/alt1250/alt1250_dbg.h b/lte/alt1250/alt1250_dbg.h index fa017ff02..edffed181 100644 --- a/lte/alt1250/alt1250_dbg.h +++ b/lte/alt1250/alt1250_dbg.h @@ -34,11 +34,11 @@ ****************************************************************************/ #ifdef CONFIG_LTE_ALT1250_DEBUG_MSG -# define err_alt1250(v, ...) nerr(v, ##__VA_ARGS__) -# define dbg_alt1250(v, ...) ninfo(v, ##__VA_ARGS__) +# define err_alt1250(v, ...) nerr(v, ##__VA_ARGS__) +# define dbg_alt1250(v, ...) ninfo(v, ##__VA_ARGS__) #else -# define err_alt1250(v, ...) -# define dbg_alt1250(v, ...) +# define err_alt1250(v, ...) +# define dbg_alt1250(v, ...) #endif #endif /* __APPS_LTE_ALT1250_ALT1250_DBG_H */ diff --git a/lte/alt1250/alt1250_devevent.c b/lte/alt1250/alt1250_devevent.c index 879e93cca..7d16f53ae 100644 --- a/lte/alt1250/alt1250_devevent.c +++ b/lte/alt1250/alt1250_devevent.c @@ -58,9 +58,9 @@ ****************************************************************************/ static int handle_replypkt(FAR struct alt1250_s *dev, - FAR struct alt_container_s *reply, - FAR int32_t *usock_result, uint32_t *usock_xid, - FAR struct usock_ackinfo_s *ackinfo) + FAR struct alt_container_s *reply, + FAR int32_t *usock_result, uint32_t *usock_xid, + FAR struct usock_ackinfo_s *ackinfo) { int ret; FAR struct usock_s *usock; @@ -88,7 +88,7 @@ static int handle_replypkt(FAR struct alt1250_s *dev, ****************************************************************************/ static int perform_alt1250_reply(FAR struct alt1250_s *dev, - FAR struct alt_container_s *container) + FAR struct alt_container_s *container) { int ret = REP_NO_ACK; int32_t ack_result = OK; diff --git a/lte/alt1250/alt1250_devif.c b/lte/alt1250/alt1250_devif.c index 42bc4f505..374af6214 100644 --- a/lte/alt1250/alt1250_devif.c +++ b/lte/alt1250/alt1250_devif.c @@ -93,7 +93,7 @@ FAR struct alt_container_s *altdevice_exchange_selcontainer(int fd, ****************************************************************************/ int altdevice_send_command(int fd, FAR struct alt_container_s *container, - FAR int32_t *usock_res) + FAR int32_t *usock_res) { int ret; ret = ioctl_wrapper(fd, ALT1250_IOC_SEND, (unsigned long)container); @@ -161,7 +161,7 @@ int altdevice_seteventbuff(int fd, FAR struct alt_evtbuffer_s *buffer) ****************************************************************************/ int altdevice_getevent(int fd, FAR uint64_t *evtbitmap, - FAR struct alt_container_s **replys) + FAR struct alt_container_s **replys) { int ret = -EIO; struct alt_readdata_s dat; diff --git a/lte/alt1250/alt1250_devif.h b/lte/alt1250/alt1250_devif.h index 2ae0c4a89..a1a3bb19a 100644 --- a/lte/alt1250/alt1250_devif.h +++ b/lte/alt1250/alt1250_devif.h @@ -40,11 +40,11 @@ void finalize_alt1250_device(int fd); FAR struct alt_container_s *altdevice_exchange_selcontainer(int fd, FAR struct alt_container_s *container); int altdevice_send_command(int fd, FAR struct alt_container_s *container, - FAR int32_t *usock_res); + FAR int32_t *usock_res); int altdevice_powercontrol(int fd, uint32_t cmd); int altdevice_seteventbuff(int fd, FAR struct alt_evtbuffer_s *buffers); int altdevice_getevent(int fd, FAR uint64_t *evtbitmap, - FAR struct alt_container_s **replys); + FAR struct alt_container_s **replys); void altdevice_reset(int fd); #ifdef CONFIG_LTE_ALT1250_ENABLE_HIBERNATION_MODE int altdevice_powerresponse(int fd, uint32_t cmd, int resp); diff --git a/lte/alt1250/alt1250_main.c b/lte/alt1250/alt1250_main.c index cd7b28170..d78adacc4 100644 --- a/lte/alt1250/alt1250_main.c +++ b/lte/alt1250/alt1250_main.c @@ -53,10 +53,13 @@ #define ALTFDNO (0) #define USOCKFDNO (1) -#define SET_POLLIN(fds, fid) { \ - (fds).fd = (fid); \ - (fds).events = POLLIN; \ -} +#define SET_POLLIN(fds, fid) \ + do \ + { \ + (fds).fd = (fid); \ + (fds).events = POLLIN; \ + } \ + while (0) #define IS_POLLIN(fds) ((fds).revents & POLLIN) @@ -259,7 +262,7 @@ int main(int argc, FAR char *argv[]) { int ret; FAR char *endptr; - sem_t *syncsem = NULL; + FAR sem_t *syncsem = NULL; if (argc > 1) { diff --git a/lte/alt1250/alt1250_postproc.h b/lte/alt1250/alt1250_postproc.h index fcb163a80..282614244 100644 --- a/lte/alt1250/alt1250_postproc.h +++ b/lte/alt1250/alt1250_postproc.h @@ -35,14 +35,14 @@ * Public Data Type ****************************************************************************/ -typedef int (*postproc_hdlr_t)(FAR struct alt1250_s *dev, +typedef CODE int (*postproc_hdlr_t)(FAR struct alt1250_s *dev, FAR struct alt_container_s *reply, FAR struct usock_s *usock, FAR int32_t *usock_result, uint32_t *usock_xid, FAR struct usock_ackinfo_s *ackinfo, unsigned long arg); struct postproc_s { - FAR postproc_hdlr_t hdlr; + postproc_hdlr_t hdlr; unsigned long priv; }; diff --git a/lte/alt1250/alt1250_reset_seq.c b/lte/alt1250/alt1250_reset_seq.c index a89e265f6..07bc1bdf1 100644 --- a/lte/alt1250/alt1250_reset_seq.c +++ b/lte/alt1250/alt1250_reset_seq.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -61,7 +62,7 @@ static postproc_hdlr_t ponreset_seq[] = { postproc_fwgetversion, }; -#define PONRESET_SEQ_NUM (sizeof(ponreset_seq) / sizeof(ponreset_seq[0])) +#define PONRESET_SEQ_NUM nitems(ponreset_seq) /**************************************************************************** * Private Functions @@ -72,12 +73,15 @@ static postproc_hdlr_t ponreset_seq[] = ****************************************************************************/ static int postproc_ponresetseq(FAR struct alt1250_s *dev, - FAR struct alt_container_s *reply, FAR struct usock_s *usock, - FAR int32_t *usock_result, FAR uint32_t *usock_xid, - FAR struct usock_ackinfo_s *ackinfo, unsigned long arg) + FAR struct alt_container_s *reply, + FAR struct usock_s *usock, + FAR int32_t *usock_result, + FAR uint32_t *usock_xid, + FAR struct usock_ackinfo_s *ackinfo, + unsigned long arg) { int ret = REP_NO_ACK_WOFREE; - struct reset_arg_s *rarg = (struct reset_arg_s *)arg; + FAR struct reset_arg_s *rarg = (FAR struct reset_arg_s *)arg; ASSERT(rarg->seq_no < PONRESET_SEQ_NUM); ponreset_seq[rarg->seq_no](dev, reply, usock, usock_result, usock_xid, @@ -135,7 +139,7 @@ static void str_toupper_case(FAR char *data, int len) static int recv_atreply_onreset(atreply_parser_t parse, FAR struct alt1250_s *dev, - void *arg) + FAR void *arg) { int ret; uint64_t bitmap; @@ -172,7 +176,7 @@ static int recv_atreply_onreset(atreply_parser_t parse, ASSERT(rlist == NULL); reply = (FAR char *)container->outparam[0]; - rlen = *(int *)container->outparam[2]; + rlen = *(FAR int *)container->outparam[2]; str_toupper_case(reply, rlen); ret = parse(reply, rlen, arg); @@ -339,11 +343,10 @@ int handle_poweron_reset_stage2(FAR struct alt1250_s *dev) { int ret; int32_t unused; - FAR struct alt_container_s *container; container = container_alloc(); - ASSERT(container != 0); + ASSERT(container != NULL); ret = send_getversion_onreset(dev, container, &unused); @@ -373,7 +376,7 @@ int handle_poweron_reset(FAR struct alt1250_s *dev) FAR struct alt_container_s *container; container = container_alloc(); - ASSERT(container); + ASSERT(container != NULL); while (ret == REP_MODEM_RESET) { diff --git a/lte/alt1250/alt1250_select.c b/lte/alt1250/alt1250_select.c index 7e8e81f91..51bfa01bc 100644 --- a/lte/alt1250/alt1250_select.c +++ b/lte/alt1250/alt1250_select.c @@ -69,7 +69,7 @@ struct select_params_s static struct alt_container_s select_container_obj[SELECT_CONTAINER_MAX]; static FAR struct alt_container_s *g_current_container; -static void *g_selectargs[SELECT_CONTAINER_MAX][6]; +static FAR void *g_selectargs[SELECT_CONTAINER_MAX][6]; static struct select_params_s g_select_params[SELECT_CONTAINER_MAX]; /**************************************************************************** @@ -89,7 +89,8 @@ static int send_select_command(FAR struct alt1250_s *dev, FAR void *in[7]; uint16_t used_setbit = 0; int32_t usock_result; - struct alt_container_s container = { + struct alt_container_s container = + { 0 }; @@ -197,7 +198,7 @@ static FAR struct alt_container_s *recv_selectcontainer( FAR struct alt1250_s *dev) { g_current_container = altdevice_exchange_selcontainer(dev->altfd, - g_current_container); + g_current_container); return g_current_container; } @@ -266,7 +267,7 @@ static void handle_selectevt(FAR struct alt1250_s *dev, FAR struct usock_s *usock; dbg_alt1250("select reply. ret=%ld modem_errno=%ld\n", - altcom_resp, modem_errno); + altcom_resp, modem_errno); if (selectreq_id == dev->sid) { @@ -288,7 +289,7 @@ static void handle_selectevt(FAR struct alt1250_s *dev, else { dbg_alt1250("Select event come wish in no selected. sel_id = %ld\n", - selectreq_id); + selectreq_id); } } @@ -318,12 +319,12 @@ uint64_t perform_select_event(FAR struct alt1250_s *dev, uint64_t bitmap) */ handle_selectevt(dev, - *((int32_t *)selectcontainer->outparam[0]), - *((int32_t *)selectcontainer->outparam[1]), - *((int32_t *)selectcontainer->outparam[2]), - (altcom_fd_set *)(selectcontainer->outparam[3]), - (altcom_fd_set *)(selectcontainer->outparam[4]), - (altcom_fd_set *)(selectcontainer->outparam[5])); + *((FAR int32_t *)selectcontainer->outparam[0]), + *((FAR int32_t *)selectcontainer->outparam[1]), + *((FAR int32_t *)selectcontainer->outparam[2]), + (FAR altcom_fd_set *)(selectcontainer->outparam[3]), + (FAR altcom_fd_set *)(selectcontainer->outparam[4]), + (FAR altcom_fd_set *)(selectcontainer->outparam[5])); } return bit; @@ -365,4 +366,3 @@ void restart_select(FAR struct alt1250_s *dev) select_cancel(dev); select_start(dev); } - diff --git a/lte/alt1250/alt1250_socket.c b/lte/alt1250/alt1250_socket.c index d6fb6cf28..94af4bff5 100644 --- a/lte/alt1250/alt1250_socket.c +++ b/lte/alt1250/alt1250_socket.c @@ -45,7 +45,7 @@ FAR struct usock_s *usocket_search(FAR struct alt1250_s *dev, int usockid) { - struct usock_s *ret = NULL; + FAR struct usock_s *ret = NULL; dbg_alt1250("%s usockid: %d\n", __func__, usockid); diff --git a/lte/alt1250/alt1250_socket.h b/lte/alt1250/alt1250_socket.h index 310fe8a64..8a5ddc9b5 100644 --- a/lte/alt1250/alt1250_socket.h +++ b/lte/alt1250/alt1250_socket.h @@ -39,31 +39,52 @@ #define SELECT_READABLE (1 << 2) #define SELECTABLE_MASK (SELECT_WRITABLE | SELECT_READABLE) -#define USOCKET_SET_REQUEST(sock, _reqid, _xid) { \ - (sock)->request.reqid = (_reqid); \ - (sock)->request.xid = (_xid); \ -} +#define USOCKET_SET_REQUEST(sock, _reqid, _xid) \ + do \ + { \ + (sock)->request.reqid = (_reqid); \ + (sock)->request.xid = (_xid); \ + } \ + while (0) -#define USOCKET_SET_SOCKTYPE(sock, _domain, _type, _protocol) { \ - (sock)->domain = (_domain); \ - (sock)->type = (_type); \ - (sock)->protocol = (_protocol); \ -} +#define USOCKET_SET_SOCKTYPE(sock, _domain, _type, _protocol) \ + do \ + { \ + (sock)->domain = (_domain); \ + (sock)->type = (_type); \ + (sock)->protocol = (_protocol); \ + } \ + while (0) #define USOCKET_SET_REQADDRLEN(sock, _addrlen) \ - { (sock)->sock_req.addrbuflen.addr.addrlen = (_addrlen); } + do \ + { \ + (sock)->sock_req.addrbuflen.addr.addrlen = (_addrlen); \ + } \ + while (0) #define USOCKET_SET_REQBACKLOG(sock, _backlog) \ - { (sock)->sock_req.backlog = (_backlog); } + do \ + { \ + (sock)->sock_req.backlog = (_backlog); \ + } \ + while (0) #define USOCKET_SET_REQBUFLEN(sock, _buflen) \ - { (sock)->sock_req.addrbuflen.buflen = (_buflen); } + do \ + { \ + (sock)->sock_req.addrbuflen.buflen = (_buflen); \ + } \ + while (0) -#define USOCKET_SET_REQSOCKOPT(sock, _level, _opt, _optlen) { \ - (sock)->sock_req.opt.level = (_level); \ - (sock)->sock_req.opt.option = (_opt); \ - (sock)->sock_req.opt.optlen = (_optlen); \ -} +#define USOCKET_SET_REQSOCKOPT(sock, _level, _opt, _optlen) \ + do \ + { \ + (sock)->sock_req.opt.level = (_level); \ + (sock)->sock_req.opt.option = (_opt); \ + (sock)->sock_req.opt.optlen = (_optlen); \ + } \ + while (0) #define USOCKET_REQID(sock) ((sock)->request.reqid) #define USOCKET_XID(sock) ((sock)->request.xid) @@ -105,19 +126,35 @@ } \ else \ { \ - ASSERT(0); \ + PANIC(); \ } \ } \ while(0) -#define USOCKET_SET_ALTSOCKID(sock, id) { (sock)->altsockid = id; } -#define USOCKET_SET_STATE(sock, st) { (sock)->state = (st); } -#define USOCKET_SET_SELECTABLE(sock, rw) { \ - (sock)->select_condition |= (rw); \ -} -#define USOCKET_CLR_SELECTABLE(sock, rw) { \ - (sock)->select_condition &= ~(rw); \ -} +#define USOCKET_SET_ALTSOCKID(sock, id) \ + do \ + { \ + (sock)->altsockid = (id); \ + } \ + while (0) +#define USOCKET_SET_STATE(sock, st) \ + do \ + { \ + (sock)->state = (st); \ + } \ + while (0) +#define USOCKET_SET_SELECTABLE(sock, rw) \ + do \ + { \ + (sock)->select_condition |= (rw); \ + } \ + while (0) +#define USOCKET_CLR_SELECTABLE(sock, rw) \ + do \ + { \ + (sock)->select_condition &= ~(rw); \ + } \ + while (0) #define IS_STATE_SELECTABLE(s) (((s)->state != SOCKET_STATE_CLOSED) \ && ((s)->state != SOCKET_STATE_PREALLOC) \ diff --git a/lte/alt1250/alt1250_usockevent.c b/lte/alt1250/alt1250_usockevent.c index 839fa547a..9c4b637a5 100644 --- a/lte/alt1250/alt1250_usockevent.c +++ b/lte/alt1250/alt1250_usockevent.c @@ -61,7 +61,7 @@ static const usrsock_reqhandler_t handlers[USRSOCK_REQUEST__MAX] = ****************************************************************************/ int usock_reply(int ufd, int action_code, int32_t result, - uint32_t xid, FAR struct usock_ackinfo_s *ackinfo) + uint32_t xid, FAR struct usock_ackinfo_s *ackinfo) { int ret = OK; @@ -119,7 +119,7 @@ int perform_usockrequest(FAR struct alt1250_s *dev) /* In unsupported ioctl command case */ usock_reply(dev->usockfd, REP_SEND_ACK_WOFREE, ret, - USOCKREQXID(dev->usockreq), NULL); + USOCKREQXID(dev->usockreq), NULL); return OK; } } diff --git a/lte/alt1250/alt1250_usockif.c b/lte/alt1250/alt1250_usockif.c index 699b18286..33a91a203 100644 --- a/lte/alt1250/alt1250_usockif.c +++ b/lte/alt1250/alt1250_usockif.c @@ -357,8 +357,7 @@ int usockif_sendack(int fd, int32_t usock_result, uint32_t usock_xid, struct usrsock_message_req_ack_s ack; ack.head.msgid = USRSOCK_MESSAGE_RESPONSE_ACK; - ack.head.flags = - (inprogress == true) ? USRSOCK_MESSAGE_FLAG_REQ_IN_PROGRESS: 0; + ack.head.flags = inprogress ? USRSOCK_MESSAGE_FLAG_REQ_IN_PROGRESS : 0; ack.xid = usock_xid; ack.result = usock_result; diff --git a/lte/alt1250/alt1250_util.c b/lte/alt1250/alt1250_util.c index b211df6c1..9346a6f42 100644 --- a/lte/alt1250/alt1250_util.c +++ b/lte/alt1250/alt1250_util.c @@ -45,13 +45,13 @@ void alt1250_saveapn(FAR struct alt1250_s *dev, FAR lte_apn_setting_t *apn) if ((apn->auth_type != LTE_APN_AUTHTYPE_NONE) && (apn->user_name)) { strncpy(dev->user_name, (FAR const char *)apn->user_name, - LTE_APN_USER_NAME_LEN); + LTE_APN_USER_NAME_LEN); } if ((apn->auth_type != LTE_APN_AUTHTYPE_NONE) && (apn->password)) { strncpy(dev->pass, (FAR const char *)apn->password, - LTE_APN_PASSWD_LEN); + LTE_APN_PASSWD_LEN); } dev->apn.apn = dev->apn_name; diff --git a/lte/alt1250/callback_handlers/alt1250_evt.c b/lte/alt1250/callback_handlers/alt1250_evt.c index 99d9aea83..19cf674b1 100644 --- a/lte/alt1250/callback_handlers/alt1250_evt.c +++ b/lte/alt1250/callback_handlers/alt1250_evt.c @@ -71,92 +71,98 @@ ****************************************************************************/ static uint64_t lte_set_report_restart_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); + FAR void **cbarg, + FAR bool *set_writable); #ifdef CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API static uint64_t lte_radio_on_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_radio_off_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); #endif /* CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API */ static uint64_t lte_activate_pdn_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); #ifdef CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API static uint64_t lte_deactivate_pdn_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_netinfo_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_imscap_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_version_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_phoneno_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_imsi_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_imei_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_pinset_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_set_pinenable_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_change_pin_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_enter_pin_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_localtime_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_operator_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_edrx_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_set_edrx_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_psm_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_set_psm_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_ce_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_set_ce_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_siminfo_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_current_edrx_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_current_psm_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); static uint64_t lte_get_quality_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable); + FAR bool *set_writable); #endif /* CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API */ static uint64_t lte_set_report_netinfo_exec_cb(FAR void *cb, -FAR void **cbarg, FAR bool *set_writable); + FAR void **cbarg, + FAR bool *set_writable); static uint64_t lte_set_report_simstat_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); + FAR void **cbarg, + FAR bool *set_writable); static uint64_t lte_set_report_localtime_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); + FAR void **cbarg, + FAR bool *set_writable); static uint64_t lte_set_report_quality_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); + FAR void **cbarg, + FAR bool *set_writable); static uint64_t lte_set_report_cellinfo_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); -static uint64_t tls_config_verify_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); + FAR void **cbarg, + FAR bool *set_writable); +static uint64_t tls_config_verify_exec_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); -static uint64_t lwm2m_read_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); -static uint64_t lwm2m_write_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); -static uint64_t lwm2m_exec_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); -static uint64_t lwm2m_ovstart_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); -static uint64_t lwm2m_ovstop_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); -static uint64_t lwm2m_operation_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); -static uint64_t lwm2m_fwupdate_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable); +static uint64_t lwm2m_read_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); +static uint64_t lwm2m_write_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); +static uint64_t lwm2m_exec_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); +static uint64_t lwm2m_ovstart_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); +static uint64_t lwm2m_ovstop_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); +static uint64_t lwm2m_operation_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); +static uint64_t lwm2m_fwupdate_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); -static void *get_cbfunc(uint32_t cmdid); +static FAR void *get_cbfunc(uint32_t cmdid); static uint64_t alt1250_evt_search(uint32_t cmdid); /**************************************************************************** @@ -166,7 +172,8 @@ static uint64_t alt1250_evt_search(uint32_t cmdid); struct cbinfo_s { uint32_t cmdid; - uint64_t (*cb)(FAR void *cb, FAR void **cbarg, FAR bool *set_writable); + CODE uint64_t (*cb)(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable); }; /**************************************************************************** @@ -189,7 +196,7 @@ static void *g_setrestartargs[] = static int g_getverret; static lte_version_t g_ver; -static void *g_getverargs[] = +static FAR void *g_getverargs[] = { &g_getverret, &g_ver }; @@ -199,7 +206,7 @@ static void *g_getverargs[] = /* event argument for LTE_CMDID_RADIOON */ static int g_radioonret; -static void *g_radioonargs[] = +static FAR void *g_radioonargs[] = { &g_radioonret }; @@ -207,7 +214,7 @@ static void *g_radioonargs[] = /* event argument for LTE_CMDID_RADIOOFF */ static int g_radiooffret; -static void *g_radiooffargs[] = +static FAR void *g_radiooffargs[] = { &g_radiooffret }; @@ -218,7 +225,7 @@ static void *g_radiooffargs[] = static int g_actpdnret; static lte_pdn_t g_pdn; -static void *g_actpdnargs[] = +static FAR void *g_actpdnargs[] = { &g_actpdnret, &g_pdn }; @@ -228,7 +235,7 @@ static void *g_actpdnargs[] = /* event argument for LTE_CMDID_DEACTPDN */ static int g_deactpdnret; -static void *g_deactpdnargs[] = +static FAR void *g_deactpdnargs[] = { &g_deactpdnret }; @@ -243,7 +250,7 @@ static lte_netinfo_t g_netinfo = }; static uint8_t g_pdn_num = LTE_SESSION_ID_MAX; -static void *g_netinfoargs[] = +static FAR void *g_netinfoargs[] = { &g_getnetinforet, &g_netinfo, &g_pdn_num }; @@ -252,7 +259,7 @@ static void *g_netinfoargs[] = static int g_imscapret; static bool g_imscap; -static void *g_imscapargs[] = +static FAR void *g_imscapargs[] = { &g_imscapret, &g_imscap }; @@ -265,7 +272,7 @@ static char g_phoneno[LTE_PHONENO_LEN]; #ifndef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY static size_t g_phonenolen = LTE_PHONENO_LEN; #endif -static void *g_getphoneargs[] = +static FAR void *g_getphoneargs[] = { #ifdef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY &g_getphoneret, &g_getphoneerrcause, g_phoneno @@ -282,7 +289,7 @@ static char g_imsi[LTE_SIMINFO_IMSI_LEN]; #ifndef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY static size_t g_imsilen = LTE_SIMINFO_IMSI_LEN; #endif -static void *g_getimsiargs[] = +static FAR void *g_getimsiargs[] = { #ifdef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY &g_getimsiret, &g_getimsierrcause, g_imsi @@ -298,7 +305,7 @@ static char g_imei[LTE_IMEI_LEN]; #ifndef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY static size_t g_imeilen = LTE_IMEI_LEN; #endif -static void *g_getimeiargs[] = +static FAR void *g_getimeiargs[] = { #ifdef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY &g_getimeiret, g_imei @@ -311,7 +318,7 @@ static void *g_getimeiargs[] = static int g_getpinsetret; static lte_getpin_t g_pinset; -static void *g_getpinsetargs[] = +static FAR void *g_getpinsetargs[] = { &g_getpinsetret, &g_pinset }; @@ -320,7 +327,7 @@ static void *g_getpinsetargs[] = static int g_pinenableret; static uint8_t g_pineattleft; -static void *g_pinenableargs[] = +static FAR void *g_pinenableargs[] = { &g_pinenableret, &g_pineattleft }; @@ -329,7 +336,7 @@ static void *g_pinenableargs[] = static int g_changepinret; static uint8_t g_chanattleft; -static void *g_changepinargs[] = +static FAR void *g_changepinargs[] = { &g_changepinret, &g_chanattleft }; @@ -339,7 +346,7 @@ static void *g_changepinargs[] = static int g_enterpinret; static uint8_t g_entpinsimstat; static uint8_t g_entpinattleft; -static void *g_enterpinargs[] = +static FAR void *g_enterpinargs[] = { &g_enterpinret, &g_entpinsimstat, &g_entpinattleft }; @@ -348,7 +355,7 @@ static void *g_enterpinargs[] = static int g_getltimeret; static lte_localtime_t g_ltime; -static void *g_getltimeargs[] = +static FAR void *g_getltimeargs[] = { &g_getltimeret, &g_ltime }; @@ -360,7 +367,7 @@ static char g_oper[LTE_OPERATOR_LEN]; #ifndef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY static size_t g_operlen = LTE_OPERATOR_LEN; #endif -static void *g_getoperargs[] = +static FAR void *g_getoperargs[] = { #ifdef CONFIG_LTE_LAPI_KEEP_COMPATIBILITY &g_getoperret, g_oper @@ -374,7 +381,7 @@ static void *g_getoperargs[] = static int g_getedrxret; static lte_edrx_setting_t g_getedrx; static bool g_is_getedrxevt; -static void *g_getedrxargs[] = +static FAR void *g_getedrxargs[] = { &g_getedrxret, &g_getedrx, &g_is_getedrxevt }; @@ -382,7 +389,7 @@ static void *g_getedrxargs[] = /* event argument for LTE_CMDID_SETEDRX */ static int g_setedrxret; -static void *g_setedrxargs[] = +static FAR void *g_setedrxargs[] = { &g_setedrxret }; @@ -392,7 +399,7 @@ static void *g_setedrxargs[] = static int g_getpsmret; static lte_psm_setting_t g_getpsm; static bool g_is_getpsmevt; -static void *g_getpsmargs[] = +static FAR void *g_getpsmargs[] = { &g_getpsmret, &g_getpsm, &g_is_getpsmevt }; @@ -400,7 +407,7 @@ static void *g_getpsmargs[] = /* event argument for LTE_CMDID_SETPSM */ static int g_setpsmret; -static void *g_setpsmargs[] = +static FAR void *g_setpsmargs[] = { &g_setpsmret }; @@ -409,7 +416,7 @@ static void *g_setpsmargs[] = static int g_getceret; static lte_ce_setting_t g_getce; -static void *g_getceargs[] = +static FAR void *g_getceargs[] = { &g_getceret, &g_getce }; @@ -417,7 +424,7 @@ static void *g_getceargs[] = /* event argument for LTE_CMDID_SETCE */ static int g_setceret; -static void *g_setceargs[] = +static FAR void *g_setceargs[] = { &g_setceret }; @@ -426,7 +433,7 @@ static void *g_setceargs[] = static int g_setsiminforet; static lte_siminfo_t g_siminfo; -static void *g_getsiminfoargs[] = +static FAR void *g_getsiminfoargs[] = { &g_setsiminforet, &g_siminfo }; @@ -436,7 +443,7 @@ static void *g_getsiminfoargs[] = static int g_getcedrxret; static lte_edrx_setting_t g_getcedrx; static bool g_is_getcedrxevt; -static void *g_getcedrxargs[] = +static FAR void *g_getcedrxargs[] = { &g_getcedrxret, &g_getcedrx, &g_is_getcedrxevt }; @@ -446,7 +453,7 @@ static void *g_getcedrxargs[] = static int g_getcpsmret; static lte_psm_setting_t g_getcpsm; static bool g_is_getcpsmevt; -static void *g_getcpsmargs[] = +static FAR void *g_getcpsmargs[] = { &g_getcpsmret, &g_getcpsm, &g_is_getcpsmevt }; @@ -455,7 +462,7 @@ static void *g_getcpsmargs[] = static int g_getqualret; static lte_quality_t g_getqual; -static void *g_getqualargs[] = +static FAR void *g_getqualargs[] = { &g_getqualret, &g_getqual }; @@ -469,7 +476,7 @@ static lte_cellinfo_t g_getcell = .neighbors = g_neighbors } ; -static void *g_getcellargs[] = +static FAR void *g_getcellargs[] = { &g_getcellret, &g_getcell }; @@ -479,7 +486,7 @@ static void *g_getcellargs[] = /* event argument for LTE_CMDID_GETRAT */ static int g_getratret; -static void *g_getratargs[] = +static FAR void *g_getratargs[] = { &g_getratret }; @@ -487,7 +494,7 @@ static void *g_getratargs[] = /* event argument for LTE_CMDID_SETRAT */ static int g_setratret; -static void *g_setratargs[] = +static FAR void *g_setratargs[] = { &g_setratret }; @@ -496,7 +503,7 @@ static void *g_setratargs[] = static int g_getratinforet; static lte_ratinfo_t g_ratinfo; -static void *g_getratinfoargs[] = +static FAR void *g_getratinfoargs[] = { &g_getratinforet, &g_ratinfo }; @@ -511,7 +518,7 @@ static lte_netinfo_t g_repnetinfo = static uint8_t g_ndnsaddrs; static struct sockaddr_storage g_dnsaddrs[ALTCOM_DNS_SERVERS]; -static void *g_repnetinfoargs[] = +static FAR void *g_repnetinfoargs[] = { &g_repnetinfo, &g_ndnsaddrs, g_dnsaddrs }; @@ -519,7 +526,7 @@ static void *g_repnetinfoargs[] = /* event argument for LTE_CMDID_REPSIMSTAT */ static uint32_t g_repsimstat; -static void *g_repsimstatargs[] = +static FAR void *g_repsimstatargs[] = { &g_repsimstat }; @@ -527,7 +534,7 @@ static void *g_repsimstatargs[] = /* event argument for LTE_CMDID_REPLTIME */ static lte_localtime_t g_repltime; -static void *g_repltimeargs[] = +static FAR void *g_repltimeargs[] = { &g_repltime }; @@ -535,7 +542,7 @@ static void *g_repltimeargs[] = /* event argument for LTE_CMDID_REPQUAL */ static lte_quality_t g_repqual; -static void *g_repqualargs[] = +static FAR void *g_repqualargs[] = { &g_repqual }; @@ -548,7 +555,7 @@ static lte_cellinfo_t g_repcell = .neighbors = g_repneighbors }; -static void *g_repcellargs[] = +static FAR void *g_repcellargs[] = { &g_repcell }; @@ -556,7 +563,7 @@ static void *g_repcellargs[] = /* event argument for LTE_CMDID_GETERRINFO */ static lte_errinfo_t g_geterrinfo; -static void *g_geterrinfoargs[] = +static FAR void *g_geterrinfoargs[] = { &g_geterrinfo }; @@ -565,7 +572,7 @@ static void *g_geterrinfoargs[] = static uint32_t g_crt; static int32_t g_depth; -static void *g_vrfycbargs[] = +static FAR void *g_vrfycbargs[] = { &g_crt, &g_depth }; @@ -577,7 +584,7 @@ static uint16_t g_smsrecv_sz; static uint8_t g_sms_maxnum; static uint8_t g_sms_seqnum; static struct sms_deliver_msg_max_s g_recvmsg; -static void *g_smsreportargs[] = +static FAR void *g_smsreportargs[] = { &g_smsmsg_index, &g_smsrecv_sz, &g_sms_maxnum, &g_sms_seqnum, &g_recvmsg }; @@ -585,7 +592,7 @@ static void *g_smsreportargs[] = /* event argument for LTE_CMDID_LWM2M_READ_EVT */ static struct lwm2mstub_instance_s g_lwm2mread_inst; -static void *g_lwm2mreadargs[] = +static FAR void *g_lwm2mreadargs[] = { NULL, NULL, &g_lwm2mread_inst }; @@ -594,16 +601,16 @@ static void *g_lwm2mreadargs[] = static struct lwm2mstub_instance_s g_lwm2mwrite_inst; static char g_lwm2mwrite_value[LWM2MSTUB_MAX_WRITE_SIZE]; -static void *g_lwm2mwriteargs[] = +static FAR void *g_lwm2mwriteargs[] = { NULL, NULL, &g_lwm2mwrite_inst, g_lwm2mwrite_value, - NULL, (void *)LWM2MSTUB_MAX_WRITE_SIZE + NULL, (FAR void *)LWM2MSTUB_MAX_WRITE_SIZE }; /* event argument for LTE_CMDID_LWM2M_EXEC_EVT */ static struct lwm2mstub_instance_s g_lwm2mexec_inst; -static void *g_lwm2mexecargs[] = +static FAR void *g_lwm2mexecargs[] = { NULL, NULL, &g_lwm2mexec_inst, NULL }; @@ -613,32 +620,32 @@ static void *g_lwm2mexecargs[] = static struct lwm2mstub_instance_s g_lwm2movstart_inst; static char g_lwm2movstart_token[LWM2MSTUB_MAX_TOKEN_SIZE]; static struct lwm2mstub_ovcondition_s g_lwm2movstart_cond; -static void *g_lwm2movstartargs[] = +static FAR void *g_lwm2movstartargs[] = { NULL, NULL, &g_lwm2movstart_inst, g_lwm2movstart_token, - (void *)LWM2MSTUB_MAX_TOKEN_SIZE, &g_lwm2movstart_cond + (FAR void *)LWM2MSTUB_MAX_TOKEN_SIZE, &g_lwm2movstart_cond }; /* event argument for LTE_CMDID_LWM2M_OVSTOP_EVT */ static struct lwm2mstub_instance_s g_lwm2movstop_inst; static char g_lwm2movstop_token[LWM2MSTUB_MAX_TOKEN_SIZE]; -static void *g_lwm2movstopargs[] = +static FAR void *g_lwm2movstopargs[] = { NULL, NULL, &g_lwm2movstop_inst, &g_lwm2movstop_token, - (void *)LWM2MSTUB_MAX_TOKEN_SIZE + (FAR void *)LWM2MSTUB_MAX_TOKEN_SIZE }; /* event argument for LTE_CMDID_LWM2M_SERVEROP_EVT */ -static void *g_lwm2moperationargs[] = +static FAR void *g_lwm2moperationargs[] = { NULL }; /* event argument for LTE_CMDID_LWM2M_FWUP_EVT */ -static void *g_lwm2mfwupargs[] = +static FAR void *g_lwm2mfwupargs[] = { NULL }; @@ -767,7 +774,8 @@ static sem_t g_cbtablelock; ****************************************************************************/ static uint64_t lte_set_report_restart_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) + FAR void **cbarg, + FAR bool *set_writable) { restart_report_cb_t callback = (restart_report_cb_t)cb; FAR uint32_t *param = (FAR uint32_t *)cbarg[0]; @@ -783,7 +791,7 @@ static uint64_t lte_set_report_restart_exec_cb(FAR void *cb, #ifdef CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API static uint64_t lte_radio_on_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { radio_on_cb_t callback = (radio_on_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -797,7 +805,7 @@ static uint64_t lte_radio_on_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_radio_off_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { radio_off_cb_t callback = (radio_off_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -813,7 +821,7 @@ static uint64_t lte_radio_off_exec_cb(FAR void *cb, FAR void **cbarg, #endif /* CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API */ static uint64_t lte_activate_pdn_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { activate_pdn_cb_t callback = (activate_pdn_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -830,7 +838,7 @@ static uint64_t lte_activate_pdn_exec_cb(FAR void *cb, FAR void **cbarg, #ifdef CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API static uint64_t lte_deactivate_pdn_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { deactivate_pdn_cb_t callback = (deactivate_pdn_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -844,7 +852,7 @@ static uint64_t lte_deactivate_pdn_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_netinfo_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_netinfo_cb_t callback = (get_netinfo_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -859,7 +867,7 @@ static uint64_t lte_get_netinfo_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_imscap_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_imscap_cb_t callback = (get_imscap_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -874,7 +882,7 @@ static uint64_t lte_get_imscap_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_version_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_ver_cb_t callback = (get_ver_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -889,7 +897,7 @@ static uint64_t lte_get_version_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_phoneno_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_phoneno_cb_t callback = (get_phoneno_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -905,7 +913,7 @@ static uint64_t lte_get_phoneno_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_imsi_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_imsi_cb_t callback = (get_imsi_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -921,7 +929,7 @@ static uint64_t lte_get_imsi_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_imei_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_imei_cb_t callback = (get_imei_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -936,7 +944,7 @@ static uint64_t lte_get_imei_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_pinset_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_pinset_cb_t callback = (get_pinset_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -951,7 +959,7 @@ static uint64_t lte_get_pinset_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_set_pinenable_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { set_pinenable_cb_t callback = (set_pinenable_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -966,7 +974,7 @@ static uint64_t lte_set_pinenable_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_change_pin_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { change_pin_cb_t callback = (change_pin_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -981,7 +989,7 @@ static uint64_t lte_change_pin_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_enter_pin_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { enter_pin_cb_t callback = (enter_pin_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -997,7 +1005,7 @@ static uint64_t lte_enter_pin_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_localtime_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_localtime_cb_t callback = (get_localtime_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1012,7 +1020,7 @@ static uint64_t lte_get_localtime_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_operator_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_operator_cb_t callback = (get_operator_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1027,7 +1035,7 @@ static uint64_t lte_get_operator_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_edrx_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_edrx_cb_t callback = (get_edrx_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1049,7 +1057,7 @@ static uint64_t lte_get_edrx_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_set_edrx_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { set_edrx_cb_t callback = (set_edrx_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1063,7 +1071,7 @@ static uint64_t lte_set_edrx_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_psm_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_psm_cb_t callback = (get_psm_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1085,7 +1093,7 @@ static uint64_t lte_get_psm_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_set_psm_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { set_psm_cb_t callback = (set_psm_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1099,7 +1107,7 @@ static uint64_t lte_set_psm_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_ce_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_ce_cb_t callback = (get_ce_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1114,7 +1122,7 @@ static uint64_t lte_get_ce_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_set_ce_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { set_ce_cb_t callback = (set_ce_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1128,7 +1136,7 @@ static uint64_t lte_set_ce_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_siminfo_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_siminfo_cb_t callback = (get_siminfo_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1143,7 +1151,7 @@ static uint64_t lte_get_siminfo_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_current_edrx_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_current_edrx_cb_t callback = (get_current_edrx_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1165,7 +1173,7 @@ static uint64_t lte_get_current_edrx_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_current_psm_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_current_psm_cb_t callback = (get_current_psm_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1187,7 +1195,7 @@ static uint64_t lte_get_current_psm_exec_cb(FAR void *cb, FAR void **cbarg, } static uint64_t lte_get_quality_exec_cb(FAR void *cb, FAR void **cbarg, - FAR bool *set_writable) + FAR bool *set_writable) { get_quality_cb_t callback = (get_quality_cb_t)cb; FAR uint32_t *result = (FAR uint32_t *)cbarg[0]; @@ -1204,11 +1212,12 @@ static uint64_t lte_get_quality_exec_cb(FAR void *cb, FAR void **cbarg, #endif /* CONFIG_LTE_LAPI_ENABLE_DEPRECATED_API */ static uint64_t lte_set_report_netinfo_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) + FAR void **cbarg, + FAR bool *set_writable) { netinfo_report_cb_t callback = (netinfo_report_cb_t)cb; FAR lte_netinfo_t *info = (FAR lte_netinfo_t *)cbarg[0]; - FAR uint8_t ndnsaddrs = *((FAR uint8_t *)cbarg[1]); + uint8_t ndnsaddrs = *((FAR uint8_t *)cbarg[1]); FAR struct sockaddr_storage *dnsaddr = (FAR struct sockaddr_storage *)cbarg[2]; #if defined(CONFIG_NETDB_DNSCLIENT) @@ -1223,7 +1232,7 @@ static uint64_t lte_set_report_netinfo_exec_cb(FAR void *cb, ALTCOM_DNS_SERVERS : ndnsaddrs; for (i = 0; (i < ndnsaddrs) && (i < CONFIG_NETDB_DNSSERVER_NAMESERVERS); - i++) + i++) { addrlen = (dnsaddr[i].ss_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6); @@ -1240,7 +1249,8 @@ static uint64_t lte_set_report_netinfo_exec_cb(FAR void *cb, } static uint64_t lte_set_report_simstat_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) + FAR void **cbarg, + FAR bool *set_writable) { simstat_report_cb_t callback = (simstat_report_cb_t)cb; FAR uint32_t *simstat = (FAR uint32_t *)cbarg[0]; @@ -1254,7 +1264,8 @@ static uint64_t lte_set_report_simstat_exec_cb(FAR void *cb, } static uint64_t lte_set_report_localtime_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) + FAR void **cbarg, + FAR bool *set_writable) { localtime_report_cb_t callback = (localtime_report_cb_t)cb; FAR lte_localtime_t *localtime = (FAR lte_localtime_t *)cbarg[0]; @@ -1268,7 +1279,9 @@ static uint64_t lte_set_report_localtime_exec_cb(FAR void *cb, } static uint64_t lte_set_report_quality_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) + FAR void **cbarg, + + FAR bool *set_writable) { quality_report_cb_t callback = (quality_report_cb_t)cb; FAR lte_quality_t *quality = (FAR lte_quality_t *)cbarg[0]; @@ -1282,7 +1295,8 @@ static uint64_t lte_set_report_quality_exec_cb(FAR void *cb, } static uint64_t lte_set_report_cellinfo_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) + FAR void **cbarg, + FAR bool *set_writable) { cellinfo_report_cb_t callback = (cellinfo_report_cb_t)cb; FAR lte_cellinfo_t *cellinfo = (FAR lte_cellinfo_t *)cbarg[0]; @@ -1295,11 +1309,11 @@ static uint64_t lte_set_report_cellinfo_exec_cb(FAR void *cb, return 0ULL; } -static uint64_t tls_config_verify_exec_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t tls_config_verify_exec_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { - void (*callback)(FAR void **cbarg) = cb; - void *arg[2]; + CODE void (*callback)(FAR void **cbarg) = cb; + FAR void *arg[2]; uint32_t crt = *((FAR uint32_t *)cbarg[0]); int32_t depth = *((FAR int32_t *)cbarg[1]); @@ -1325,80 +1339,82 @@ static uint64_t tls_config_verify_exec_cb(FAR void *cb, return 0ULL; } -static uint64_t lwm2m_read_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t lwm2m_read_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { lwm2mstub_read_cb_t callback = (lwm2mstub_read_cb_t)cb; if (callback) { callback((int)cbarg[0], (int)cbarg[1], - (struct lwm2mstub_instance_s *)cbarg[2]); + (FAR struct lwm2mstub_instance_s *)cbarg[2]); } return 0ULL; } -static uint64_t lwm2m_write_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t lwm2m_write_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { lwm2mstub_write_cb_t callback = (lwm2mstub_write_cb_t)cb; if (callback) { callback((int)cbarg[0], (int)cbarg[1], - (struct lwm2mstub_instance_s *)cbarg[2], - (char *)cbarg[3], (int)cbarg[4]); + (FAR struct lwm2mstub_instance_s *)cbarg[2], + (FAR char *)cbarg[3], (int)cbarg[4]); } return 0ULL; } -static uint64_t lwm2m_exec_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t lwm2m_exec_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { lwm2mstub_exec_cb_t callback = (lwm2mstub_exec_cb_t)cb; if (callback) { callback((int)cbarg[0], (int)cbarg[1], - (struct lwm2mstub_instance_s *)cbarg[2]); + (FAR struct lwm2mstub_instance_s *)cbarg[2]); } return 0ULL; } -static uint64_t lwm2m_ovstart_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t lwm2m_ovstart_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { lwm2mstub_ovstart_cb_t callback = (lwm2mstub_ovstart_cb_t)cb; if (callback) { callback((int)cbarg[0], (int)cbarg[1], - (struct lwm2mstub_instance_s *)cbarg[2], (char *)cbarg[3], - (struct lwm2mstub_ovcondition_s *)cbarg[5]); + (FAR struct lwm2mstub_instance_s *)cbarg[2], + (FAR char *)cbarg[3], + (FAR struct lwm2mstub_ovcondition_s *)cbarg[5]); } return 0ULL; } -static uint64_t lwm2m_ovstop_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t lwm2m_ovstop_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { lwm2mstub_ovstop_cb_t callback = (lwm2mstub_ovstop_cb_t)cb; if (callback) { callback((int)cbarg[0], (int)cbarg[1], - (struct lwm2mstub_instance_s *)cbarg[2], (char *)cbarg[3]); + (FAR struct lwm2mstub_instance_s *)cbarg[2], + (FAR char *)cbarg[3]); } return 0ULL; } -static uint64_t lwm2m_operation_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t lwm2m_operation_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { lwm2mstub_operation_cb_t callback = (lwm2mstub_operation_cb_t)cb; @@ -1410,8 +1426,8 @@ static uint64_t lwm2m_operation_evt_cb(FAR void *cb, return 0ULL; } -static uint64_t lwm2m_fwupdate_evt_cb(FAR void *cb, - FAR void **cbarg, FAR bool *set_writable) +static uint64_t lwm2m_fwupdate_evt_cb(FAR void *cb, FAR void **cbarg, + FAR bool *set_writable) { lwm2mstub_fwupstate_cb_t callback = (lwm2mstub_fwupstate_cb_t)cb; @@ -1490,8 +1506,10 @@ static void errno2result(FAR int32_t *result_ptr) ****************************************************************************/ static uint64_t exec_callback(uint32_t cmdid, - uint64_t (*func)(FAR void *cb, FAR void **arg, FAR bool *set_writable), - FAR void **arg, FAR bool *set_writable) + CODE uint64_t (*func)(FAR void *cb, + FAR void **arg, + FAR bool *set_writable), + FAR void **arg, FAR bool *set_writable) { uint64_t evtbitmap = 0ULL; FAR int32_t *result = NULL; @@ -1519,9 +1537,11 @@ static uint64_t exec_callback(uint32_t cmdid, * execute func() and update the evtbitmap */ - if (cmdid == LTE_CMDID_GETPSM || cmdid == LTE_CMDID_GETEDRX || - cmdid == LTE_CMDID_REPNETINFO || cmdid == LTE_CMDID_REPSIMSTAT || - cmdid == LTE_CMDID_REPLTIME) + if (cmdid == LTE_CMDID_GETPSM || + cmdid == LTE_CMDID_GETEDRX || + cmdid == LTE_CMDID_REPNETINFO || + cmdid == LTE_CMDID_REPSIMSTAT || + cmdid == LTE_CMDID_REPLTIME) { evtbitmap = func(NULL, arg, set_writable); } @@ -1544,7 +1564,7 @@ static FAR void **get_evtarg(int idx) * Name: get_cmdid_byidx ****************************************************************************/ -static FAR uint32_t get_cmdid_byidx(int idx) +static uint32_t get_cmdid_byidx(int idx) { FAR alt_evtbuf_inst_t *inst = &g_evtbuffers[idx]; @@ -1590,7 +1610,7 @@ static void update_evtarg_writableall(void) * Name: get_execfunc ****************************************************************************/ -static void *get_execfunc(int idx) +static FAR void *get_execfunc(int idx) { int i; uint32_t cmdid; @@ -1612,7 +1632,7 @@ static void *get_execfunc(int idx) * Name: get_cbfunc ****************************************************************************/ -static void *get_cbfunc(uint32_t cmdid) +static FAR void *get_cbfunc(uint32_t cmdid) { int i; FAR void *ret = NULL; @@ -1642,7 +1662,8 @@ static uint64_t alt1250_search_execcb(uint64_t evtbitmap) int idx; uint64_t ret = 0ULL; uint64_t l_evtbitmap = 0ULL; - uint64_t (*func)(FAR void *cb, FAR void **arg, FAR bool *set_writable); + CODE uint64_t (*func)(FAR void *cb, FAR void **arg, + FAR bool *set_writable); bool set_writable; for (idx = 0; idx < nitems(g_evtbuffers); idx++) @@ -1655,7 +1676,7 @@ static uint64_t alt1250_search_execcb(uint64_t evtbitmap) func = get_execfunc(idx); l_evtbitmap = exec_callback(g_evtbuffers[idx].cmdid, func, - get_evtarg(idx), &set_writable); + get_evtarg(idx), &set_writable); ret |= l_evtbitmap; @@ -1724,7 +1745,7 @@ static int reg_evtcb(struct cbinfo_s *info, uint32_t cmdid, FAR void *cb) * Name: search_evtcb ****************************************************************************/ -static struct cbinfo_s *search_evtcb(uint32_t cmdid) +static FAR struct cbinfo_s *search_evtcb(uint32_t cmdid) { int i; @@ -1870,7 +1891,7 @@ FAR void **alt1250_getevtarg(uint32_t cmdid) ****************************************************************************/ bool alt1250_checkcmdid(uint32_t cmdid, uint64_t evtbitmap, - FAR uint64_t *bit) + FAR uint64_t *bit) { int idx; bool ret = false; @@ -2016,7 +2037,8 @@ int alt1250_evttask_start(void) { #ifdef CONFIG_LTE_ALT1250_LAUNCH_EVENT_TASK g_cbpid = task_create(EVTTASK_NAME, CONFIG_LTE_ALT1250_EVENT_TASK_PRIORITY, - CONFIG_LTE_ALT1250_EVENT_TASK_STACKSIZE, internal_evttask, NULL); + CONFIG_LTE_ALT1250_EVENT_TASK_STACKSIZE, + internal_evttask, NULL); return g_cbpid; #else return 1; /* Always success */ @@ -2052,7 +2074,7 @@ void alt1250_evttask_msgclose(FAR struct alt1250_s *dev) } int alt1250_evttask_msgconnect(FAR const char *qname, - FAR struct alt1250_s *dev) + FAR struct alt1250_s *dev) { int ret = OK; @@ -2086,8 +2108,7 @@ uint32_t alt1250_search_registered_callback(FAR int *index) return ret; } -int alt1250_get_report_ltecmd(FAR struct alt1250_s *dev, - uint32_t cmdid, +int alt1250_get_report_ltecmd(FAR struct alt1250_s *dev, uint32_t cmdid, FAR struct lte_ioctl_data_s *ltecmd) { int ret = OK; diff --git a/lte/alt1250/callback_handlers/alt1250_evt.h b/lte/alt1250/callback_handlers/alt1250_evt.h index 2ad8cd6a8..b87a4fcc8 100644 --- a/lte/alt1250/callback_handlers/alt1250_evt.h +++ b/lte/alt1250/callback_handlers/alt1250_evt.h @@ -56,7 +56,7 @@ int alt1250_regevtcb(uint32_t id, FAR void *cb); void alt1250_execcb(uint64_t evtbitmap); FAR void **alt1250_getevtarg(uint32_t cmdid); bool alt1250_checkcmdid(uint32_t cmdid, uint64_t evtbitmap, - FAR uint64_t *bit); + FAR uint64_t *bit); void alt1250_setevtarg_writable(uint32_t cmdid); int alt1250_clrevtcb(uint8_t mode); @@ -65,10 +65,9 @@ void alt1250_evttask_stop(FAR struct alt1250_s *dev); int alt1250_evttask_sendmsg(FAR struct alt1250_s *dev, uint64_t msg); void alt1250_evttask_msgclose(FAR struct alt1250_s *dev); int alt1250_evttask_msgconnect(FAR const char *qname, - FAR struct alt1250_s *dev); + FAR struct alt1250_s *dev); uint32_t alt1250_search_registered_callback(FAR int *index); -int alt1250_get_report_ltecmd(FAR struct alt1250_s *dev, - uint32_t cmdid, +int alt1250_get_report_ltecmd(FAR struct alt1250_s *dev, uint32_t cmdid, FAR struct lte_ioctl_data_s *ltecmd); #endif /* __APPS_LTE_ALT1250_CALLBACK_HANDLERS_ALT1250_EVT_H */ diff --git a/lte/alt1250/usock_handlers/alt1250_closehdlr.c b/lte/alt1250/usock_handlers/alt1250_closehdlr.c index 053195321..0b61c2b15 100644 --- a/lte/alt1250/usock_handlers/alt1250_closehdlr.c +++ b/lte/alt1250/usock_handlers/alt1250_closehdlr.c @@ -92,7 +92,7 @@ int postproc_sockcommon(FAR struct alt1250_s *dev, */ *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); switch (USOCKET_REQID(usock)) { @@ -141,7 +141,7 @@ int usockreq_close(FAR struct alt1250_s *dev, if (usock == NULL) { dbg_alt1250("Failed to get socket context: %u\n", - request->usockid); + request->usockid); *usock_result = -EBADFD; return REP_SEND_ACK_WOFREE; } diff --git a/lte/alt1250/usock_handlers/alt1250_connecthdlr.c b/lte/alt1250/usock_handlers/alt1250_connecthdlr.c index d18ee7277..4e70d316c 100644 --- a/lte/alt1250/usock_handlers/alt1250_connecthdlr.c +++ b/lte/alt1250/usock_handlers/alt1250_connecthdlr.c @@ -68,11 +68,11 @@ static int postproc_getsockopt(FAR struct alt1250_s *dev, */ *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); if (*usock_result >= 0) { - *usock_result = *(int32_t *)(resp[3]); + *usock_result = *(FAR int32_t *)(resp[3]); *usock_xid = USOCKET_XID(usock); dbg_alt1250("connect result = %d\n", *usock_result); @@ -124,7 +124,7 @@ static int postproc_connect(FAR struct alt1250_s *dev, */ *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); dbg_alt1250("%s connect result:%d\n", __func__, *usock_result); @@ -191,7 +191,7 @@ int nextstep_check_connectres(FAR struct alt1250_s *dev, { int ret = REP_NO_CONTAINER; int32_t usock_result; - struct alt_container_s *container; + FAR struct alt_container_s *container; dbg_alt1250("%s start\n", __func__); diff --git a/lte/alt1250/usock_handlers/alt1250_getsocknamehdlr.c b/lte/alt1250/usock_handlers/alt1250_getsocknamehdlr.c index b751ddc2e..b7539847d 100644 --- a/lte/alt1250/usock_handlers/alt1250_getsocknamehdlr.c +++ b/lte/alt1250/usock_handlers/alt1250_getsocknamehdlr.c @@ -61,7 +61,7 @@ static int postproc_getsockname(FAR struct alt1250_s *dev, */ *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); if (*usock_result >= 0) { @@ -69,8 +69,8 @@ static int postproc_getsockname(FAR struct alt1250_s *dev, *usock_xid = USOCKET_XID(usock); ackinfo->valuelen = MIN(USOCKET_REQADDRLEN(usock), - *(uint16_t *)(resp[2])); - ackinfo->valuelen_nontrunc = *(uint16_t *)(resp[2]); + *(FAR uint16_t *)(resp[2])); + ackinfo->valuelen_nontrunc = *(FAR uint16_t *)(resp[2]); ackinfo->value_ptr = resp[3]; ackinfo->buf_ptr = NULL; @@ -173,7 +173,7 @@ int usockreq_getsockname(FAR struct alt1250_s *dev, if (usock == NULL) { dbg_alt1250("Failed to get socket context: %u\n", - request->usockid); + request->usockid); *usock_result = -EBADFD; return REP_SEND_ACK_WOFREE; } diff --git a/lte/alt1250/usock_handlers/alt1250_getsockopthdlr.c b/lte/alt1250/usock_handlers/alt1250_getsockopthdlr.c index b2b65688d..673d54d17 100644 --- a/lte/alt1250/usock_handlers/alt1250_getsockopthdlr.c +++ b/lte/alt1250/usock_handlers/alt1250_getsockopthdlr.c @@ -57,7 +57,7 @@ static int postproc_getsockopt(FAR struct alt1250_s *dev, */ *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); if (*usock_result >= 0) { @@ -65,8 +65,8 @@ static int postproc_getsockopt(FAR struct alt1250_s *dev, *usock_xid = USOCKET_XID(usock); ackinfo->valuelen = MIN(USOCKET_REQOPTLEN(usock), - *(uint16_t *)(resp[2])); - ackinfo->valuelen_nontrunc = *(uint16_t *)(resp[2]); + *(FAR uint16_t *)(resp[2])); + ackinfo->valuelen_nontrunc = *(FAR uint16_t *)(resp[2]); ackinfo->value_ptr = resp[3]; ackinfo->buf_ptr = NULL; @@ -173,7 +173,7 @@ int usockreq_getsockopt(FAR struct alt1250_s *dev, if (usock == NULL) { dbg_alt1250("Failed to get socket context: %u\n", - request->usockid); + request->usockid); *usock_result = -EBADFD; return REP_SEND_ACK_WOFREE; } diff --git a/lte/alt1250/usock_handlers/alt1250_sockethdlr.c b/lte/alt1250/usock_handlers/alt1250_sockethdlr.c index c0687a3cb..d43e044b9 100644 --- a/lte/alt1250/usock_handlers/alt1250_sockethdlr.c +++ b/lte/alt1250/usock_handlers/alt1250_sockethdlr.c @@ -119,7 +119,7 @@ static int postproc_setfl(FAR struct alt1250_s *dev, dbg_alt1250("%s start\n", __func__); *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); if (*usock_result >= 0) { @@ -174,7 +174,7 @@ static int postproc_setfl(FAR struct alt1250_s *dev, break; default: - dbg_alt1250("unexpected sequense. reqid:0x%02x\n", + dbg_alt1250("unexpected sequence. reqid:0x%02x\n", USOCKET_REQID(usock)); *usock_result = -EFAULT; break; @@ -216,7 +216,7 @@ static int postproc_getfl(FAR struct alt1250_s *dev, dbg_alt1250("%s start\n", __func__); *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); if (*usock_result >= 0) { @@ -269,7 +269,7 @@ static int postproc_socket(FAR struct alt1250_s *dev, dbg_alt1250("%s start\n", __func__); *usock_xid = USOCKET_XID(usock); - *usock_result = COMBINE_ERRCODE(*(int *)resp[0], *(int *)resp[1]); + *usock_result = COMBINE_ERRCODE(*(FAR int *)resp[0], *(FAR int *)resp[1]); if (*usock_result >= 0) { diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c index f9d94347e..0e24c1047 100644 --- a/netutils/ftpd/ftpd.c +++ b/netutils/ftpd/ftpd.c @@ -65,7 +65,7 @@ #include #ifdef CONFIG_FTPD_LOGIN_PASSWD - #include "fsutils/passwd.h" +# include "fsutils/passwd.h" #endif #include "netutils/ftpd.h" diff --git a/nshlib/nsh_proccmds.c b/nshlib/nsh_proccmds.c index ab8560314..acc773c6e 100644 --- a/nshlib/nsh_proccmds.c +++ b/nshlib/nsh_proccmds.c @@ -48,9 +48,9 @@ #endif #ifndef CONFIG_NSH_DISABLE_UPTIME - #ifndef FSHIFT - # define FSHIFT SI_LOAD_SHIFT - #endif +# ifndef FSHIFT +# define FSHIFT SI_LOAD_SHIFT +# endif # define FIXED_1 (1 << FSHIFT) /* 1.0 as fixed-point */ # define LOAD_INT(x) ((x) >> FSHIFT) # define LOAD_FRAC(x) (LOAD_INT(((x) & (FIXED_1 - 1)) * 100)) diff --git a/system/trace/trace_dump.c b/system/trace/trace_dump.c index 3f8bfa30f..475a3d2eb 100644 --- a/system/trace/trace_dump.c +++ b/system/trace/trace_dump.c @@ -310,8 +310,8 @@ static void trace_dump_header(FAR FILE *out, ); } - #if (defined CONFIG_SCHED_INSTRUMENTATION_SWITCH) || \ - (defined CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER) +#if (defined CONFIG_SCHED_INSTRUMENTATION_SWITCH) || \ + (defined CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER) /**************************************************************************** * Name: trace_dump_sched_switch ****************************************************************************/ diff --git a/testing/drivertest/drivertest_uart.c b/testing/drivertest/drivertest_uart.c index 8d06d0a4f..e7f5ba0a0 100644 --- a/testing/drivertest/drivertest_uart.c +++ b/testing/drivertest/drivertest_uart.c @@ -39,19 +39,19 @@ ****************************************************************************/ #ifndef CONFIG_TESTING_DRIVER_TEST_UART_DEVICE - #define CONFIG_TESTING_DRIVER_TEST_UART_DEVICE "/dev/console" +# define CONFIG_TESTING_DRIVER_TEST_UART_DEVICE "/dev/console" #endif #ifndef CONFIG_TESTING_DRIVER_TEST_UART_DEFAULT_CONTENT - #define CONFIG_TESTING_DRIVER_TEST_UART_DEFAULT_CONTENT "0123456789abcdefg"\ +# define CONFIG_TESTING_DRIVER_TEST_UART_DEFAULT_CONTENT "0123456789abcdefg"\ "hijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ,./<>?;':\"[]{}\\|!@#$%^"\ "&*()-+_=" - #define DEFAULT_CONTENT CONFIG_TESTING_DRIVER_TEST_UART_DEFAULT_CONTENT +# define DEFAULT_CONTENT CONFIG_TESTING_DRIVER_TEST_UART_DEFAULT_CONTENT #endif #ifndef CONFIG_TESTING_DRIVER_TEST_UART_BUFFER_SIZE - #define CONFIG_TESTING_DRIVER_TEST_UART_BUFFER_SIZE 1024 - #define BUFFER_SIZE CONFIG_TESTING_DRIVER_TEST_UART_BUFFER_SIZE +# define CONFIG_TESTING_DRIVER_TEST_UART_BUFFER_SIZE 1024 +# define BUFFER_SIZE CONFIG_TESTING_DRIVER_TEST_UART_BUFFER_SIZE #endif /****************************************************************************