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

Fix several cosmetic, C coding style issues

Browse Source
This commit is contained in:
Gregory Nutt 2015-10-03 11:03:42 -06:00
parent f6e7e9c1c0
commit aacfce081e
48 changed files with 278 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ajoystick/ajoy_main.c
View File

@ -114,8 +114,8 @@ static b16_t g_ybslope;
static const char *g_ajoynames[AJOY_NBUTTONS] =
{
"SELECT", "FIRE", "JUMP", "BUTTON 4",
"BUTTON 5", "BUTTON 6", "BUTTON 7", "BUTTON 8",
"SELECT", "FIRE", "JUMP", "BUTTON 4",
"BUTTON 5", "BUTTON 6", "BUTTON 7", "BUTTON 8",
};
/****************************************************************************

2
examples/buttons/buttons_main.c
View File

@ -183,7 +183,7 @@ static int button7_handler(int irq, FAR void *context);
* Private Data
****************************************************************************/
/* Button Names */
/* Button Names */
static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
{

215
examples/cc3000/board.h
View File

@ -1,31 +1,36 @@
/****************************************************************************
*
* This file is part of the ArduinoCC3000 library.
* This file is part of the ArduinoCC3000 library.
* Version 1.0.1b
*
* Copyright (C) 2013 Chris Magagna - cmagagna@yahoo.com
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* Don't sue me if my code blows up your board and burns down your house
*
* This file is the main module for the Arduino CC3000 library.
* Your program must call CC3000_Init() before any other API calls.
*
****************************************************************************/
* Version 1.0.1b
*
* Copyright (C) 2013 Chris Magagna - cmagagna@yahoo.com
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* Don't sue me if my code blows up your board and burns down your house
*
* This file is the main module for the Arduino CC3000 library.
* Your program must call CC3000_Init() before any other API calls.
*
****************************************************************************/
/*
Some things are different for the Teensy 3.0, so set a flag if we're using
that hardware.
*/
/****************************************************************************
* Included Files
****************************************************************************/
#include <stdint.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Some things are different for the Teensy 3.0, so set a flag if we're using
* that hardware.
*/
#if defined(__arm__) && defined(CORE_TEENSY) && defined(__MK20DX128__)
#define TEENSY3 1
# define TEENSY3 1
#endif
/* I used the Teensy 3.0 to get the Arduino CC3000 library working but the
@ -35,9 +40,9 @@
your wiring is OK then try changing this. */
#ifdef TEENSY3
#define USE_HARDWARE_SPI false
#define USE_HARDWARE_SPI false
#else
#define USE_HARDWARE_SPI true
#define USE_HARDWARE_SPI true
#endif
// These are the Arduino pins that connect to the CC3000
@ -48,102 +53,114 @@
#ifndef TEENSY3
#define WLAN_CS 10 // Arduino pin connected to CC3000 WLAN_SPI_CS
#define WLAN_EN 9 // Arduino pin connected to CC3000 VBAT_SW_EN
#define WLAN_IRQ 3 // Arduino pin connected to CC3000 WLAN_SPI_IRQ
#define WLAN_IRQ_INTNUM 1 // The attachInterrupt() number that corresponds
// to WLAN_IRQ
#define WLAN_MOSI MOSI
#define WLAN_MISO MISO
#define WLAN_SCK SCK
#define WLAN_CS 10 // Arduino pin connected to CC3000 WLAN_SPI_CS
#define WLAN_EN 9 // Arduino pin connected to CC3000 VBAT_SW_EN
#define WLAN_IRQ 3 // Arduino pin connected to CC3000 WLAN_SPI_IRQ
#define WLAN_IRQ_INTNUM 1 // The attachInterrupt() number that corresponds
// to WLAN_IRQ
#define WLAN_MOSI MOSI
#define WLAN_MISO MISO
#define WLAN_SCK SCK
#else
#define WLAN_CS 25
#define WLAN_MISO 26
#define WLAN_IRQ 27
#define WLAN_IRQ_INTNUM 27 // On the Teensy 3.0 the interrupt # is the same as the pin #
#define WLAN_MOSI 28
#define WLAN_SCK 29
#define WLAN_EN 30
#define WLAN_CS 25
#define WLAN_MISO 26
#define WLAN_IRQ 27
#define WLAN_IRQ_INTNUM 27 // On the Teensy 3.0 the interrupt # is the same as the pin #
#define WLAN_MOSI 28
#define WLAN_SCK 29
#define WLAN_EN 30
#endif
/*
The timing between setting the CS pin and reading the IRQ pin is very
tight on the CC3000, and sometimes the default Arduino digitalRead()
and digitalWrite() functions are just too slow.
For many of the CC3000 library functions this isn't a big deal because the
IRQ pin is tied to an interrupt routine but some of them of them disable
the interrupt routine and read the pins directly. Because digitalRead()
/ Write() are so slow once in a while the Arduino will be in the middle of
its pin code and the CC3000 will flip another pin's state and it will be
missed, and everything locks up.
The upshot of all of this is we need to read & write the pin states
directly, which is very fast compared to the built in Arduino functions.
The Teensy 3.0's library has built in macros called digitalReadFast()
& digitalWriteFast() that compile down to direct port manipulations but
are still readable, so use those if possible.
There's a digitalReadFast() / digitalWriteFast() library for Arduino but
it looks like it hasn't been updated since 2010 so I think it's best to
just use the direct port manipulations.
*/
/* The timing between setting the CS pin and reading the IRQ pin is very
* tight on the CC3000, and sometimes the default Arduino digitalRead()
* and digitalWrite() functions are just too slow.
*
* For many of the CC3000 library functions this isn't a big deal because the
* IRQ pin is tied to an interrupt routine but some of them of them disable
* the interrupt routine and read the pins directly. Because digitalRead()
* / Write() are so slow once in a while the Arduino will be in the middle of
* its pin code and the CC3000 will flip another pin's state and it will be
* missed, and everything locks up.
*
* The upshot of all of this is we need to read & write the pin states
* directly, which is very fast compared to the built in Arduino functions.
*
* The Teensy 3.0's library has built in macros called digitalReadFast()
* & digitalWriteFast() that compile down to direct port manipulations but
* are still readable, so use those if possible.
*
* There's a digitalReadFast() / digitalWriteFast() library for Arduino but
* it looks like it hasn't been updated since 2010 so I think it's best to
* just use the direct port manipulations.
*/
#ifdef TEENSY3
#define Read_CC3000_IRQ_Pin() digitalReadFast(WLAN_IRQ)
#define Set_CC3000_CS_NotActive() digitalWriteFast(WLAN_CS, HIGH)
#define Set_CC3000_CS_Active() digitalWriteFast(WLAN_CS, LOW)
#define Read_CC3000_IRQ_Pin() digitalReadFast(WLAN_IRQ)
#define Set_CC3000_CS_NotActive() digitalWriteFast(WLAN_CS, HIGH)
#define Set_CC3000_CS_Active() digitalWriteFast(WLAN_CS, LOW)
#else
// This is hardcoded for an ATMega328 and pin 3. You will need to change this
// for other MCUs or pins
#define Read_CC3000_IRQ_Pin() ((PIND & B00001000) ? 1 : 0)
#define Read_CC3000_IRQ_Pin() ((PIND & B00001000) ? 1 : 0)
// This is hardcoded for an ATMega328 and pin 10. You will need to change this
// for other MCUs or pins
#define Set_CC3000_CS_NotActive() PORTB |= B00000100
#define Set_CC3000_CS_Active() PORTB &= B11111011
#define Set_CC3000_CS_NotActive() PORTB |= B00000100
#define Set_CC3000_CS_Active() PORTB &= B11111011
#endif
#define MAC_ADDR_LEN 6
#define DISABLE (0)
#define ENABLE (1)
#define MAC_ADDR_LEN 6
#define DISABLE (0)
#define ENABLE (1)
//AES key "smartconfigAES16"
//const uint8_t smartconfigkey[] = {0x73,0x6d,0x61,0x72,0x74,0x63,0x6f,0x6e,0x66,0x69,0x67,0x41,0x45,0x53,0x31,0x36};
/****************************************************************************
* Public Data
****************************************************************************/
#if 0
/* AES key "smartconfigAES16" */
const uint8_t smartconfigkey[] =
{
0x73, 0x6d, 0x61, 0x72, 0x74, 0x63, 0x6f, 0x6e,
0x66, 0x69, 0x67, 0x41, 0x45, 0x53, 0x31, 0x36
};
#endif
/* If you uncomment the line below the library will leave out a lot of the
higher level functions but use a lot less memory. From:
* higher level functions but use a lot less memory. From:
*
* http://processors.wiki.ti.com/index.php/Tiny_Driver_Support
*
* CC3000's new driver has flexible memory compile options.
*
* This feature comes in handy when we want to use a limited RAM size MCU.
*
* Using The Tiny Driver Compilation option will create a tiny version of our
* host driver with lower data, stack and code consumption.
*
* By enabling this feature, host driver's RAM consumption can be reduced to
* minimum of 251 bytes.
*
* The Tiny host driver version will limit the host driver API to the most
* essential ones.
*
* Code size depends on actual APIs used.
*
* RAM size depends on the largest packet sent and received.
*
* CC3000 can now be used with ultra low cost MCUs, consuming 251 byte of RAM
* and 2K to 6K byte of code size, depending on the API usage.
*/
http://processors.wiki.ti.com/index.php/Tiny_Driver_Support
CC3000's new driver has flexible memory compile options.
This feature comes in handy when we want to use a limited RAM size MCU.
Using The Tiny Driver Compilation option will create a tiny version of our
host driver with lower data, stack and code consumption.
By enabling this feature, host driver's RAM consumption can be reduced to
minimum of 251 bytes.
The Tiny host driver version will limit the host driver API to the most
essential ones.
Code size depends on actual APIs used.
RAM size depends on the largest packet sent and received.
CC3000 can now be used with ultra low cost MCUs, consuming 251 byte of RAM
and 2K to 6K byte of code size, depending on the API usage. */
//#define CC3000_TINY_DRIVER 1
//#define CC3000_TINY_DRIVER 1
extern uint8_t asyncNotificationWaiting;
extern long lastAsyncEvent;
@ -155,4 +172,8 @@ extern volatile unsigned long OkToDoShutDown;
extern volatile unsigned long ulCC3000DHCP_configured;
extern volatile uint8_t ucStopSmartConfig;
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
void CC3000_Init(void);

4
examples/djoystick/djoy_main.c
View File

@ -95,7 +95,7 @@ static djoy_buttonset_t g_djoylast;
static const char *g_djoynames[DJOY_NDISCRETES] =
{
"UP", "DOWN", "LEFT", "RIGHT", "SELECT", "FIRE", "JUMP", "RUN"
"UP", "DOWN", "LEFT", "RIGHT", "SELECT", "FIRE", "JUMP", "RUN"
};
/****************************************************************************
@ -240,7 +240,7 @@ int djoy_main(int argc, char *argv[])
(long)nread, sizeof(djoy_buttonset_t));
goto errout_with_fd;
}
/* Show the set of joystick discretes that we just read */
printf("Read set\n");

4
examples/elf/tests/errno/errno.c
View File

@ -68,7 +68,7 @@ int main(int argc, char **argv)
if (test_stream)
{
fprintf(stderr, "Hmm... Delete \"%s\" and try this again\n",
g_nonexistent);
g_nonexistent);
exit(1);
}
@ -77,7 +77,7 @@ int main(int argc, char **argv)
*/
fprintf(stderr, "We failed to open \"%s!\" errno is %d\n",
g_nonexistent, errno);
g_nonexistent, errno);
return 0;
}

2
examples/elf/tests/task/task.c
View File

@ -67,7 +67,7 @@ static char no_name[] = "<noname>";
* a relocation type that is not supported by ELF is generated by GCC.
*/
int child_task(int argc, char **argv)
int child_task(int argc, char **argv)
{
printf("Child: execv was successful!\n");
printf("Child: argc=%d\n", argc);

2
examples/ftpc/ftpc_cmds.c
View File

@ -243,7 +243,7 @@ int cmd_rhelp(SESSION handle, int argc, char **argv)
free(msg);
}
return ret;
return ret;
}
/****************************************************************************

2
examples/ltdc/ltdc.h
View File

@ -112,7 +112,7 @@ static const uint32_t g_rgb16[LTDC_EXAMPLE_NCOLORS] =
/****************************************************************************
* Public Functions
****************************************************************************/
****************************************************************************/
void ltdc_clrcolor(uint8_t *color, uint8_t value, size_t size);
int ltdc_cmpcolor(uint8_t *color1, uint8_t *color2, size_t size);

2
examples/nettest/nettest.c
View File

@ -213,7 +213,7 @@ int nettest_main(int argc, char *argv[])
#ifdef CONFIG_EXAMPLES_NETTEST_INIT
/* Initialize the network */
netest_initialize();
netest_initialize();
#endif
#if defined(CONFIG_EXAMPLES_NETTEST_LOOPBACK)

4
examples/nxflat/tests/errno/errno.c
View File

@ -68,7 +68,7 @@ int main(int argc, char **argv)
if (test_stream)
{
fprintf(stderr, "Hmm... Delete \"%s\" and try this again\n",
g_nonexistent);
g_nonexistent);
exit(1);
}
@ -77,7 +77,7 @@ int main(int argc, char **argv)
*/
fprintf(stderr, "We failed to open \"%s!\" errno is %d\n",
g_nonexistent, errno);
g_nonexistent, errno);
return 0;
}

12
examples/nxflat/tests/hello/hello.c
View File

@ -63,13 +63,13 @@ int main(int argc, char **argv)
{
printf("argv[%d]\t= ", i);
if (argv[i])
{
printf("(0x%p) \"%s\"\n", argv[i], argv[i]);
}
{
printf("(0x%p) \"%s\"\n", argv[i], argv[i]);
}
else
{
printf("NULL?\n");
}
{
printf("NULL?\n");
}
}
printf("argv[%d]\t= 0x%p\n", argc, argv[argc]);

2
examples/nxflat/tests/task/task.c
View File

@ -67,7 +67,7 @@ static char no_name[] = "<noname>";
* a relocation type that is not supported by NXFLAT is generated by GCC.
*/
int child_task(int argc, char **argv)
int child_task(int argc, char **argv)
{
printf("Child: execv was successful!\n");
printf("Child: argc=%d\n", argc);

2
examples/nxhello/nxhello_bkgd.c
View File

@ -327,7 +327,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height,
#endif
}
/****************************************************************************
/****************************************************************************
* Public Functions
****************************************************************************/

2
examples/nximage/nximage_bitmap.c
View File

@ -1074,7 +1074,7 @@ static const struct pix_run_s g_nuttx[] =
{ 75, 0}, { 1, 5}, { 2, 4}, { 1, 3}, { 1, 163}, { 1, 6}, { 1, 4}, { 1, 5}, /* Row 158 */
{ 77, 0},
{ 76, 0}, { 1, 5}, { 4, 4}, { 1, 5}, { 78, 0} /* Row 159 */
};
};
#elif CONFIG_EXAMPLES_NXIMAGE_BPP == 16

2
examples/nxlines/nxlines_bkgd.c
View File

@ -197,7 +197,7 @@ static void nxlines_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
}
#endif
/****************************************************************************
/****************************************************************************
* Public Functions
****************************************************************************/

