sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples: nxstyle fixes

Browse Source 
fixes for nxstyle errors reported by CI

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
This commit is contained in:
Alin Jerpelea 2021-06-16 09:29:21 +02:00 committed by Xiang Xiao
parent 2ac8589a25
commit 869535e470
9 changed files with 124 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/adxl372_test/adxl372_test_main.c
View File

@ -390,9 +390,9 @@ int main(int argc, FAR char *argv[])
/* The two arrays below must be synchronized */
test_ptr_t test_ptr_array[] = /* Array of test programs */
{
adxl372_test, /* ADXL372 accelerometer tests */
};
{
adxl372_test, /* ADXL372 accelerometer tests */
};
FAR char *test_path[ARRAYSIZE(test_ptr_array)];

5
examples/discover/discover_main.c
View File

@ -81,7 +81,7 @@ int main(int argc, FAR char *argv[])
void *handle;
#endif
/* Many embedded network interfaces must have a software assigned MAC */
/* Many embedded network interfaces must have a software assigned MAC */
#ifdef CONFIG_EXAMPLES_DISCOVER_NOMAC
mac[0] = 0x00;
@ -127,7 +127,8 @@ int main(int argc, FAR char *argv[])
handle = dhcpc_open("eth0", &mac, IFHWADDRLEN);
/* Get an IP address. Note: there is no logic here for renewing the address in this
/* Get an IP address.
* Note: there is no logic here for renewing the address in this
* example. The address should be renewed in ds.lease_time/2 seconds.
*/

22
examples/flash_test/flash_test.c
View File

