boards: mips: nxstyle fixes

Fixes to pass CI

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
This commit is contained in:
Alin Jerpelea 2021-03-16 21:32:54 +01:00 committed by Xiang Xiao
parent 9ced5cae84
commit b5ea69ee78
25 changed files with 163 additions and 109 deletions

View File

@ -43,9 +43,9 @@
/* PLL Settings
*
* SYNR register controls the multiplication factor of the PLL.
* If the PLL is on, the count in the loop divider (SYNR) register effectively
* multiplies up the PLL clock (PLLCLK) from the reference frequency by 2 x
* (SYNR+1).
* If the PLL is on, the count in the loop divider (SYNR) register
* effectively multiplies up the PLL clock (PLLCLK) from the reference
* frequency by 2 x(SYNR+1).
* PLLCLK will not be below the minimum VCO frequency (fSCM).
*
* The REFDV register provides a finer granularity for the PLL multiplier

View File

@ -45,14 +45,15 @@
#ifndef __ASSEMBLY__
/****************************************************************************
* Public Functions
* Public Functions Definitions
****************************************************************************/
/****************************************************************************
* Name: hcs12_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the STM3210E-EVAL board.
* Called to configure SPI chip select GPIO pins for the STM3210E-EVAL
* board.
*
****************************************************************************/

View File

@ -68,8 +68,8 @@ void weak_function hcs12_spidev_initialize(void)
* 2. Provide hcs12_spiselect() and hcs12_spistatus() functions in your
* board-specific logic. These functions will perform chip selection and
* status operations using GPIOs in the way your board is configured.
* 3. Add a calls to hcs12_spibus_initialize() in your low level application
* initialization logic
* 3. Add a calls to hcs12_spibus_initialize() in your low level
* application initialization logic
* 4. The handle returned by hcs12_spibus_initialize() may then be used to
* bind the SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to
@ -77,7 +77,8 @@ void weak_function hcs12_spidev_initialize(void)
*
****************************************************************************/
void hcs12_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
void hcs12_spiselect(FAR struct spi_dev_s *dev,
uint32_t devid, bool selected)
{
}

View File

@ -48,8 +48,8 @@
*
* Description:
* All HCS12 architectures must provide the following entry point.
* This entry point is called early in the initialization - after all memory
* has been configured and mapped but before any devices have been
* This entry point is called early in the initialization - after all
* memory has been configured and mapped but before any devices have been
* initialized.
*
****************************************************************************/

View File

@ -68,8 +68,8 @@ void weak_function hcs12_spidev_initialize(void)
* 2. Provide hcs12_spiselect() and hcs12_spistatus() functions in your
* board-specific logic. These functions will perform chip selection and
* status operations using GPIOs in the way your board is configured.
* 3. Add a calls to hcs12_spibus_initialize() in your low level application
* initialization logic
* 3. Add a calls to hcs12_spibus_initialize() in your low level
* application initialization logic
* 4. The handle returned by hcs12_spibus_initialize() may then be used to
* bind the SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to
@ -77,7 +77,8 @@ void weak_function hcs12_spidev_initialize(void)
*
****************************************************************************/
void hcs12_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
void hcs12_spiselect(FAR struct spi_dev_s *dev,
uint32_t devid, bool selected)
{
}

View File

@ -160,14 +160,15 @@
#ifndef __ASSEMBLY__
/****************************************************************************
* Public Functions
* Public Functions Definitions
****************************************************************************/
/****************************************************************************
* Name: hcs12_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the STM3210E-EVAL board.
* Called to configure SPI chip select GPIO pins for the STM3210E-EVAL
* board.
*
****************************************************************************/

View File

@ -93,7 +93,7 @@
* controllable from software.
*/
/* LED index values for use with board_userled() */
/* LED index values for use with board_userled() */
#define PIC32MX_MIRTOO_LED0 0
#define PIC32MX_MIRTOO_LED1 1

View File