6
examples/ostest/sigprocmask.c
View File

@ -126,7 +126,7 @@ void sigprocmask_test(void)
printf("sigprocmask_test: ERROR sigprocmask failed: %d\n", errcode);
goto errout_with_mask;
}
/* It should be the same as newmask */
if (memcmp(&currmask, &newmask, sizeof(sigset_t)) != 0)
@ -185,7 +185,7 @@ void sigprocmask_test(void)
printf("sigprocmask_test: ERROR sigprocmask failed: %d\n", errcode);
goto errout_with_mask;
}
/* It should be the same as newmask */
if (memcmp(&currmask, &newmask, sizeof(sigset_t)) != 0)
@ -193,7 +193,7 @@ void sigprocmask_test(void)
printf("sigprocmask_test: ERROR unexpected sigprocmask\n");
goto errout_with_mask;
}
ret = sigprocmask(SIG_SETMASK, &saved, NULL);
if (ret != OK)
{

4
examples/pashello/hello.h
View File

@ -1,4 +1,5 @@
unsigned char hello_pex[] = {
unsigned char hello_pex[] =
{
0x50, 0x4f, 0x46, 0x46, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x05,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00,
@ -20,4 +21,5 @@ unsigned char hello_pex[] = {
0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x6e, 0x6f, 0x00, 0x2e, 0x73, 0x74, 0x72,
0x74, 0x61, 0x62, 0x00
};
unsigned int hello_pex_len = 232;

6
examples/pwm/pwm_main.c
View File

@ -388,9 +388,9 @@ int pwm_main(int argc, char *argv[])
}
}
close(fd);
fflush(stdout);
return OK;
close(fd);
fflush(stdout);
return OK;
errout_with_dev:
close(fd);

2
examples/relays/relays_main.c
View File

@ -61,7 +61,7 @@
# define CONFIG_EXAMPLES_RELAYS_NRELAYS 2
#endif
/****************************************************************************
/****************************************************************************
* Private Types
****************************************************************************/

4
examples/romfs/romfs_testdir.h
View File

@ -1,4 +1,5 @@
unsigned char testdir_img[] = {
unsigned char testdir_img[] =
{
0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x02, 0x60,
0x27, 0x43, 0x4a, 0x8a, 0x52, 0x4f, 0x4d, 0x46, 0x53, 0x5f, 0x54, 0x65,
0x73, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
@ -86,4 +87,5 @@ unsigned char testdir_img[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
};
unsigned int testdir_img_len = 1024;

6
examples/watchdog/watchdog_main.c
View File

@ -354,9 +354,9 @@ int wdog_main(int argc, char *argv[])
goto errout_with_dev;
}
close(fd);
fflush(stdout);
return OK;
close(fd);
fflush(stdout);
return OK;
errout_with_dev:
close(fd);

6
graphics/tiff/tiff_initialize.c
View File

@ -321,10 +321,10 @@ static inline int tiff_putheader(FAR struct tiff_info_s *info)
return ret;
}
/* Two pad bytes following the header */
/* Two pad bytes following the header */
ret = tiff_putint16(info->outfd, 0);
return ret;
ret = tiff_putint16(info->outfd, 0);
return ret;
}
/****************************************************************************

13
graphics/tiff/tiff_internal.h
View File

@ -114,7 +114,7 @@ extern "C"
*
****************************************************************************/
EXTERN ssize_t tiff_read(int fd, FAR void *buffer, size_t count);
ssize_t tiff_read(int fd, FAR void *buffer, size_t count);
/****************************************************************************
* Name: tiff_write
@ -132,7 +132,7 @@ EXTERN ssize_t tiff_read(int fd, FAR void *buffer, size_t count);
*
****************************************************************************/
EXTERN int tiff_write(int fd, FAR const void *buffer, size_t count);
int tiff_write(int fd, FAR const void *buffer, size_t count);
/****************************************************************************
* Name: tiff_putint16
@ -149,7 +149,7 @@ EXTERN int tiff_write(int fd, FAR const void *buffer, size_t count);
*
****************************************************************************/
EXTERN int tiff_putint16(int fd, uint16_t value);
int tiff_putint16(int fd, uint16_t value);
/****************************************************************************
* Name: tiff_putint32
@ -166,7 +166,7 @@ EXTERN int tiff_putint16(int fd, uint16_t value);
*
****************************************************************************/
EXTERN int tiff_putint32(int fd, uint32_t value);
int tiff_putint32(int fd, uint32_t value);
/****************************************************************************
* Name: tiff_putstring
@ -184,7 +184,7 @@ EXTERN int tiff_putint32(int fd, uint32_t value);
*
****************************************************************************/
EXTERN int tiff_putstring(int fd, FAR const char *string, int len);
int tiff_putstring(int fd, FAR const char *string, int len);
/****************************************************************************
* Name: tiff_wordalign
@ -201,7 +201,7 @@ EXTERN int tiff_putstring(int fd, FAR const char *string, int len);
*
****************************************************************************/
EXTERN ssize_t tiff_wordalign(int fd, size_t size);
ssize_t tiff_wordalign(int fd, size_t size);
#undef EXTERN
#if defined(__cplusplus)
@ -209,4 +209,3 @@ EXTERN ssize_t tiff_wordalign(int fd, size_t size);
#endif
#endif /* __APPS_GRAPHICS_TIFF_TIFF_INTERNAL_H */

