mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-01 20:29:00 +00:00
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 <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko
Xiang Xiao
parent
f4d3e549b6
commit
aed0e2873e
35 changed files with 615 additions and 514 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include <nuttx/net/usrsock.h>
|
||||
|
||||
#include <sys/poll.h>
|
||||
#include <sys/param.h>
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
#include <unistd.h>
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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) \
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue