Run tools/nxstyle against all files modified by PR187 and correct complaints

This commit is contained in:
Gregory Nutt 2020-01-30 19:00:12 -06:00
parent 73bdb433bb
commit 960c26491c
5 changed files with 10 additions and 2 deletions

View File

@ -131,7 +131,6 @@ extern volatile uint32_t *g_current_regs[1];
#endif #endif
/* This is the beginning of heap as provided from up_head.S. This is the /* This is the beginning of heap as provided from up_head.S. This is the
* first address in DRAM after the loaded program+bss+idle stack. The end * first address in DRAM after the loaded program+bss+idle stack. The end
* of the heap is CONFIG_RAM_END * of the heap is CONFIG_RAM_END
@ -180,11 +179,12 @@ extern uint32_t _bmxdupba_address; /* BMX register setting */
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Common Functions *********************************************************/ /* Common Functions *********************************************************/
/* Common functions define in arch/mips/src/common. These may be replaced /* Common functions define in arch/mips/src/common. These may be replaced
* with chip-specific functions of the same name if needed. See also * with chip-specific functions of the same name if needed. See also
* functions prototyped in include/nuttx/arch.h. * functions prototyped in include/nuttx/arch.h.
@ -216,6 +216,7 @@ void up_dumpstate(void);
#endif #endif
/* Common MIPS32 functions defined in arch/mips/src/MIPS32 */ /* Common MIPS32 functions defined in arch/mips/src/MIPS32 */
/* IRQs */ /* IRQs */
uint32_t *up_doirq(int irq, uint32_t *regs); uint32_t *up_doirq(int irq, uint32_t *regs);
@ -229,7 +230,9 @@ int up_swint0(int irq, FAR void *context, FAR void *arg);
void up_sigdeliver(void); void up_sigdeliver(void);
/* Chip-specific functions **************************************************/ /* Chip-specific functions **************************************************/
/* Chip specific functions defined in arch/mips/src/<chip> */ /* Chip specific functions defined in arch/mips/src/<chip> */
/* IRQs */ /* IRQs */
void up_irqinitialize(void); void up_irqinitialize(void);

View File

@ -59,6 +59,7 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* USB trace dumping */ /* USB trace dumping */
#ifndef CONFIG_USBDEV_TRACE #ifndef CONFIG_USBDEV_TRACE

View File

@ -74,6 +74,7 @@ void up_release_pending(void)
/* Merge the g_pendingtasks list into the ready-to-run task list */ /* Merge the g_pendingtasks list into the ready-to-run task list */
/* sched_lock(); */ /* sched_lock(); */
if (sched_mergepending()) if (sched_mergepending())
{ {
/* The currently active task has changed! We will need to switch /* The currently active task has changed! We will need to switch

View File

@ -58,6 +58,7 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifdef CONFIG_PIC32MX_MVEC #ifdef CONFIG_PIC32MX_MVEC

View File

@ -58,6 +58,7 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifdef CONFIG_PIC32MZ_MVEC #ifdef CONFIG_PIC32MZ_MVEC
@ -65,6 +66,7 @@
#endif #endif
/* Interrupt controller definitions *****************************************/ /* Interrupt controller definitions *****************************************/
/* Number of interrupt enable/interrupt status registers */ /* Number of interrupt enable/interrupt status registers */
#define INT_NREGS ((NR_IRQS + 31) >> 5) #define INT_NREGS ((NR_IRQS + 31) >> 5)