4
graphics/traveler/src/trv_graphicfile.c
View File

@ -83,7 +83,7 @@ FAR struct trv_graphicfile_s *tvr_graphicfile_read(char *filename)
* REVISIT: Here would be the place where we would decide on the format of
* the graphic file. Here we just assume that the file is PCX.
*/
gfile = trv_load_pcx(fp, filename);
if (gfile == NULL)
{
@ -123,7 +123,7 @@ FAR struct trv_graphicfile_s *trv_graphicfile_new(void)
* Description:
* Free the graphic file structure after also freeing in additional
* resources attached to the structure.
****************************************************************************/
void trv_graphicfile_free(FAR struct trv_graphicfile_s *gfile)

2
graphics/traveler/src/trv_main.c
View File

@ -283,7 +283,7 @@ int traveler_main(int argc, char *argv[])
switch (*ptr)
{
case 'p' :
wldpath = ptr++;
wldpath = ptr++;
break;
default:

46
graphics/traveler/src/trv_rayrend.c
View File

@ -210,7 +210,7 @@ static void trv_rend_zcell(uint8_t row, uint8_t col, uint8_t height, uint8_t wid
endcol = col + width;
endrow = row + height;
/* Calculate the horizontal interpolation values */
/* This is the H starting position (first row, first column) */
@ -221,7 +221,7 @@ static void trv_rend_zcell(uint8_t row, uint8_t col, uint8_t height, uint8_t wid
hcolstep =
TDIV((g_ray_hit[row][endcol].xpos - g_ray_hit[row][col].xpos),
width, scale);
/* This is the change in xpos per column in the last row */
tmpcolstep =
@ -264,7 +264,7 @@ static void trv_rend_zcell(uint8_t row, uint8_t col, uint8_t height, uint8_t wid
vrowstep =
TDIV((g_ray_hit[endrow][col].ypos - g_ray_hit[row][col].ypos),
height, scale);
/* Determine the palette mapping table zone for each row */
if (IS_SHADED(g_ray_hit[row][col].rect))
@ -386,7 +386,7 @@ static void trv_rend_zrow(uint8_t row, uint8_t col, uint8_t width)
{
palptr = GET_PALPTR(0);
}
/* Within this function, all references to width are really
* (width-1)
*/
@ -396,7 +396,7 @@ static void trv_rend_zrow(uint8_t row, uint8_t col, uint8_t width)
/* Get the index to the right side */
endcol = col + width;
/* Calculate the horizontal interpolation values */
/* This is the H starting position (first column) */
@ -407,18 +407,18 @@ static void trv_rend_zrow(uint8_t row, uint8_t col, uint8_t width)
hcolstep =
TDIV((g_ray_hit[row][endcol].xpos - g_ray_hit[row][col].xpos),
width, scale);
/* Calculate the vertical interpolation values */
/* This is the V starting position (first column) */
ypos.w = TALIGN(g_ray_hit[row][col].ypos, scale);
/* This is the change in ypos per column */
vcolstep =
TDIV((g_ray_hit[row][endcol].ypos - g_ray_hit[row][col].ypos),
width, scale);
/* Interpolate to texture each column in the row */
for (j = col; j <= endcol; j++)
@ -443,7 +443,7 @@ static void trv_rend_zcol(uint8_t row, uint8_t col, uint8_t height)
uint8_t i, endrow;
FAR uint8_t *palptr;
FAR uint8_t *outpixel;
uint8_t scale;
uint8_t scale;
FAR trv_pixel_t *texture;
FAR struct trv_bitmap_s *bmp;
union tex_ndx_u xpos;
@ -493,7 +493,7 @@ static void trv_rend_zcol(uint8_t row, uint8_t col, uint8_t height)
{
palptr = GET_PALPTR(0);
}
/* Within this function, all references to height are really
* (height-1)
*/
@ -519,13 +519,13 @@ static void trv_rend_zcol(uint8_t row, uint8_t col, uint8_t height)
/* This is the V starting position (first row) */
ypos.w = TALIGN(g_ray_hit[row][col].ypos, scale);
/* This is the change in ypos for each row */
vrowstep =
TDIV((g_ray_hit[endrow][col].ypos - g_ray_hit[row][col].ypos),
height, scale);
/* Now, interpolate to texture each row (vertical component) */
for (i = row; i <= endrow; i++)
@ -678,7 +678,7 @@ static void trv_rend_wall(uint8_t row, uint8_t col,
{
palptr = GET_PALPTR(0);
}
/* Within this function, all references to height and width are really
* (height-1) and (width-1)
*/
@ -701,12 +701,12 @@ static void trv_rend_wall(uint8_t row, uint8_t col,
hcolstep =
TDIV((g_ray_hit[row][endcol].xpos - g_ray_hit[row][col].xpos),
width, scale);
/* Calculate the vertical interpolation values */
/* This is the V starting position (first row, first column) */
vstart = TALIGN(g_ray_hit[row][col].ypos, scale);
/* This is the change in ypos per column in the first row */
vcolstep =
@ -728,7 +728,7 @@ static void trv_rend_wall(uint8_t row, uint8_t col,
vrowstep =
TDIV((g_ray_hit[endrow][col].ypos - g_ray_hit[row][col].ypos),
height, scale);
/* Now, interpolate to texture each row (vertical component) */
for (i = row; i <= endrow; i++)
@ -855,7 +855,7 @@ static void trv_rend_wallrow(uint8_t row, uint8_t col, uint8_t width)
{
palptr = GET_PALPTR(0);
}
/* Within this function, all references to width are really
* (width-1)
*/
@ -865,7 +865,7 @@ static void trv_rend_wallrow(uint8_t row, uint8_t col, uint8_t width)
/* Get the index to the right side */
endcol = col + width;
/* Calculate the horizontal interpolation values */
/* This is the H starting position (first column) */
@ -881,13 +881,13 @@ static void trv_rend_wallrow(uint8_t row, uint8_t col, uint8_t width)
/* This is the V starting position (first column) */
ypos.w = TALIGN(g_ray_hit[row][col].ypos, scale);
/* This is the change in ypos per column */
vcolstep =
TDIV((g_ray_hit[row][endcol].ypos - g_ray_hit[row][col].ypos),
width, scale);
/* Interpolate to texture each column in the row */
for (j = col; j <= endcol; j++)
@ -895,7 +895,7 @@ static void trv_rend_wallrow(uint8_t row, uint8_t col, uint8_t width)
/* Extract the pixel from the texture */
inpixel = texture[TNDX(xpos.s.i, ypos.s.i, tsize, tmask)];
/* If this is an INVISIBLE_PIXEL in a TRANSPARENT_WALL, then
* we will have to take some pretty extreme measures to get the
* correct value of the pixel
@ -991,7 +991,7 @@ static void trv_rend_wallcol(uint8_t row, uint8_t col, uint8_t height)
{
palptr = GET_PALPTR(0);
}
/* Within this function, all references to height are really
* (height-1)
*/
@ -1010,7 +1010,7 @@ static void trv_rend_wallcol(uint8_t row, uint8_t col, uint8_t height)
/* This is the V starting position (first row, first column) */
ypos.w = TALIGN(g_ray_hit[row][col].ypos, scale);
/* This is the change in ypos for each row */
vrowstep =

4
graphics/traveler/src/trv_texturefile.c
View File

@ -140,7 +140,7 @@ trv_new_texture(uint16_t width, uint16_t height)
bitmap->w = width;
bitmap->h = height;
bitmap->log2h = log2h;
return bitmap;
}
@ -162,7 +162,7 @@ static void trv_quantize_texture(FAR struct trv_graphicfile_s *gfile,
for (y = gfile->height - 1; y >= 0; y--)
{
pixel = trv_graphicfile_pixel(gfile, x, y);
*destpixel++ = trv_color_rgb2pixel(&pixel);
*destpixel++ = trv_color_rgb2pixel(&pixel);
}
}
}

2
graphics/traveler/src/trv_world.c
View File

@ -449,7 +449,7 @@ int trv_world_create(FAR const char *wldpath, FAR const char *wldfile)
if (!inihandle)
{
fprintf(stderr, "ERROR: Could not open INI file=\"%s/%s\"\n",
wldpath, wldfile);
wldpath, wldfile);
return -ENOENT;
}

2
graphics/traveler/tools/misc/mktrig.c
View File

@ -132,7 +132,7 @@ int main(int argc, char **argv, char **envp)
value16 = (uint16_t)((long)(valuef));
fprintf(outfile, "0x%04x", (unsigned int)value16);
i++;
j++;
if ((j < 8) && (i < 2400))

6
graphics/traveler/tools/misc/pll2txt.c
View File

@ -106,9 +106,9 @@ int main(int argc, char **argv, char **envp)
FILE *instream;
FILE *outstream = stdout;
while ((option = getopt(argc, argv, "ho:")) != EOF)
{
switch (option)
while ((option = getopt(argc, argv, "ho:")) != EOF)
{
switch (option)
{
case 'h' :
b_use_hex = true;

6
graphics/traveler/tools/misc/txt2pll.c
View File

@ -257,11 +257,11 @@ int main(int argc, char **argv, char** envp)
/* Write header information */
if (fwrite((char*)&header, SIZEOF_TRVPLANEFILEHEADER_T, 1, outstream) != 1)
{
if (fwrite((char*)&header, SIZEOF_TRVPLANEFILEHEADER_T, 1, outstream) != 1)
{
fprintf(stderr, "Failed to write file header\n");
return EXIT_FAILURE;
}
}
/* Read X Planes */

7
include/modbus/mb.h
View File

@ -237,6 +237,7 @@ eMBErrorCode eMBDisable(void);
* returns eMBErrorCode::MB_EILLSTATE. Otherwise it returns
* eMBErrorCode::MB_ENOERR.
*/
eMBErrorCode eMBPoll(void);
/* Configure the slave id of the device.
@ -258,6 +259,7 @@ eMBErrorCode eMBPoll(void);
* is too small it returns eMBErrorCode::MB_ENORES. Otherwise
* it returns eMBErrorCode::MB_ENOERR.
*/
eMBErrorCode eMBSetSlaveID(uint8_t ucSlaveID, bool xIsRunning,
uint8_t const *pucAdditional,
uint16_t usAdditionalLen);
@ -283,6 +285,7 @@ eMBErrorCode eMBSetSlaveID(uint8_t ucSlaveID, bool xIsRunning,
* case the values in config.h should be adjusted. If the argument was not
* valid it returns eMBErrorCode::MB_EINVAL.
*/
eMBErrorCode eMBRegisterCB(uint8_t ucFunctionCode,
pxMBFunctionHandler pxHandler);
@ -326,6 +329,7 @@ eMBErrorCode eMBRegisterCB(uint8_t ucFunctionCode,
* - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
* a SLAVE DEVICE FAILURE exception is sent as a response.
*/
eMBErrorCode eMBRegInputCB(uint8_t * pucRegBuffer, uint16_t usAddress,
uint16_t usNRegs);
@ -361,6 +365,7 @@ eMBErrorCode eMBRegInputCB(uint8_t * pucRegBuffer, uint16_t usAddress,
* - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
* a SLAVE DEVICE FAILURE exception is sent as a response.
*/
eMBErrorCode eMBRegHoldingCB(uint8_t * pucRegBuffer, uint16_t usAddress,
uint16_t usNRegs, eMBRegisterMode eMode);
@ -397,6 +402,7 @@ eMBErrorCode eMBRegHoldingCB(uint8_t * pucRegBuffer, uint16_t usAddress,
* - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
* a SLAVE DEVICE FAILURE exception is sent as a response.
*/
eMBErrorCode eMBRegCoilsCB(uint8_t *pucRegBuffer, uint16_t usAddress,
uint16_t usNCoils, eMBRegisterMode eMode);
@ -428,6 +434,7 @@ eMBErrorCode eMBRegCoilsCB(uint8_t *pucRegBuffer, uint16_t usAddress,
* - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
* a SLAVE DEVICE FAILURE exception is sent as a response.
*/
eMBErrorCode eMBRegDiscreteCB(uint8_t *pucRegBuffer, uint16_t usAddress,
uint16_t usNDiscrete);

2
interpreters/bas/bas_fs.c
View File

@ -1671,7 +1671,7 @@ long int FS_lof(int chn)
return -1;
}
return (long int)(endpos / g_file[chn]->recLength);
return (long int)(endpos / g_file[chn]->recLength);
}
long int FS_recLength(int chn)

17
interpreters/bas/bas_token.c
View File

@ -3622,10 +3622,11 @@ YY_RULE_SETUP
#line 1171 "bas_token.l"
{
if (cur)
{
cur->statement=stmt_QUOTE_REM;
strcpy(cur->u.rem=malloc(strlen(yytext+1)+1),yytext+1);
}
{
cur->statement=stmt_QUOTE_REM;
strcpy(cur->u.rem=malloc(strlen(yytext+1)+1),yytext+1);
}
return T_QUOTE;
}
YY_BREAK
@ -4240,8 +4241,8 @@ static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file)
* In that case, we don't want to reset the lineno or column.
*/
if (b != YY_CURRENT_BUFFER)
{
if (b != YY_CURRENT_BUFFER)
{
b->yy_bs_lineno = 1;
b->yy_bs_column = 0;
}
@ -4352,9 +4353,9 @@ static void yyensure_buffer_stack (void)
(num_to_alloc * sizeof(struct yy_buffer_state*));
if (! (yy_buffer_stack))
YY_FATAL_ERROR("out of dynamic memory in yyensure_buffer_stack()");
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
(yy_buffer_stack_max) = num_to_alloc;
(yy_buffer_stack_top) = 0;
return;

46
interpreters/ficl/src/nuttx.c
View File

@ -22,44 +22,50 @@ void ficlFree(void *p)
free(p);
}
void ficlCallbackDefaultTextOut(ficlCallback *callback, char *message)
void ficlCallbackDefaultTextOut(ficlCallback *callback, char *message)
{
FICL_IGNORE(callback);
if (message != NULL)
{
fputs(message, stdout);
}
else
{
fflush(stdout);
return;
}
}
int ficlFileStatus(char *filename, int *status)
{
struct stat statbuf;
if (stat(filename, &statbuf) == 0)
struct stat statbuf;
if (stat(filename, &statbuf) == 0)
{
*status = statbuf.st_mode;
return 0;
*status = statbuf.st_mode;
return 0;
}
*status = ENOENT;
return -1;
*status = ENOENT;
return -1;
}
long ficlFileSize(ficlFile *ff)
{
struct stat statbuf;
if (ff == NULL)
return -1;
statbuf.st_size = -1;
if (fstat(fileno(ff->f), &statbuf) != 0)
return -1;
return statbuf.st_size;
struct stat statbuf;
if (ff == NULL)
{
return -1;
}
statbuf.st_size = -1;
if (fstat(fileno(ff->f), &statbuf) != 0)
{
return -1;
}
return statbuf.st_size;
}
void ficlSystemCompilePlatform(ficlSystem *system)
{
return;
return;
}

2
modbus/rtu/mbrtu.c
View File

@ -230,7 +230,7 @@ eMBErrorCode eMBRTUSend(uint8_t ucSlaveAddress, const uint8_t *pucFrame, uint16_
usSndBufferCount += usLength;
/* Calculate CRC16 checksum for Modbus-Serial-Line-PDU. */
usCRC16 = usMBCRC16((uint8_t *) pucSndBufferCur, usSndBufferCount);
ucRTUBuf[usSndBufferCount++] = (uint8_t)(usCRC16 & 0xFF);
ucRTUBuf[usSndBufferCount++] = (uint8_t)(usCRC16 >> 8);

2
modbus/tcp/mbtcp.c
View File

@ -89,7 +89,7 @@ eMBErrorCode eMBTCPDoInit(uint16_t ucTCPPort)
{
eStatus = MB_EPORTERR;
}
return eStatus;
}

4
netutils/ftpc/ftpc_transfer.c
View File

@ -322,9 +322,9 @@ int ftpc_xfrinit(FAR struct ftpc_session_s *session)
}
return OK;
errout_with_data:
errout_with_data:
ftpc_sockclose(&session->data);
errout:
errout:
return ERROR;
}

4
netutils/ftpd/ftpd.c
View File

@ -1871,7 +1871,7 @@ static int ftpd_stream(FAR struct ftpd_session_s *session, int cmdtype)
goto errout_with_session;
}
for (;;)
for (;;)
{
/* Read from the source (file or TCP connection) */
@ -4042,7 +4042,7 @@ static FAR void *ftpd_worker(FAR void *arg)
/* Then loop processing FTP commands */
for (;;)
for (;;)
{
/* Receive the next command */

2
netutils/pppd/ppp.c
View File

@ -418,7 +418,7 @@ void ppp_upcall(struct ppp_context_s *ctx, u16_t protocol, u8_t *buffer, u16_t l
* length of the codespace
*
****************************************************************************/
u16_t scan_packet(struct ppp_context_s *ctx, u16_t protocol, const u8_t *list,
u8_t *buffer, u8_t *options, u16_t len)
{

10
nshlib/nsh_fscmds.c
View File

@ -129,14 +129,14 @@ static char g_iobuffer[IOBUFFERSIZE];
#if !defined(CONFIG_NSH_DISABLE_CP) || defined(CONFIG_NSH_FULLPATH)
static void trim_dir(char *arg)
{
/* Skip any trailing '/' characters (unless it is also the leading '/') */
/* Skip any trailing '/' characters (unless it is also the leading '/') */
int len = strlen(arg) - 1;
while (len > 0 && arg[len] == '/')
{
int len = strlen(arg) - 1;
while (len > 0 && arg[len] == '/')
{
arg[len] = '\0';
len--;
}
}
}
#endif

10
nshlib/nsh_netcmds.c
View File

@ -855,11 +855,11 @@ static int nsh_gethostip(FAR char *hostname, FAR union ip_addr_u *ipaddr,
}
#endif
/* The inet_pton() function returns 1 if the conversion succeeds. It will
* return 0 if the input is not a valid IPv4 dotted-decimal string or a
* valid IPv6 address string, or -1 with errno set to EAFNOSUPPORT if
* the address family argument is unsupported.
*/
/* The inet_pton() function returns 1 if the conversion succeeds. It will
* return 0 if the input is not a valid IPv4 dotted-decimal string or a
* valid IPv6 address string, or -1 with errno set to EAFNOSUPPORT if
* the address family argument is unsupported.
*/
return (ret > 0) ? OK : ERROR;

21
nshlib/nsh_timcmds.c
View File

@ -328,17 +328,18 @@ int cmd_date(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
goto errout;
}
/* Display or set the time */
/* Display or set the time */
if (newtime)
{
ret = date_settime(vtbl, argv[0], newtime);
}
else
{
ret = date_showtime(vtbl, argv[0]);
}
return ret;
if (newtime)
{
ret = date_settime(vtbl, argv[0], newtime);
}
else
{
ret = date_showtime(vtbl, argv[0]);
}
return ret;
errout:
nsh_output(vtbl, errfmt, argv[0]);

2
nshlib/nsh_usbconsole.c
View File

@ -63,7 +63,7 @@
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
/****************************************************************************
* Private Types
****************************************************************************/

2
nshlib/nsh_usbkeyboard.c
View File

@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
/****************************************************************************
* Private Types
****************************************************************************/

2
system/cu/cu_main.c
View File

@ -223,7 +223,7 @@ static void print_help(void)
" -s: Use given speed (default %d)\n"
" -r: Disable RTS/CTS flow control (default: on)\n"
" -?: This help\n",
CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE,
CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE,
CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD);
}

2
system/netdb/netdb_main.c
View File

@ -90,7 +90,7 @@ static void show_usage(FAR const char *progname, int exitcode)
exit(exitcode);
}
/****************************************************************************
/****************************************************************************
* Public Functions
****************************************************************************/

2
system/zmodem/zm_send.c
View File

@ -1716,7 +1716,7 @@ int zms_send(ZMSHANDLE handle, FAR const char *filename,
* irrecoverable error is detected or until the file is sent correctly.
*/
return zm_datapump(&pzms->cmn);
return zm_datapump(&pzms->cmn);
}
/****************************************************************************