diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:22:22 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:22:22 -0600 |
commit | 70b6bb22af51defd713adfd452309f32f0e523aa (patch) | |
tree | b483c578cf6ae76888b89188bedb03f539ab4cd3 /nuttx/arch/mips | |
parent | 3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff) | |
download | nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2 nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip |
More trailing whilespace removal
Diffstat (limited to 'nuttx/arch/mips')
19 files changed, 52 insertions, 52 deletions
diff --git a/nuttx/arch/mips/include/mips32/irq.h b/nuttx/arch/mips/include/mips32/irq.h index 8a3a71352..d42dbcfd2 100644 --- a/nuttx/arch/mips/include/mips32/irq.h +++ b/nuttx/arch/mips/include/mips32/irq.h @@ -430,7 +430,7 @@ static inline void cp0_putstatus(irqstate_t status) "\tnop\n" "\tnop\n" /* Plus one for good measure */ "\t.set pop\n" - : + : : "r" (status) : "memory" ); @@ -490,7 +490,7 @@ static inline void cp0_putcause(uint32_t cause) "\t.set noreorder\n" "\tmtc0 %0, $13, 0\n" /* Set the cause to the provided value */ "\t.set pop\n" - : + : : "r" (cause) : "memory" ); diff --git a/nuttx/arch/mips/include/mips32/registers.h b/nuttx/arch/mips/include/mips32/registers.h index 70279cb6f..659cd3397 100644 --- a/nuttx/arch/mips/include/mips32/registers.h +++ b/nuttx/arch/mips/include/mips32/registers.h @@ -83,7 +83,7 @@ #define t9 $25 /* Static registers: Registers that must be saved and restored if used */ - + #define s0 $16 #define s1 $17 #define s2 $18 diff --git a/nuttx/arch/mips/include/mips32/syscall.h b/nuttx/arch/mips/include/mips32/syscall.h index 349fba9bd..bf2a7847f 100644 --- a/nuttx/arch/mips/include/mips32/syscall.h +++ b/nuttx/arch/mips/include/mips32/syscall.h @@ -62,7 +62,7 @@ * a SYS call in kernel mode. The first four syscall values must, therefore, be * reserved (0 is not used). */ - + #ifdef CONFIG_NUTTX_KERNEL # ifndef CONFIG_SYS_RESERVED # error "CONFIG_SYS_RESERVED must be defined to the value 4" diff --git a/nuttx/arch/mips/include/pic32mx/irq.h b/nuttx/arch/mips/include/pic32mx/irq.h index 91fde196d..7c9da7099 100644 --- a/nuttx/arch/mips/include/pic32mx/irq.h +++ b/nuttx/arch/mips/include/pic32mx/irq.h @@ -123,7 +123,7 @@ static inline void cp0_putintctl(uint32_t intctl) "\t.set noreorder\n" "\tmtc0 %0, $12, 1\n" /* Set the IntCtl to the provided value */ "\t.set pop\n" - : + : : "r" (intctl) : "memory" ); @@ -183,7 +183,7 @@ static inline void cp0_putebase(uint32_t ebase) "\t.set noreorder\n" "\tmtc0 %0, $15, 1\n" /* Set the EBASE to the provided value */ "\t.set pop\n" - : + : : "r" (ebase) : "memory" ); diff --git a/nuttx/arch/mips/src/common/up_createstack.c b/nuttx/arch/mips/src/common/up_createstack.c index 7961ef3d9..506ece44d 100644 --- a/nuttx/arch/mips/src/common/up_createstack.c +++ b/nuttx/arch/mips/src/common/up_createstack.c @@ -55,7 +55,7 @@ * Pre-processor Macros ****************************************************************************/ -/* MIPS requires at least a 4-byte stack alignment. For floating point use, +/* MIPS requires at least a 4-byte stack alignment. For floating point use, * however, the stack must be aligned to 8-byte addresses. */ @@ -135,7 +135,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), @@ -202,7 +202,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) /* The MIPS stack must be aligned at word (4 byte) boundaries; for * floating point use, the stack must be aligned to 8-byte addresses. * If necessary top_of_stack must be rounded down to the next - * boundary to meet these alignment requirements. + * boundary to meet these alignment requirements. */ top_of_stack = STACK_ALIGN_DOWN(top_of_stack); diff --git a/nuttx/arch/mips/src/common/up_stackframe.c b/nuttx/arch/mips/src/common/up_stackframe.c index 8f0fa66cd..87f13bc42 100644 --- a/nuttx/arch/mips/src/common/up_stackframe.c +++ b/nuttx/arch/mips/src/common/up_stackframe.c @@ -51,7 +51,7 @@ /**************************************************************************** * Pre-processor Macros ****************************************************************************/ -/* MIPS requires at least a 4-byte stack alignment. For floating point use, +/* MIPS requires at least a 4-byte stack alignment. For floating point use, * however, the stack must be aligned to 8-byte addresses. */ @@ -118,7 +118,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/mips/src/common/up_usestack.c b/nuttx/arch/mips/src/common/up_usestack.c index 934ac8ed1..89cff7ff9 100644 --- a/nuttx/arch/mips/src/common/up_usestack.c +++ b/nuttx/arch/mips/src/common/up_usestack.c @@ -53,7 +53,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* MIPS requires at least a 4-byte stack alignment. For floating point use, +/* MIPS requires at least a 4-byte stack alignment. For floating point use, * however, the stack must be aligned to 8-byte addresses. */ diff --git a/nuttx/arch/mips/src/mips32/Toolchain.defs b/nuttx/arch/mips/src/mips32/Toolchain.defs index dc34b8c76..4f031f3e0 100644 --- a/nuttx/arch/mips/src/mips32/Toolchain.defs +++ b/nuttx/arch/mips/src/mips32/Toolchain.defs @@ -91,7 +91,7 @@ endif # Each toolchain definition should set: # # CROSSDEV The GNU toolchain triple (command prefix) -# ARCROSSDEV If required, an alternative prefix used when +# ARCROSSDEV If required, an alternative prefix used when # invoking ar and nm. # ARCHCPUFLAGS CPU-specific flags selecting the instruction set # FPU options, etc. diff --git a/nuttx/arch/mips/src/mips32/up_blocktask.c b/nuttx/arch/mips/src/mips32/up_blocktask.c index e0d1cf247..62c0c126e 100644 --- a/nuttx/arch/mips/src/mips32/up_blocktask.c +++ b/nuttx/arch/mips/src/mips32/up_blocktask.c @@ -131,7 +131,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_initialstate.c b/nuttx/arch/mips/src/mips32/up_initialstate.c index a4d204b30..ca981ffaf 100644 --- a/nuttx/arch/mips/src/mips32/up_initialstate.c +++ b/nuttx/arch/mips/src/mips32/up_initialstate.c @@ -100,7 +100,7 @@ void up_initial_state(struct tcb_s *tcb) /* Save the task entry point */ xcp->regs[REG_EPC] = (uint32_t)tcb->start; - + /* If this task is running PIC, then set the PIC base register to the * address of the allocated D-Space region. */ diff --git a/nuttx/arch/mips/src/mips32/up_releasepending.c b/nuttx/arch/mips/src/mips32/up_releasepending.c index 7999bffeb..1c2ac638d 100644 --- a/nuttx/arch/mips/src/mips32/up_releasepending.c +++ b/nuttx/arch/mips/src/mips32/up_releasepending.c @@ -99,7 +99,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_reprioritizertr.c b/nuttx/arch/mips/src/mips32/up_reprioritizertr.c index a8f0158b9..71a082fd8 100644 --- a/nuttx/arch/mips/src/mips32/up_reprioritizertr.c +++ b/nuttx/arch/mips/src/mips32/up_reprioritizertr.c @@ -71,7 +71,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -154,7 +154,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_swint0.c b/nuttx/arch/mips/src/mips32/up_swint0.c index 34a8a1dde..0f9bde459 100644 --- a/nuttx/arch/mips/src/mips32/up_swint0.c +++ b/nuttx/arch/mips/src/mips32/up_swint0.c @@ -310,7 +310,7 @@ int up_swint0(int irq, FAR void *context) #endif /* Clear the pending software interrupt 0 in the PIC32 interrupt block */ - + up_clrpend_irq(PIC32MX_IRQSRC_CS0); /* And reset the software interrupt bit in the MIPS CAUSE register */ diff --git a/nuttx/arch/mips/src/mips32/up_unblocktask.c b/nuttx/arch/mips/src/mips32/up_unblocktask.c index 99cd25052..277ec79cf 100644 --- a/nuttx/arch/mips/src/mips32/up_unblocktask.c +++ b/nuttx/arch/mips/src/mips32/up_unblocktask.c @@ -111,7 +111,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -122,7 +122,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_vfork.c b/nuttx/arch/mips/src/mips32/up_vfork.c index 82b097a26..af76c0779 100644 --- a/nuttx/arch/mips/src/mips32/up_vfork.c +++ b/nuttx/arch/mips/src/mips32/up_vfork.c @@ -77,7 +77,7 @@ * any data other than a variable of type pid_t used to store the return * value from vfork(), or returns from the function in which vfork() was * called, or calls any other function before successfully calling _exit() - * or one of the exec family of functions. + * or one of the exec family of functions. * * The overall sequence is: * @@ -107,7 +107,7 @@ * Upon successful completion, vfork() returns 0 to the child process and * returns the process ID of the child process to the parent process. * Otherwise, -1 is returned to the parent, no child process is created, - * and errno is set to indicate the error. + * and errno is set to indicate the error. * ****************************************************************************/ @@ -185,7 +185,7 @@ pid_t up_vfork(const struct vfork_s *context) DEBUGASSERT((uint32_t)parent->adj_stack_ptr > context->sp); stackutil = (uint32_t)parent->adj_stack_ptr - context->sp; - svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil); + svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil); /* Make some feeble effort to perserve the stack contents. This is * feeble because the stack surely contains invalid pointers and other diff --git a/nuttx/arch/mips/src/mips32/up_vfork.h b/nuttx/arch/mips/src/mips32/up_vfork.h index 556633072..079a744c8 100644 --- a/nuttx/arch/mips/src/mips32/up_vfork.h +++ b/nuttx/arch/mips/src/mips32/up_vfork.h @@ -72,7 +72,7 @@ * then this is the frame pointer. * r31 ra Return address. */ - + #define VFORK_S0_OFFSET (0*4) /* Saved register s0 */ #define VFORK_S1_OFFSET (1*4) /* Saved register s1 */ #define VFORK_S2_OFFSET (2*4) /* Saved register s2 */ diff --git a/nuttx/arch/mips/src/mips32/vfork.S b/nuttx/arch/mips/src/mips32/vfork.S index 2b7d180d3..8aba77326 100644 --- a/nuttx/arch/mips/src/mips32/vfork.S +++ b/nuttx/arch/mips/src/mips32/vfork.S @@ -64,7 +64,7 @@ * undefined if the process created by vfork() either modifies any data other than * a variable of type pid_t used to store the return value from vfork(), or returns * from the function in which vfork() was called, or calls any other function before - * successfully calling _exit() or one of the exec family of functions. + * successfully calling _exit() or one of the exec family of functions. * * This thin layer implements vfork by simply calling up_vfork() with the vfork() * context as an argument. The overall sequence is: @@ -93,7 +93,7 @@ * Upon successful completion, vfork() returns 0 to the child process and returns * the process ID of the child process to the parent process. Otherwise, -1 is * returned to the parent, no child process is created, and errno is set to - * indicate the error. + * indicate the error. * ************************************************************************************/ diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h index d64caf5fb..058b02f68 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h @@ -806,7 +806,7 @@ #undef CONFIG_PIC32MX_FCKSM #if defined(BOARD_POSC_SWITCH) -# if defined(BOARD_POSC_FSCM) +# if defined(BOARD_POSC_FSCM) # define CONFIG_PIC32MX_FCKSM DEVCFG1_FCKSM_BOTH # else # define CONFIG_PIC32MX_FCKSM DEVCFG1_FCKSM_CSONLY diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index 81ace7b9b..fedf20b04 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -651,7 +651,7 @@ static void pic32mx_dumprxdesc(struct pic32mx_rxdesc_s *rxdesc, const char *msg) * Initialize the buffers by placing them all in a free list * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None @@ -670,7 +670,7 @@ static inline void pic32mx_bufferinit(struct pic32mx_driver_s *priv) sq_addlast((sq_entry_t*)buffer, &priv->pd_freebuffers); /* Get the address of the next buffer */ - + buffer += PIC32MX_ALIGNED_BUFSIZE; } } @@ -682,7 +682,7 @@ static inline void pic32mx_bufferinit(struct pic32mx_driver_s *priv) * Allocate one buffer by removing it from the free list * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * Pointer to the allocated buffer (or NULL on failure) @@ -703,7 +703,7 @@ static uint8_t *pic32mx_allocbuffer(struct pic32mx_driver_s *priv) * Free one buffer by returning it to the free list * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * Pointer to the allocated buffer (or NULL on failure) @@ -724,7 +724,7 @@ static void pic32mx_freebuffer(struct pic32mx_driver_s *priv, uint8_t *buffer) * Initialize the EMAC Tx descriptor table * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None @@ -792,7 +792,7 @@ static inline void pic32mx_txdescinit(struct pic32mx_driver_s *priv) * Initialize the EMAC Rx descriptor table * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None @@ -885,7 +885,7 @@ static inline struct pic32mx_txdesc_s *pic32mx_txdesc(struct pic32mx_driver_s *p * done condition has been processed when the buffer has been freed and * reset to zero. */ - + if ((txdesc->status & TXDESC_STATUS_EOWN) == 0 && txdesc->address == 0) { /* Yes.. return a pointer to the descriptor */ @@ -1280,10 +1280,10 @@ static void pic32mx_timerpoll(struct pic32mx_driver_s *priv) * possibly a response to the incoming packet (but probably not, in reality). * However, since the Rx and Tx operations are decoupled, there is no * guarantee that there will be a Tx descriptor available at that time. - * This function will perform that check and, if no Tx descriptor is + * This function will perform that check and, if no Tx descriptor is * available, this function will (1) stop incoming Rx processing (bad), and * (2) hold the outgoing packet in a pending state until the next Tx - * interrupt occurs. + * interrupt occurs. * * Parameters: * priv - Reference to the driver state structure @@ -1314,7 +1314,7 @@ static void pic32mx_response(struct pic32mx_driver_s *priv) /* No.. mark the Tx as pending and halt further Rx interrupts */ DEBUGASSERT((priv->pd_inten & ETH_INT_TXDONE) != 0); - + priv->pd_txpending = true; priv->pd_inten &= ~ETH_RXINTS; pic32mx_putreg(priv->pd_inten, PIC32MX_ETH_IEN); @@ -1351,7 +1351,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) { /* Check if any RX descriptor has the EOWN bit cleared meaning that the * this descriptor is now under software control and a message was - * received. + * received. */ rxdesc = pic32mx_rxdesc(priv); @@ -1387,7 +1387,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) * be the same size as our max packet size, any fragments also * imply that the packet is too big. */ - + else if (priv->pd_dev.d_len > CONFIG_NET_BUFSIZE) { nlldbg("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); @@ -1408,7 +1408,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) uint8_t *rxbuffer; /* Get the Rx buffer address from the Rx descriptor */ - + priv->pd_dev.d_buf = (uint8_t*)VIRT_ADDR(rxdesc->address); DEBUGASSERT(priv->pd_dev.d_buf != NULL); @@ -1744,7 +1744,7 @@ static int pic32mx_interrupt(int irq, void *context) * has no effect. */ - /* FWMARK: Full Watermark Interrupt. This bit is set when the RX + /* FWMARK: Full Watermark Interrupt. This bit is set when the RX * escriptor Buffer Count is greater than or equal to the value in the * RXFWM bit (ETHRXWM:16-23) field. It is cleared by writing the BUFCDEC * (ETHCON1:0) bit to decrement the BUFCNT counter. Writing a ‘0’ or a @@ -1852,7 +1852,7 @@ static void pic32mx_polltimer(int argc, uint32_t arg, ...) * * Description: * NuttX Callback: Bring up the Ethernet interface when an IP address is - * provided + * provided * * Parameters: * dev - Reference to the NuttX driver state structure @@ -2197,7 +2197,7 @@ static int pic32mx_ifdown(struct uip_driver_s *dev) * Function: pic32mx_txavail * * Description: - * Driver callback invoked when new TX data is available. This is a + * Driver callback invoked when new TX data is available. This is a * stimulus perform an out-of-cycle poll and, thereby, reduce the TX * latency. * @@ -2252,7 +2252,7 @@ static int pic32mx_txavail(struct uip_driver_s *dev) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be added + * mac - The MAC address to be added * * Returned Value: * None @@ -2282,7 +2282,7 @@ static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be removed + * mac - The MAC address to be removed * * Returned Value: * None @@ -2364,7 +2364,7 @@ static void pic32mx_phybusywait(void) * Parameters: * phyaddr - The device address where the PHY was discovered * regaddr - The address of the PHY register to be written - * phydata - The data to write to the PHY register + * phydata - The data to write to the PHY register * * Returned Value: * None @@ -2630,7 +2630,7 @@ static int pic32mx_phymode(uint8_t phyaddr, uint8_t mode) * Initialize the PHY * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None directly. As a side-effect, it will initialize priv->pd_phyaddr @@ -2761,7 +2761,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv) } /* Are we configured to do auto-negotiation? - * + * * Preferably the auto-negotiation should be selected if the PHY supports * it. Expose the supported capabilities: Half/Full Duplex, 10BaseT/100Base * TX, etc. (Extended Register 4). Start the negotiation (Control Register @@ -2773,7 +2773,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv) #ifdef CONFIG_PHY_AUTONEG /* Setup the Auto-negotiation advertisement: 100 or 10, and HD or FD */ - pic32mx_phywrite(phyaddr, MII_ADVERTISE, + pic32mx_phywrite(phyaddr, MII_ADVERTISE, (MII_ADVERTISE_100BASETXFULL | MII_ADVERTISE_100BASETXHALF | MII_ADVERTISE_10BASETXFULL | MII_ADVERTISE_10BASETXHALF | MII_ADVERTISE_CSMA)); @@ -2944,7 +2944,7 @@ static void pic32mx_macmode(uint8_t mode) if ((mode & PIC32MX_DUPLEX_MASK) == PIC32MX_DUPLEX_FULL) { /* Set the back-to-back inter-packet gap */ - + pic32mx_putreg(21, PIC32MX_EMAC1_IPGT); /* Set MAC to operate in full duplex mode with CRC and Pad enabled */ @@ -2955,7 +2955,7 @@ static void pic32mx_macmode(uint8_t mode) else { /* Set the back-to-back inter-packet gap */ - + pic32mx_putreg(18, PIC32MX_EMAC1_IPGT); /* Set MAC to operate in half duplex mode with CRC and Pad enabled */ |