@ -30,6 +30,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
/****************************************************************************

View File

@ -39,8 +39,8 @@
/* Configuration ************************************************************/
/* The Mirtoo features a PGA117 amplifier/multipexer that can be configured to
* bring any analog signal from PORT0,.. PORT7 to pin 19 of the PIC32MX:
/* The Mirtoo features a PGA117 amplifier/multipexer that can be configured
* to bring any analog signal from PORT0,.. PORT7 to pin 19 of the PIC32MX:
*
* --- ------------------------------------------------ ---------------------
* PIN PIC32 SIGNAL(s) BOARD SIGNAL/USAGE

View File

@ -64,7 +64,8 @@
* SCK2 SCK PGA117 and SST25VF032B SPI2 clock
*
* RB7 ~CSAI PGA117 PGA117 chip select (active low)
* RB13 ~CSM SST25VF032B SST25VF032B chip select (active low)
* RB13 ~CSM SST25VF032B SST25VF032B chip select
* (active low)
*/
#define GPIO_SI (GPIO_OUTPUT|GPIO_PORTA|GPIO_PIN1)

View File

@ -47,7 +47,8 @@
* Name: pic32mx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Sure PIC32MX board.
* Called to configure SPI chip select GPIO pins for the Sure PIC32MX
* board.
*
****************************************************************************/
@ -106,8 +107,10 @@ uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev,
uint32_t devid, bool cmd)
{
#warning "Missing logic"
return 0;
@ -130,6 +133,7 @@ uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -154,6 +158,7 @@ uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -178,6 +183,7 @@ uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mx_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{

View File

@ -157,6 +157,7 @@
#define LED_NVALUES 6
/* Switch definitions *******************************************************/
/* The Mikroelektronika PIC32MX7 MMB has a joystick:
*
* ------ -------- --------------------------

View File

@ -59,10 +59,11 @@
/* PIC32MX7MMB LCD Hardware Definitions *************************************/
/* --- ---------------------------------- -------------------- ------------------------
* PIN CONFIGURATIONS SIGNAL NAME ON-BOARD CONNECTIONS
* (Family Data Sheet Table 1-1) (PIC32MX7 Schematic)
* --- ---------------------------------- -------------------- ------------------------
/* --- ---------------------------------- ---------- --------------
* PIN CONFIGURATIONS SIGNAL NAME ON-BOARD
* (Family Data Sheet Table 1-1) (PIC32MX7 CONNECTIONS
* Schematic)
* --- ---------------------------------- ---------- ------------------------
* 6 RC1/T2CK LCD_RST TFT display
* 43 PMA1/AETXD3/AN14/ERXD2/PMALH/RB14 LCD-CS# TFT display, HDR2 pin 3
* 77 OC3/RD2 LCD_BLED LCD backlight LED

View File

@ -80,7 +80,8 @@
* RD0 SPO1 SD card slot SPI1 data OUT
* RD10 SCK1 SD card slot SD card, SPI clock
*
* RA9 SD_CS# SD card slot SD card, SPI chip select (active low)
* RA9 SD_CS# SD card slot SD card, SPI chip select
* (active low)
* RG6 SD_WP SD card slot SD card, write protect
* RG7 SD_CD# SD card slot SD card, card detect (not)
*/

View File

@ -93,7 +93,9 @@
* D9 "Flash" Yellow RF0 Low illuminates
* D10 "Error" Red RF1 Low illuminates
*/
/* ON OFF */
/* USB SD FLASH ERROR USB SD FLASH ERROR */
#define LED_STARTED 0 /* OFF OFF OFF OFF --- --- --- --- */
#define LED_HEAPALLOCATE 1 /* ON OFF N/C N/C --- --- --- --- */
@ -107,8 +109,8 @@
/* The Sure DB-DP11212 PIC32 General Purpose Demo Board does not have any
* user controllable LEDs, but does does have a segment LED display.
* That display is however, obscured by the larger segment display attached to
* the board and, so, is not supported.
* That display is however, obscured by the larger segment display attached
* to the board and, so, is not supported.
*/
/* For distinguishing individual LEDs */
@ -122,9 +124,9 @@
/* The Sure PIC32MX board has three buttons.
*
* SW1 (SW_UP, left arrow) RB3 Pulled high, Grounded/low when depressed
* SW2 (SW_DOWN, down/right arrow) RB2 Pulled high, Grounded/low when depressed
* SW3 (SW_OK, right arrow) RB4 Pulled high, Grounded/low when depressed
* SW1 (SW_UP, left arrow) RB3 Pulled high, GND/low when depressed
* SW2 (SW_DOWN, down/right arrow) RB2 Pulled high, GND/low when depressed
* SW3 (SW_OK, right arrow) RB4 Pulled high, GND/low when depressed
*/
#define BUTTON_SW1 0
@ -152,7 +154,8 @@
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C" {
extern "C"
{
#else
#define EXTERN extern
#endif

View File

@ -260,7 +260,8 @@ static void lcd_dumpstream(FAR const char *msg,
static int lcd_getstream(FAR struct lib_instream_s *instream)
{
FAR struct lcd_instream_s *lcdstream = (FAR struct lcd_instream_s *)instream;
FAR struct lcd_instream_s *lcdstream =
(FAR struct lcd_instream_s *)instream;
DEBUGASSERT(lcdstream && lcdstream->buffer);
if (lcdstream->nbytes > 0)
@ -564,7 +565,9 @@ static void lcd_action(enum slcdcode_e code, uint8_t count)
{
int tmp;
/* If we are at the home position or if the count is zero, then ignore the action */
/* If we are at the home position or if the count is zero,
* then ignore the action
*/
if (g_lcd1602.curcol < 1 || count < 1)
{
@ -603,7 +606,9 @@ static void lcd_action(enum slcdcode_e code, uint8_t count)
nchars = LCD_NCOLUMNS - g_lcd1602.curcol;
nmove = MIN(nchars, count) - 1;
/* Move all characters after the current cursor position left by 'nmove' characters */
/* Move all characters after the current cursor position left by
* 'nmove' characters
*/
for (i = g_lcd1602.curcol + nmove; i < LCD_NCOLUMNS - 1; i++)
{
@ -636,7 +641,9 @@ static void lcd_action(enum slcdcode_e code, uint8_t count)
last = LCD_NCOLUMNS - 1;
}
/* Erase N characters after the current cursor position left by one */
/* Erase N characters after the current cursor position left by
* one
*/
for (i = g_lcd1602.curcol; i < last; i++)
{
@ -662,7 +669,9 @@ static void lcd_action(enum slcdcode_e code, uint8_t count)
{
int i;
/* Erase characters after the current cursor position to the end of the line */
/* Erase characters after the current cursor position to the end of
* the line
*/
for (i = g_lcd1602.curcol; i < LCD_NCOLUMNS; i++)
{
@ -834,7 +843,8 @@ static ssize_t lcd_write(FAR struct file *filep, FAR const char *buffer,
/* Now decode and process every byte in the input buffer */
memset(&state, 0, sizeof(struct slcdstate_s));
while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF)
while ((result = slcd_decode(&instream.stream,
&state, &ch, &count)) != SLCDRET_EOF)
{
lcdinfo("slcd_decode returned result=%d char=%d count=%d\n",
result, ch, count);
@ -910,7 +920,8 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case SLCDIOC_GETATTRIBUTES:
{
FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
FAR struct slcd_attributes_s *attr =
(FAR struct slcd_attributes_s *)((uintptr_t)arg);
lcdinfo("SLCDIOC_GETATTRIBUTES:\n");
@ -935,9 +946,11 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case SLCDIOC_CURPOS:
{
FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg);
FAR struct slcd_curpos_s *curpos =
(FAR struct slcd_curpos_s *)((uintptr_t)arg);
lcdinfo("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol);
lcdinfo("SLCDIOC_CURPOS: row=%d column=%d\n",
g_lcd1602.currow, g_lcd1602.curcol);
if (!curpos)
{
@ -1007,12 +1020,13 @@ static int lcd_poll(FAR struct file *filep, FAR struct pollfd *fds,
{
/* Data is always available to be read */
fds->revents |= (fds->events & (POLLIN|POLLOUT));
fds->revents |= (fds->events & (POLLIN | POLLOUT));
if (fds->revents != 0)
{
nxsem_post(fds->sem);
}
}
return OK;
}
@ -1066,8 +1080,8 @@ int up_lcd1602_initialize(void)
up_mdelay(5);
/* Select the 8-bit interface. BF cannot be checked before this command.
* This needs to be done a few times with some magic delays.
/* Select the 8-bit interface. BF cannot be checked before this
* command. This needs to be done a few times with some magic delays.
*
* Function set: 5x7 Style | N=2R | DL=8D
*/

View File

@ -112,14 +112,15 @@
* Name: pic32mx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Sure PIC32MX board.
* Called to configure SPI chip select GPIO pins for the Sure PIC32MX
* board.
*
****************************************************************************/
void weak_function pic32mx_spidev_initialize(void)
{
/* Configure the SPI2 chip select (CS) GPIO output, and the card detect (CD)
* and write protect (WP) inputs.
/* Configure the SPI2 chip select (CS) GPIO output, and the card detect
* (CD) and write protect (WP) inputs.
*/
#ifdef PIC32_HAVE_SD

View File

@ -61,8 +61,8 @@
int board_app_initialize(uintptr_t arg)
{
/* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization was
* already performed in board_late_initialize.
/* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization
* was already performed in board_late_initialize.
*/
#ifndef CONFIG_BOARD_LATE_INITIALIZE

View File

@ -102,7 +102,14 @@
static void board_autoled_setone(int ledndx)
{
bool ledon[NLEDS] = {false, false, false, false, false};
bool ledon[NLEDS] =
{
false,
false,
false,
false,
false
};
ledon[ledndx] = true;
pic32mz_gpiowrite(GPIO_LED_L, ledon[INDEX_LED_L]);

View File

@ -40,8 +40,8 @@
*
* Description:
* All PIC32MZ architectures must provide the following entry point.
* This entry point is called early in the initialization -- after all memory
* has been configured and mapped but before any devices have been
* This entry point is called early in the initialization -- after all
* memory has been configured and mapped but before any devices have been
* initialized.
*
****************************************************************************/

View File

@ -47,7 +47,8 @@
* Name: pic32mz_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Sure PIC32MZ board.
* Called to configure SPI chip select GPIO pins for the Sure PIC32MZ
* board.
*
****************************************************************************/
@ -85,8 +86,8 @@ void weak_function pic32mz_spidev_initialize(void)
* the way your board is configured.
* 3. Add a call to pic32mz_spibus_initialize() in your low level
* application initialization logic
* 4. The handle returned by pic32mz_spibus_initialize() may then be used to
* bind the SPI driver to higher level logic (e.g., calling
* 4. The handle returned by pic32mz_spibus_initialize() may then be used
* to bind the SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver).
*
@ -119,6 +120,7 @@ uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
spiinfo("Returning nothing\n");
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -132,8 +134,8 @@ int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
pic32mz_gpiowrite(GPIO_SSD1306_DC, !cmd);
}
#endif
#endif
return 0;
}
#endif
@ -164,6 +166,7 @@ uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, uint32_t devid)
spiinfo("Returning nothing\n");
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -197,6 +200,7 @@ uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
spiinfo("Returning nothing\n");
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -218,6 +222,7 @@ uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, uint32_t devid)
spiinfo("Returning nothing\n");
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -240,6 +245,7 @@ uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -264,6 +270,7 @@ uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{

View File

@ -61,8 +61,8 @@
int board_app_initialize(uintptr_t arg)
{
/* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization was
* already performed in board_late_initialize.
/* If CONFIG_BOARD_LATE_INITIALIZE is selected then board initialization
* was already performed in board_late_initialize.
*/
#ifndef CONFIG_BOARD_LATE_INITIALIZE

View File

@ -45,7 +45,8 @@
* Name: pic32mz_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Sure PIC32MZ board.
* Called to configure SPI chip select GPIO pins for the Sure PIC32MZ
* board.
*
****************************************************************************/
@ -76,8 +77,8 @@ void weak_function pic32mz_spidev_initialize(void)
* configured.
* 2. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
* pic32mz_spiNcmddata() functions in your board-specific logic.
* These functions will perform cmd/data selection operations using GPIOs
* in the way your board is configured.
* These functions will perform cmd/data selection operations using
* GPIOs in the way your board is configured.
* 3. Add a call to pic32mz_spibus_initialize() in your low level
* application initialization logic
* 4. The handle returned by pic32mz_spibus_initialize() may then be used
@ -104,6 +105,7 @@ uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -128,6 +130,7 @@ uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -152,6 +155,7 @@ uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -176,6 +180,7 @@ uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
@ -200,6 +205,7 @@ uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid,
bool cmd)
@ -225,6 +231,7 @@ uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, uint32_t devid)
#warning "Missing logic"
return 0;
}
#ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{