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/sh/src | |
parent | 3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff) | |
download | nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2 nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip |
More trailing whilespace removal
Diffstat (limited to 'nuttx/arch/sh/src')
-rw-r--r-- | nuttx/arch/sh/src/common/up_assert.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_blocktask.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_createstack.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_releasepending.c | 6 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_reprioritizertr.c | 6 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_stackframe.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_unblocktask.c | 6 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_usestack.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/Make.defs | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_dumpstate.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_head.S | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_irq.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_serial.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_timerisr.c | 6 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_vectors.S | 18 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/Make.defs | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_dumpstate.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_head.S | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_saveusercontext.S | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_serial.c | 8 |
20 files changed, 42 insertions, 42 deletions
diff --git a/nuttx/arch/sh/src/common/up_assert.c b/nuttx/arch/sh/src/common/up_assert.c index 1c4016665..77dfae286 100644 --- a/nuttx/arch/sh/src/common/up_assert.c +++ b/nuttx/arch/sh/src/common/up_assert.c @@ -63,7 +63,7 @@ # undef CONFIG_ARCH_USBDUMP #endif -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/sh/src/common/up_blocktask.c b/nuttx/arch/sh/src/common/up_blocktask.c index 9959e71df..81e1789fc 100644 --- a/nuttx/arch/sh/src/common/up_blocktask.c +++ b/nuttx/arch/sh/src/common/up_blocktask.c @@ -129,7 +129,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_copystate(rtcb->xcp.regs, current_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. */ @@ -147,7 +147,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) else if (!up_saveusercontext(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/sh/src/common/up_createstack.c b/nuttx/arch/sh/src/common/up_createstack.c index 280b5a6b9..4c2d36ae9 100644 --- a/nuttx/arch/sh/src/common/up_createstack.c +++ b/nuttx/arch/sh/src/common/up_createstack.c @@ -114,7 +114,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), diff --git a/nuttx/arch/sh/src/common/up_releasepending.c b/nuttx/arch/sh/src/common/up_releasepending.c index b3960972d..f1cde5075 100644 --- a/nuttx/arch/sh/src/common/up_releasepending.c +++ b/nuttx/arch/sh/src/common/up_releasepending.c @@ -97,7 +97,7 @@ void up_release_pending(void) up_copystate(rtcb->xcp.regs, current_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. */ @@ -111,13 +111,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if up_saveusercontext returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!up_saveusercontext(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/sh/src/common/up_reprioritizertr.c b/nuttx/arch/sh/src/common/up_reprioritizertr.c index 64f5d9969..8ef6c06c4 100644 --- a/nuttx/arch/sh/src/common/up_reprioritizertr.c +++ b/nuttx/arch/sh/src/common/up_reprioritizertr.c @@ -69,7 +69,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 @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_copystate(rtcb->xcp.regs, current_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. */ @@ -171,7 +171,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) else if (!up_saveusercontext(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/sh/src/common/up_stackframe.c b/nuttx/arch/sh/src/common/up_stackframe.c index 16837f62f..736402b81 100644 --- a/nuttx/arch/sh/src/common/up_stackframe.c +++ b/nuttx/arch/sh/src/common/up_stackframe.c @@ -114,7 +114,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/sh/src/common/up_unblocktask.c b/nuttx/arch/sh/src/common/up_unblocktask.c index 455c50ce2..5ba0173fb 100644 --- a/nuttx/arch/sh/src/common/up_unblocktask.c +++ b/nuttx/arch/sh/src/common/up_unblocktask.c @@ -109,7 +109,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) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_copystate(rtcb->xcp.regs, current_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. */ @@ -132,7 +132,7 @@ void up_unblock_task(struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_saveusercontext returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/sh/src/common/up_usestack.c b/nuttx/arch/sh/src/common/up_usestack.c index e0f348045..b489762b6 100644 --- a/nuttx/arch/sh/src/common/up_usestack.c +++ b/nuttx/arch/sh/src/common/up_usestack.c @@ -104,7 +104,7 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size) } /* Save the new stack allocation */ - + tcb->stack_alloc_ptr = stack; /* The SH family uses a push-down stack: the stack grows toward lower diff --git a/nuttx/arch/sh/src/m16c/Make.defs b/nuttx/arch/sh/src/m16c/Make.defs index 6d5877b8b..be8f160ea 100644 --- a/nuttx/arch/sh/src/m16c/Make.defs +++ b/nuttx/arch/sh/src/m16c/Make.defs @@ -35,7 +35,7 @@ HEAD_ASRC = m16c_head.S -CMN_ASRCS = +CMN_ASRCS = CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c \ up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \ up_interruptcontext.c up_lowputs.c up_mdelay.c up_puts.c \ diff --git a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c index 8083f62bd..d0ee37b04 100644 --- a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c +++ b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c @@ -181,7 +181,7 @@ void up_dumpstate(void) } /* Get the limits on the interrupt stack memory. The near RAM memory map is as follows: - * + * * 0x00400 - DATA Size: Determined by linker * BSS Size: Determined by linker * Interrupt stack Size: CONFIG_ARCH_INTERRUPTSTACK diff --git a/nuttx/arch/sh/src/m16c/m16c_head.S b/nuttx/arch/sh/src/m16c/m16c_head.S index e1eca90f1..cd1a3aa7d 100644 --- a/nuttx/arch/sh/src/m16c/m16c_head.S +++ b/nuttx/arch/sh/src/m16c/m16c_head.S @@ -70,7 +70,7 @@ ************************************************************************************/ /* The near RAM memory map is as follows: - * + * * 0x00400 - DATA Size: Determined by linker * BSS Size: Determined by linker * Interrupt stack Size: CONFIG_ARCH_INTERRUPTSTACK diff --git a/nuttx/arch/sh/src/m16c/m16c_irq.c b/nuttx/arch/sh/src/m16c/m16c_irq.c index b62f55b54..5c4645053 100644 --- a/nuttx/arch/sh/src/m16c/m16c_irq.c +++ b/nuttx/arch/sh/src/m16c/m16c_irq.c @@ -78,7 +78,7 @@ volatile uint32_t *current_regs; /* Actually a pointer to the beginning of a uin void up_irqinitialize(void) { current_regs = NULL; - + /* And finally, enable interrupts */ #ifndef CONFIG_SUPPRESS_INTERRUPTS diff --git a/nuttx/arch/sh/src/m16c/m16c_serial.c b/nuttx/arch/sh/src/m16c/m16c_serial.c index a936dd922..b0afc22fe 100644 --- a/nuttx/arch/sh/src/m16c/m16c_serial.c +++ b/nuttx/arch/sh/src/m16c/m16c_serial.c @@ -613,7 +613,7 @@ static int up_setup(struct uart_dev_s *dev) { dbg("Invalid bits=%d\n", priv->bits); } - + if (priv->parity != 0) { regval |= UART_MR_PRYE; @@ -1075,7 +1075,7 @@ static bool up_txready(struct uart_dev_s *dev) * Name: up_earlyconsoleinit * * Description: - * Performs the low level UART initialization early in + * Performs the low level UART initialization early in * debug so that the serial console will be available * during bootup. This must be called before up_consoleinit. * diff --git a/nuttx/arch/sh/src/m16c/m16c_timerisr.c b/nuttx/arch/sh/src/m16c/m16c_timerisr.c index ee61d7601..dfc7f4d91 100644 --- a/nuttx/arch/sh/src/m16c/m16c_timerisr.c +++ b/nuttx/arch/sh/src/m16c/m16c_timerisr.c @@ -161,13 +161,13 @@ void up_timerinit(void) putreg8(0, M16C_TB2IC); /* Set up timer 0 mode register for timer mode with the calculated prescaler value */ - + putreg8(M16C_TA0MODE_CONFIG, M16C_TA0MR); /* Set the calculated reload value */ putreg16(M16C_RELOAD_VALUE, M16C_TA0); - + /* Attach the interrupt handler */ irq_attach(M16C_SYSTIMER_IRQ, (xcpt_t)up_timerisr); @@ -175,7 +175,7 @@ void up_timerinit(void) /* Enable timer interrupts */ putreg8(1, M16C_TA0IC); - + /* Set the interrupt priority */ putreg8(M16C_TA0_PRIO, M16C_TA0IC); diff --git a/nuttx/arch/sh/src/m16c/m16c_vectors.S b/nuttx/arch/sh/src/m16c/m16c_vectors.S index 8a99148e4..f0f151fc3 100644 --- a/nuttx/arch/sh/src/m16c/m16c_vectors.S +++ b/nuttx/arch/sh/src/m16c/m16c_vectors.S @@ -228,7 +228,7 @@ * - Save FLG register * - Clear I, D, and U flags in FLG register * - Builds stack frame like (on the push-down, interrupt stack): - * + * * sp -> PC bits 0-7 * sp+1 -> PC bits 8-15 * sp+2 -> FLG bits 0-7 @@ -245,7 +245,7 @@ m16c_vector _m16c_unexpected_isr, NR_IRQS /* Variable vectors */ - + m16c_vector _m16c_brk_isr, M16C_BRK_IRQ m16c_vector _m16c_int3_isr, M16C_INT3_IRQ m16c_vector _m16c_int5_isr, M16C_INT5_IRQ @@ -372,11 +372,11 @@ _m16c_commonvector: * * Of the ISP to the end of the context array: */ - + ldc r0, isp /* ISP = address of base of new context info */ - + /* Restore the user stack pointer */ - + pop.w r0 /* R0 = saved user stack pointer */ fset u /* Switch to User stack */ ldc r0, sp /* Restore the user stack pointer */ @@ -416,7 +416,7 @@ _up_saveusercontext: * - Save FLG register * - Clear I, D, and U flags in FLG register * - Builds stack frame like (on the push-down, interrupt stack): - * + * * sp -> PC bits 0-7 * sp+1 -> PC bits 8-15 * sp+2 -> FLG bits 0-7 @@ -482,7 +482,7 @@ _up_fullcontextrestore: * - Save FLG register * - Clear I and D flags in FLG register (U is preserved) * - Builds stack frame like (on the push-down, interrupt stack): - * + * * sp -> PC bits 0-7 * sp+1 -> PC bits 8-15 * sp+2 -> FLG bits 0-7 @@ -497,9 +497,9 @@ _m16c_contextrestore: /* Set the USP to the beginning of the context save area */ ldc r1, sp /* USP = address of base of new context info */ - + /* Restore the user stack pointer */ - + fset b /* Switch to bank 1 */ pop.w r0 /* R0 = saved user stack pointer */ fclr b /* Back to bank 0 */ diff --git a/nuttx/arch/sh/src/sh1/Make.defs b/nuttx/arch/sh/src/sh1/Make.defs index d75fdf70d..ab96a3657 100644 --- a/nuttx/arch/sh/src/sh1/Make.defs +++ b/nuttx/arch/sh/src/sh1/Make.defs @@ -35,7 +35,7 @@ HEAD_ASRC = sh1_head.S -CMN_ASRCS = +CMN_ASRCS = CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c \ up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \ up_initialstate.c up_interruptcontext.c up_lowputs.c \ @@ -51,6 +51,6 @@ CMN_CSRCS += sh1_schedulesigaction.c sh1_sigdeliver.c endif ifeq ($(CONFIG_USBDEV),y) -CHIP_CSRCS += +CHIP_CSRCS += endif diff --git a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c index e9ffc4caa..849c406df 100644 --- a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c +++ b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c @@ -55,7 +55,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/sh/src/sh1/sh1_head.S b/nuttx/arch/sh/src/sh1/sh1_head.S index 89d6bf288..3654d0c60 100644 --- a/nuttx/arch/sh/src/sh1/sh1_head.S +++ b/nuttx/arch/sh/src/sh1/sh1_head.S @@ -477,7 +477,7 @@ __start0: .Ledata: .long _edata #endif -.Lsbss: +.Lsbss: .long _sbss .Lebss: .long _ebss diff --git a/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S b/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S index 56a43a2fb..a1b6bfff9 100644 --- a/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S +++ b/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S @@ -81,7 +81,7 @@ _up_saveusercontext: * to populate. * * Re-position to the end of the structure (+4_ so that we can use - * auto decrement + * auto decrement */ add #(XCPTCONTEXT_SIZE), r4 /* R4: Address of last entry + 4 */ diff --git a/nuttx/arch/sh/src/sh1/sh1_serial.c b/nuttx/arch/sh/src/sh1/sh1_serial.c index 5f521fa5a..3719e0d5f 100644 --- a/nuttx/arch/sh/src/sh1/sh1_serial.c +++ b/nuttx/arch/sh/src/sh1/sh1_serial.c @@ -568,7 +568,7 @@ static int up_interrupt(int irq, void *context) struct up_dev_s *priv; #ifdef CONFIG_SH1_SCI0 - if ((irq >= g_sci0priv.irq) && + if ((irq >= g_sci0priv.irq) && (irq <= g_sci0priv.irq + SH1_SCI_NIRQS)) { dev = &g_sci0port; @@ -576,7 +576,7 @@ static int up_interrupt(int irq, void *context) else #endif #ifdef CONFIG_SH1_SCI1 - if ((irq >= g_sci1priv.irq) && + if ((irq >= g_sci1priv.irq) && (irq <= g_sci1priv.irq + SH1_SCI_NIRQS)) { dev = &g_sci1port; @@ -616,7 +616,7 @@ static int up_interrupt(int irq, void *context) /* Handle outgoing, transmit bytes (TDRE: Transmit Data Register Empty) * when TIE is enabled. TIE is only enabled when the driver is waiting with - * buffered data. Since TDRE is usually true, + * buffered data. Since TDRE is usually true, */ if ((priv->ssr & SH1_SCISSR_TDRE) != 0 && (priv->scr & SH1_SCISCR_TIE) != 0) @@ -836,7 +836,7 @@ static bool up_txready(struct uart_dev_s *dev) * Name: up_earlyconsoleinit * * Description: - * Performs the low level SCI initialization early in + * Performs the low level SCI initialization early in * debug so that the serial console will be available * during bootup. This must be called before up_consoleinit. * |