@ -48,7 +48,7 @@
int main(int argc, FAR char *argv[])
{
struct inode* inode;
struct inode * inode;
int ret;
int x;
int logsector;
@ -86,7 +86,8 @@ int main(int argc, FAR char *argv[])
}
/* Test if the device is formatted. If not, then we must do a
* low-level format first */
* low-level format first
*/
if (!(fmt.flags & SMART_FMT_ISFORMATTED))
{
@ -176,7 +177,8 @@ int main(int argc, FAR char *argv[])
}
/* Now read the data back to validate everything was written and can
* be read. */
* be read.
*/
printf("\nDoing read verify test\n");
for (x = 0; x < fmt.nsectors >> 1; x++)
@ -219,9 +221,11 @@ int main(int argc, FAR char *argv[])
seqs[x] = seq++;
/* Now write over the sector data with new data, causing a relocation. */
/* Now write over the sector data with new data, causing a relocation.
*/
sprintf(buffer, "Logical sector %d sequence %d\n", sectors[x], seqs[x]);
sprintf(buffer, "Logical sector %d sequence %d\n",
sectors[x], seqs[x]);
readwrite.logsector = sectors[x];
readwrite.offset = 0;
readwrite.count = strlen(buffer) + 1;
@ -244,7 +248,9 @@ int main(int argc, FAR char *argv[])
seqs[x] = seq++;
/* Now write over the sector data with new data, causing a relocation. */
/* Now write over the sector data with new data,
* causing a relocation.
*/
sprintf(buffer, "Appended data in sector %d\n", sectors[x]);
readwrite.logsector = sectors[x];
@ -267,7 +273,7 @@ int main(int argc, FAR char *argv[])
{
/* Only free the sector if it is still valid */
if (sectors[x] != 0xFFFF)
if (sectors[x] != 0xffff)
{
inode->u.i_bops->ioctl(inode, BIOC_FREESECT, (unsigned long)
sectors[x]);
@ -275,6 +281,7 @@ int main(int argc, FAR char *argv[])
}
errout_with_buffers:
/* Free the allocated buffers */
free(seqs);
@ -282,6 +289,7 @@ errout_with_buffers:
free(buffer);
errout_with_driver:
/* Now close the block device and exit */
close_blockdriver(inode);

8
examples/lsm330spi_test/lsm330spi_test_main.c
View File

@ -626,10 +626,10 @@ int main(int argc, FAR char *argv[])
/* The two arrays below must be synchronized */
test_ptr_t test_ptr_array[] =
{
lsm330acl_test, /* LSM330 accelerometer tests */
lsm330gyro_test, /* LSM330 gyroscope tests */
};
{
lsm330acl_test, /* LSM330 accelerometer tests */
lsm330gyro_test, /* LSM330 gyroscope tests */
};
FAR char *test_path[ARRAYSIZE(test_ptr_array)];

38
examples/powerled/powerled_main.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/examples/adc/powerled_main.c
* apps/examples/powerled/powerled_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -192,7 +192,7 @@ static void parse_args(FAR struct args_s *args, int argc, FAR char **argv)
int i_value;
float f_value;
for (index = 1; index < argc;)
for (index = 1; index < argc; )
{
ptr = argv[index];
if (ptr[0] != '-')
@ -461,7 +461,8 @@ int main(int argc, char *argv[])
/* Set LED current limit */
powerled_limits.current = (((float)CONFIG_EXAMPLES_POWERLED_CURRENT_LIMIT)/1000.0);
powerled_limits.current =
(((float)CONFIG_EXAMPLES_POWERLED_CURRENT_LIMIT) / 1000.0);
printf("\nStart powerled_main application!\n");
@ -470,7 +471,8 @@ int main(int argc, char *argv[])
fd = open(CONFIG_EXAMPLES_POWERLED_DEVPATH, 0);
if (fd <= 0)
{
printf("powerled_main: open %s failed %d\n", CONFIG_EXAMPLES_POWERLED_DEVPATH, errno);
printf("powerled_main: open %s failed %d\n",
CONFIG_EXAMPLES_POWERLED_DEVPATH, errno);
goto errout;
}
@ -505,7 +507,8 @@ int main(int argc, char *argv[])
/* Set Powerled continuous mode */
ret = ioctl(fd, PWRIOC_SET_MODE, (unsigned long)powerled_mode);
ret = ioctl(fd, PWRIOC_SET_MODE,
(unsigned long)powerled_mode);
if (ret < 0)
{
printf("failed to set powerled mode %d \n", ret);
@ -518,7 +521,8 @@ int main(int argc, char *argv[])
/* Set Powerled parameters */
ret = ioctl(fd, PWRIOC_SET_PARAMS, (unsigned long)&powerled_params);
ret = ioctl(fd, PWRIOC_SET_PARAMS,
(unsigned long)&powerled_params);
if (ret < 0)
{
printf("failed to set params %d \n", ret);
@ -549,7 +553,6 @@ int main(int argc, char *argv[])
sleep(1);
}
if (demo == POWERLED_OPMODE_FLASH)
{
/* Flash mode demo */
@ -566,13 +569,15 @@ int main(int argc, char *argv[])
/* Set Powerled flash mode */
ret = ioctl(fd, PWRIOC_SET_MODE, (unsigned long)powerled_mode);
ret = ioctl(fd, PWRIOC_SET_MODE,
(unsigned long)powerled_mode);
if (ret < 0)
{
printf("failed to set powerled mode %d \n", ret);
}
printf("Brightness is %.2f\n", powerled_params.brightness);
printf("Brightness is %.2f\n",
powerled_params.brightness);
printf("Duty is %.2f\n", powerled_params.duty);
config = false;
@ -582,7 +587,8 @@ int main(int argc, char *argv[])
/* Set Powerled parameters */
ret = ioctl(fd, PWRIOC_SET_PARAMS, (unsigned long)&powerled_params);
ret = ioctl(fd, PWRIOC_SET_PARAMS,
(unsigned long)&powerled_params);
if (ret < 0)
{
printf("failed to set params %d \n", ret);
@ -628,7 +634,8 @@ int main(int argc, char *argv[])
/* Set Powerled continuous mode */
ret = ioctl(fd, PWRIOC_SET_MODE, (unsigned long)powerled_mode);
ret = ioctl(fd, PWRIOC_SET_MODE,
(unsigned long)powerled_mode);
if (ret < 0)
{
printf("failed to set powerled mode %d \n", ret);
@ -640,7 +647,8 @@ int main(int argc, char *argv[])
/* Set Powerled parameters */
ret = ioctl(fd, PWRIOC_SET_PARAMS, (unsigned long)&powerled_params);
ret = ioctl(fd, PWRIOC_SET_PARAMS,
(unsigned long)&powerled_params);
if (ret < 0)
{
printf("failed to set params %d \n", ret);
@ -672,7 +680,8 @@ int main(int argc, char *argv[])
/* Set Powerled flash mode */
ret = ioctl(fd, PWRIOC_SET_MODE, (unsigned long)powerled_mode);
ret = ioctl(fd, PWRIOC_SET_MODE,
(unsigned long)powerled_mode);
if (ret < 0)
{
printf("failed to set powerled mode %d \n", ret);
@ -684,7 +693,8 @@ int main(int argc, char *argv[])
/* Set Powerled parameters */
ret = ioctl(fd, PWRIOC_SET_PARAMS, (unsigned long)&powerled_params);
ret = ioctl(fd, PWRIOC_SET_PARAMS,
(unsigned long)&powerled_params);
if (ret < 0)
{
printf("failed to set params %d \n", ret);

46
examples/smps/smps_main.c
View File

@ -195,7 +195,7 @@ static void parse_args(FAR struct args_s *args, int argc, FAR char **argv)
int index;
int nargs;
for (index = 1; index < argc;)
for (index = 1; index < argc; )
{
ptr = argv[index];
if (ptr[0] != '-')
@ -308,21 +308,24 @@ static int validate_args(FAR struct args_s *args)
int ret = OK;
if (args->current < 0 ||
args->current > (((float)CONFIG_EXAMPLES_SMPS_OUT_CURRENT_LIMIT)/1000.0))
args->current >
(((float)CONFIG_EXAMPLES_SMPS_OUT_CURRENT_LIMIT) / 1000.0))
{
printf("Not valid current value: %.2f\n", args->current);
goto errout;
}
if (args->voltage < 0 ||
args->voltage > (((float)CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_LIMIT)/1000.0))
args->voltage >
(((float)CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_LIMIT) / 1000.0))
{
printf("Not valid voltage value: %.2f\n", args->voltage);
goto errout;
}
if (args->power < 0 ||
args->power > (((float)CONFIG_EXAMPLES_SMPS_OUT_POWER_LIMIT)/1000.0))
args->power >
(((float)CONFIG_EXAMPLES_SMPS_OUT_POWER_LIMIT) / 1000.0))
{
printf("Not valid power value: %.2f\n", args->power);
goto errout;
@ -362,7 +365,8 @@ static void feedback_print(FAR struct smps_feedback_s *fb)
printf("\n");
}
static void print_info(struct smps_limits_s *limits, struct smps_params_s *params,
static void print_info(struct smps_limits_s *limits,
struct smps_params_s *params,
uint8_t *mode, struct args_s *args)
{
printf("-------------------------------------\n");
@ -443,22 +447,28 @@ int main(int argc, char *argv[])
/* Initialize SMPS limits */
#if CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_LIMIT > 0
smps_limits.v_out = (float)CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_LIMIT/1000.0;
smps_limits.v_out =
(float)CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_LIMIT / 1000.0;
#endif
#if CONFIG_EXAMPLES_SMPS_IN_VOLTAGE_LIMIT > 0
smps_limits.v_in = (float)CONFIG_EXAMPLES_SMPS_IN_VOLTAGE_LIMIT/1000.0;
smps_limits.v_in =
(float)CONFIG_EXAMPLES_SMPS_IN_VOLTAGE_LIMIT / 1000.0;
#endif
#if CONFIG_EXAMPLES_SMPS_OUT_CURRENT_LIMIT > 0
smps_limits.i_out = (float)CONFIG_EXAMPLES_SMPS_OUT_CURRENT_LIMIT/1000.0;
smps_limits.i_out =
(float)CONFIG_EXAMPLES_SMPS_OUT_CURRENT_LIMIT / 1000.0;
#endif
#if CONFIG_EXAMPLES_SMPS_IN_CURRENT_LIMIT > 0
smps_limits.i_in = (float)CONFIG_EXAMPLES_SMPS_IN_CURRENT_LIMIT/1000.0;
smps_limits.i_in =
(float)CONFIG_EXAMPLES_SMPS_IN_CURRENT_LIMIT / 1000.0;
#endif
#if CONFIG_EXAMPLES_SMPS_OUT_CURRENT_LIMIT > 0
smps_limits.p_out = (float)CONFIG_EXAMPLES_SMPS_OUT_POWER_LIMIT/1000.0;
smps_limits.p_out =
(float)CONFIG_EXAMPLES_SMPS_OUT_POWER_LIMIT / 1000.0;
#endif
#if CONFIG_EXAMPLES_SMPS_IN_CURRENT_LIMIT > 0
smps_limits.p_in = (float)CONFIG_EXAMPLES_SMPS_IN_POWER_LIMIT/1000.0;
smps_limits.p_in =
(float)CONFIG_EXAMPLES_SMPS_IN_POWER_LIMIT / 1000.0;
#endif
/* Parse the command line */
@ -493,13 +503,14 @@ int main(int argc, char *argv[])
/* Set SMPS params */
smps_params.v_out = (args->voltage > 0 ? args->voltage :
(float)CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_DEFAULT/1000.0);
(float)CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_DEFAULT / 1000.0);
smps_params.i_out = (args->current > 0 ? args->current :
(float)CONFIG_EXAMPLES_SMPS_OUT_CURRENT_DEFAULT/1000.0);
(float)CONFIG_EXAMPLES_SMPS_OUT_CURRENT_DEFAULT / 1000.0);
smps_params.p_out = (args->power > 0 ? args->power :
(float)CONFIG_EXAMPLES_SMPS_OUT_POWER_DEFAULT/1000.0);
(float)CONFIG_EXAMPLES_SMPS_OUT_POWER_DEFAULT / 1000.0);
args->time = (args->time == 0 ? CONFIG_EXAMPLES_SMPS_TIME_DEFAULT : args->time);
args->time = (args->time == 0 ? CONFIG_EXAMPLES_SMPS_TIME_DEFAULT :
args->time);
printf("\nStart smps_main application!\n\n");
@ -512,7 +523,8 @@ int main(int argc, char *argv[])
fd = open(CONFIG_EXAMPLES_SMPS_DEVPATH, 0);
if (fd <= 0)
{
printf("smps_main: open %s failed %d\n", CONFIG_EXAMPLES_SMPS_DEVPATH, errno);
printf("smps_main: open %s failed %d\n",
CONFIG_EXAMPLES_SMPS_DEVPATH, errno);
goto errout;
}
@ -554,7 +566,7 @@ int main(int argc, char *argv[])
/* Main loop */
while(terminate != true)
while (terminate != true)
{
/* Get current SMPS state */

22
examples/tcpecho/tcpecho_main.c
View File

@ -95,7 +95,7 @@ static int tcpecho_netsetup()
void *handle;
#endif
/* Many embedded network interfaces must have a software assigned MAC */
/* Many embedded network interfaces must have a software assigned MAC */
#ifdef CONFIG_EXAMPLES_TCPECHO_NOMAC
mac[0] = 0x00;
@ -141,7 +141,8 @@ static int tcpecho_netsetup()
handle = dhcpc_open("eth0", &mac, IFHWADDRLEN);
/* Get an IP address. Note: there is no logic here for renewing the address in this
/* Get an IP address.
* Note: there is no logic here for renewing the address in this
* example. The address should be renewed in ds.lease_time/2 seconds.
*/
@ -183,7 +184,11 @@ static int tcpecho_netsetup()
static int tcpecho_server(void)
{
int i, maxi, listenfd, connfd, sockfd;
int i;
int maxi;
int listenfd;
int connfd;
int sockfd;
int nready;
int ret;
ssize_t n;
@ -191,7 +196,8 @@ static int tcpecho_server(void)
socklen_t clilen;
bool stop = false;
struct pollfd client[CONFIG_EXAMPLES_TCPECHO_NCONN];
struct sockaddr_in cliaddr, servaddr;
struct sockaddr_in cliaddr;
struct sockaddr_in servaddr;
listenfd = socket(AF_INET, SOCK_STREAM, 0);
@ -206,7 +212,7 @@ static int tcpecho_server(void)
servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
servaddr.sin_port = htons(CONFIG_EXAMPLES_TCPECHO_PORT);
ret = bind(listenfd, (struct sockaddr*)&servaddr, sizeof(servaddr));
ret = bind(listenfd, (struct sockaddr *)&servaddr, sizeof(servaddr));
if (ret < 0)
{
perror("ERROR: failed to bind socket.\n");
@ -233,14 +239,14 @@ static int tcpecho_server(void)
while (!stop)
{
nready = poll(client, maxi+1, TCPECHO_POLLTIMEOUT);
nready = poll(client, maxi + 1, TCPECHO_POLLTIMEOUT);
if (client[0].revents & POLLRDNORM)
{
/* new client connection */
clilen = sizeof(cliaddr);
connfd = accept(listenfd, (struct sockaddr*)&cliaddr, &clilen);
connfd = accept(listenfd, (struct sockaddr *)&cliaddr, &clilen);
ninfo("new client: %s\n", inet_ntoa(cliaddr.sin_addr));
@ -282,7 +288,7 @@ static int tcpecho_server(void)
if (client[i].revents & (POLLRDNORM | POLLERR))
{
if ( (n = read(sockfd, buf, TCPECHO_MAXLINE)) < 0)
if ((n = read(sockfd, buf, TCPECHO_MAXLINE)) < 0)
{
if (errno == ECONNRESET)
{

2
graphics/pdcurs34/nuttx/pdcthread.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/nuttx/pdcthread.c
* apps/graphics/pdcurs34/nuttx/pdcthread.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

54
netutils/discover/discover.c
View File

@ -43,6 +43,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_DISCOVER_STACK_SIZE
@ -70,6 +71,7 @@
#endif
/* Internal Definitions *****************************************************/
/* Discover request packet format:
* Byte Description
* 0 Protocol identifier (0x99)
@ -142,17 +144,17 @@ static inline void discover_initresponse()
g_state.response[0] = DISCOVER_PROTO_ID;
g_state.response[1] = DISCOVER_RESPONSE;
strncpy((char*) &g_state.response[2], g_state.info.description,
DISCOVER_RESPONSE_SIZE-3);
strncpy((char *) &g_state.response[2], g_state.info.description,
DISCOVER_RESPONSE_SIZE - 3);
for (i = 0; i < DISCOVER_RESPONSE_SIZE-1; i++)
for (i = 0; i < DISCOVER_RESPONSE_SIZE - 1; i++)
{
chk -= g_state.response[i];
}
/* Append check sum */
g_state.response[DISCOVER_RESPONSE_SIZE-1] = chk & 0xff;
g_state.response[DISCOVER_RESPONSE_SIZE - 1] = chk & 0xff;
}
static int discover_daemon(int argc, char *argv[])
@ -163,11 +165,12 @@ static int discover_daemon(int argc, char *argv[])
struct sockaddr_in srcaddr;
/* memset(&g_state, 0, sizeof(struct discover_state_s)); */
discover_initresponse();
ninfo("Started\n");
for (;;)
for (; ; )
{
/* Create a socket to listen for requests from DHCP clients */
@ -184,7 +187,7 @@ static int discover_daemon(int argc, char *argv[])
/* Read the next packet */
nbytes = recvfrom(sockfd, &g_state.request, sizeof(g_state.request), 0,
(struct sockaddr*) &srcaddr,
(struct sockaddr *) &srcaddr,
(socklen_t *) &addrlen);
if (nbytes < 0)
{
@ -196,6 +199,7 @@ static int discover_daemon(int argc, char *argv[])
close(sockfd);
sockfd = -1;
}
continue;
}
@ -231,7 +235,7 @@ static inline int discover_parse(request_t packet)
if (packet[2] == 0xff || packet[2] == g_state.info.devclass)
{
for (i = 0; i < DISCOVER_REQUEST_SIZE-1; i++)
for (i = 0; i < DISCOVER_REQUEST_SIZE - 1; i++)
chk -= packet[i];
if ((chk & 0xff) != packet[3])
@ -244,6 +248,7 @@ static inline int discover_parse(request_t packet)
return OK;
}
}
return ERROR;
}
@ -299,7 +304,8 @@ static inline int discover_socket()
#ifdef HAVE_SO_REUSEADDR
optval = 1;
ret = setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof(int));
ret = setsockopt(sockfd, SOL_SOCKET,
SO_REUSEADDR, (void *)&optval, sizeof(int));
if (ret < 0)
{
nerr("ERROR: setsockopt SO_REUSEADDR failed: %d\n", errno);
@ -310,7 +316,8 @@ static inline int discover_socket()
#ifdef HAVE_SO_BROADCAST
optval = 1;
ret = setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, (void*)&optval, sizeof(int));
ret = setsockopt(sockfd, SOL_SOCKET,
SO_BROADCAST, (void *)&optval, sizeof(int));
if (ret < 0)
{
nerr("ERROR: setsockopt SO_BROADCAST failed: %d\n", errno);
@ -348,7 +355,8 @@ static inline int discover_openlistener()
close(sockfd);
return ERROR;
}
g_state.serverip = ((struct sockaddr_in*)&req.ifr_addr)->sin_addr.s_addr;
g_state.serverip = ((struct sockaddr_in *)&req.ifr_addr)->sin_addr.s_addr;
ninfo("serverip: %08lx\n", ntohl(g_state.serverip));
/* Bind the socket to a local port. We have to bind to INADDRY_ANY to
@ -361,12 +369,12 @@ static inline int discover_openlistener()
ret = bind(sockfd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
if (ret < 0)
{
nerr("ERROR: bind failed, port=%d addr=%08lx: %d\n",
addr.sin_port, (long)addr.sin_addr.s_addr, errno);
close(sockfd);
return ERROR;
}
{
nerr("ERROR: bind failed, port=%d addr=%08lx: %d\n",
addr.sin_port, (long)addr.sin_addr.s_addr, errno);
close(sockfd);
return ERROR;
}
return sockfd;
}
@ -386,7 +394,7 @@ static inline int discover_openresponder(void)
return ERROR;
}
/* Bind the socket to a local port.*/
/* Bind the socket to a local port. */
addr.sin_family = AF_INET;
addr.sin_port = 0;
@ -394,12 +402,12 @@ static inline int discover_openresponder(void)
ret = bind(sockfd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
if (ret < 0)
{
nerr("ERROR: bind failed, port=%d addr=%08lx: %d\n",
addr.sin_port, (long)addr.sin_addr.s_addr, errno);
close(sockfd);
return ERROR;
}
{
nerr("ERROR: bind failed, port=%d addr=%08lx: %d\n",
addr.sin_port, (long)addr.sin_addr.s_addr, errno);
close(sockfd);
return ERROR;
}
return sockfd;
}