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/hc | |
parent | 3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff) | |
download | nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2 nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip |
More trailing whilespace removal
Diffstat (limited to 'nuttx/arch/hc')
22 files changed, 45 insertions, 45 deletions
diff --git a/nuttx/arch/hc/src/common/up_blocktask.c b/nuttx/arch/hc/src/common/up_blocktask.c index 5a2986291..58dd3360c 100644 --- a/nuttx/arch/hc/src/common/up_blocktask.c +++ b/nuttx/arch/hc/src/common/up_blocktask.c @@ -130,7 +130,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. */ @@ -148,7 +148,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/hc/src/common/up_createstack.c b/nuttx/arch/hc/src/common/up_createstack.c index 3272fda13..aad1557fc 100644 --- a/nuttx/arch/hc/src/common/up_createstack.c +++ b/nuttx/arch/hc/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/hc/src/common/up_releasepending.c b/nuttx/arch/hc/src/common/up_releasepending.c index b8da18d60..7a55254e7 100644 --- a/nuttx/arch/hc/src/common/up_releasepending.c +++ b/nuttx/arch/hc/src/common/up_releasepending.c @@ -96,7 +96,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. */ @@ -110,13 +110,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/hc/src/common/up_reprioritizertr.c b/nuttx/arch/hc/src/common/up_reprioritizertr.c index d9689a0f3..ee8ed4e3c 100644 --- a/nuttx/arch/hc/src/common/up_reprioritizertr.c +++ b/nuttx/arch/hc/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_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. */ @@ -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/hc/src/common/up_stackframe.c b/nuttx/arch/hc/src/common/up_stackframe.c index bc3f996b2..4ced22c4a 100644 --- a/nuttx/arch/hc/src/common/up_stackframe.c +++ b/nuttx/arch/hc/src/common/up_stackframe.c @@ -116,7 +116,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/hc/src/common/up_unblocktask.c b/nuttx/arch/hc/src/common/up_unblocktask.c index de787418a..08cefc1d4 100644 --- a/nuttx/arch/hc/src/common/up_unblocktask.c +++ b/nuttx/arch/hc/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_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. */ @@ -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/hc/src/m9s12/Make.defs b/nuttx/arch/hc/src/m9s12/Make.defs index 0f70c42ab..7ca06b436 100644 --- a/nuttx/arch/hc/src/m9s12/Make.defs +++ b/nuttx/arch/hc/src/m9s12/Make.defs @@ -35,7 +35,7 @@ HEAD_ASRC = m9s12_vectors.S -CMN_ASRCS = +CMN_ASRCS = CMN_CSRCS = up_allocateheap.c up_blocktask.c up_copystate.c up_createstack.c \ up_doirq.c up_exit.c up_idle.c up_initialize.c up_interruptcontext.c \ up_mdelay.c up_modifyreg16.c up_modifyreg32.c up_modifyreg8.c \ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_assert.c b/nuttx/arch/hc/src/m9s12/m9s12_assert.c index b977f8822..7834d9800 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_assert.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_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/hc/src/m9s12/m9s12_dumpgpio.c b/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c index c43d4439e..b958092b8 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c @@ -143,7 +143,7 @@ static const struct gpio_mebiinfo_s mebiinfo[HCS12_MEBI_NPORTS] = {HCS12_MEBI_PORTE, HCS12_MEBI_DDRE, 'E', MEBIPORT_E}, /* Port E */ {HCS12_MEBI_PORTK, HCS12_MEBI_DDRK, 'K', MEBIPORT_K} /* Port K */ }; - + /**************************************************************************** * Private Data ****************************************************************************/ @@ -223,7 +223,7 @@ static inline void hcs12_mebidump(uint8_t portndx) lldbg(" Illegal MEBI port index: %d\n", portndx); return; } - + ptr = &mebiinfo[portndx]; lldbg(" MEBI Port%c:\n", ptr->name); diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index d380f7757..b01bc1284 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -440,7 +440,7 @@ static void emac_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 @@ -520,7 +520,7 @@ static int emac_ifdown(struct uip_driver_s *dev) * Function: emac_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. * @@ -570,7 +570,7 @@ static int emac_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 @@ -599,7 +599,7 @@ static int emac_addmac(struct uip_driver_s *dev, FAR 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 diff --git a/nuttx/arch/hc/src/m9s12/m9s12_gpio.c b/nuttx/arch/hc/src/m9s12/m9s12_gpio.c index 280202da5..464169ed7 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_gpio.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_gpio.c @@ -286,7 +286,7 @@ static inline void pim_interrupt(uint8_t portndx, unsigned pin, uint8_t type) { gpio_writebit(HCS12_PIM_PORT_IE(portndx), pin, false); } -} +} /**************************************************************************** * Name: pim_configgpio @@ -308,7 +308,7 @@ static inline void pim_configgpio(uint16_t cfgset, uint8_t portndx, uint8_t pin) if ((cfgset & GPIO_INT_ENABLE) != 0) { /* Yes.. then it must not be tagged as an output */ - + ASSERT((cfgset & GPIO_DIRECTION) != GPIO_OUTPUT); /* If the pull-driver is also enabled, it must be enabled with a diff --git a/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c b/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c index 017292a26..02b8146c0 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c @@ -164,7 +164,7 @@ static int hcs12_interrupt(uint16_t base, int irq0, uint8_t valid, void *context */ putreg8(bit, base+HCS12_PIM_IF_OFFSET); - + /* Re-deliver the IRQ (recurses! We got here from irq_dispatch!) */ irq_dispatch(irq, context); diff --git a/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c b/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c index 3259cbb9a..678b26c90 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c @@ -115,7 +115,7 @@ void up_initial_state(struct tcb_s *tcb) # ifdef CONFIG_SUPPRESS_INTERRUPTS /* Disable STOP, Mask I- and Z- interrupts */ - xcp->regs[REG_CCR] = HCS12_CCR_S|HCS12_CCR_X|HCS12_CCR_I; + xcp->regs[REG_CCR] = HCS12_CCR_S|HCS12_CCR_X|HCS12_CCR_I; # else /* Disable STOP, Enable I- and Z-interrupts */ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_internal.h b/nuttx/arch/hc/src/m9s12/m9s12_internal.h index 9076e490d..104dfd362 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_internal.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_internal.h @@ -163,7 +163,7 @@ * Ports A, B, E, and K reside in the MEBI block * Ports T,S,G,H,J, and L reside in the PIM block. */ - + #define GPIO_PORT_SHIFT 3 #define GPIO_PORT_MASK (15 << GPIO_PORT_SHIFT) # define GPIO_PORT_A (0 << GPIO_PORT_SHIFT) @@ -341,7 +341,7 @@ EXTERN int hcs12_ethinitialize(int intf); * 3. Add a calls to up_spiinitialize() in your low level application * initialization logic * 4. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/arch/hc/src/m9s12/m9s12_irq.c b/nuttx/arch/hc/src/m9s12/m9s12_irq.c index 56e357a2e..ad859dc51 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_irq.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_irq.c @@ -87,7 +87,7 @@ void up_irqinitialize(void) /* Initialize logic to support a second level of interrupt decoding for * GPIO pins. */ - + #ifdef CONFIG_GPIO_IRQ hcs12_gpioirqinitialize(); #endif diff --git a/nuttx/arch/hc/src/m9s12/m9s12_mebi.h b/nuttx/arch/hc/src/m9s12/m9s12_mebi.h index f7426a3e5..99bd23510 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_mebi.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_mebi.h @@ -99,7 +99,7 @@ /* Port K Data Register Bit-Field Definitions */ /* Data Direction Register K Bit-Field Definitions */ -#define MEBI_PIN(n) (1 << (n)) +#define MEBI_PIN(n) (1 << (n)) #define MEBI_PIN0 (1 << 0) #define MEBI_PIN1 (1 << 1) #define MEBI_PIN2 (1 << 2) diff --git a/nuttx/arch/hc/src/m9s12/m9s12_serial.c b/nuttx/arch/hc/src/m9s12/m9s12_serial.c index bb61d7dbc..b83659f3f 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_serial.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_serial.c @@ -250,7 +250,7 @@ static inline void up_serialout(struct up_dev_s *priv, int offset, uint8_t value static inline void up_setsciint(struct up_dev_s *priv) { uint8_t regval; - + regval = up_serialin(priv, HCS12_SCI_CR2_OFFSET); regval &= ~SCI_CR2_ALLINTS; regval |= priv->im; @@ -264,7 +264,7 @@ static inline void up_setsciint(struct up_dev_s *priv) static inline void up_disablesciint(struct up_dev_s *priv, uint8_t *im) { uint8_t regval; - + /* Return the current interrupt mask value */ if (im) @@ -348,7 +348,7 @@ static int up_setup(struct uart_dev_s *dev) up_serialout(priv, HCS12_SCI_BDH_OFFSET, (uint8_t)(tmp >> 8)); up_serialout(priv, HCS12_SCI_BDL_OFFSET, (uint8_t)(tmp & 0xff)); - + /* Set up the SCICR1 register */ cr1 = 0; @@ -422,7 +422,7 @@ static int up_attach(struct uart_dev_s *dev) if (ret == OK) { /* Enable the Rx interrupt (the TX interrupt is still disabled - * until we have something to send). + * until we have something to send). */ priv->im = SCI_CR2_RIE; @@ -567,7 +567,7 @@ static int up_receive(struct uart_dev_s *dev, uint32_t *status) /* Return the error indications */ *status = (uint32_t)(priv->sr1 & ~SCI_CR2_ALLINTS); - + /* Get the Rx data */ rxd = (int)up_serialin(priv, HCS12_SCI_DRL_OFFSET); diff --git a/nuttx/arch/hc/src/m9s12/m9s12_serial.h b/nuttx/arch/hc/src/m9s12/m9s12_serial.h index f38377982..0c5f70041 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_serial.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_serial.h @@ -77,7 +77,7 @@ #ifndef CONFIG_SCI0_DISABLE # ifndef CONFIG_SCI0_PARITY # warning "CONFIG_SCI0_PARITY not defined -- Assuming none" -# define CONFIG_SCI0_PARITY 0 +# define CONFIG_SCI0_PARITY 0 # elif CONFIG_SCI0_PARITY != 0 && CONFIG_SCI0_PARITY != 2 && CONFIG_SCI0_PARITY != 2 # error "CONFIG_SCI0_PARITY value not recognized" # endif @@ -95,7 +95,7 @@ #ifndef CONFIG_SCI1_DISABLE # ifndef CONFIG_SCI1_PARITY # warning "CONFIG_SCI1_PARITY not defined -- Assuming none" -# define CONFIG_SCI1_PARITY 0 +# define CONFIG_SCI1_PARITY 0 # elif CONFIG_SCI1_PARITY != 0 && CONFIG_SCI1_PARITY != 2 && CONFIG_SCI1_PARITY != 2 # error "CONFIG_SCI1_PARITY value not recognized" # endif diff --git a/nuttx/arch/hc/src/m9s12/m9s12_spi.h b/nuttx/arch/hc/src/m9s12/m9s12_spi.h index 931e0efcf..b3d6f3cef 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_spi.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_spi.h @@ -52,7 +52,7 @@ #define HCS12_SPI_CR1_OFFSET 0x00 /* SPI Control Register 1 */ #define HCS12_SPI_CR2_OFFSET 0x01 /* SPI Control Register 2 */ #define HCS12_SPI_BR_OFFSET 0x02 /* SPI Baud Rate Register */ -#define HCS12_SPI_SR_OFFSET 0x03 /* SPI Status Register */ +#define HCS12_SPI_SR_OFFSET 0x03 /* SPI Status Register */ #define HCS12_SPI_DR_OFFSET 0x05 /* SPI Data Register */ /* Register Addresses ***************************************************************/ @@ -90,7 +90,7 @@ #define SPI_BR_SPPR_SHIFT (4) /* Bits 4-6: SPI Baud Rate Preselection */ #define SPI_BR_SPPR_MASK (7 << SPI_BR_SPPR_SHIFT) -/* SPI Status Register Bit-Field Definitions */ +/* SPI Status Register Bit-Field Definitions */ #define SPI_SR_MODF (1 << 4) /* Bit 4: Mode Fault */ #define SPI_SR_SPTEF (1 << 5) /* Bit 5: SPI Transmit Empty Interrupt */ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_start.S b/nuttx/arch/hc/src/m9s12/m9s12_start.S index c79388030..890786270 100755 --- a/nuttx/arch/hc/src/m9s12/m9s12_start.S +++ b/nuttx/arch/hc/src/m9s12/m9s12_start.S @@ -96,7 +96,7 @@ * * The MC9S12NE64 has 64K bytes of FLASH EEPROM and 8K bytes of RAM. */ - + .macro MMCINIT /* Registers are always positioned at address 0x0000 */ @@ -126,7 +126,7 @@ * already been configured at 24 MHz */ - .macro PLLINIT + .macro PLLINIT #ifndef CONFIG_HCS12_SERIALMON /* Select the clock source from crystal */ @@ -137,7 +137,7 @@ bclr *HCS12_CRG_PLLCTL #CRG_PLLCTL_PLLON ldab #HCS12_SYNR_VALUE stab HCS12_CRG_SYNR - ldab #HCS12_REFDV_VALUE + ldab #HCS12_REFDV_VALUE stab HCS12_CRG_REFDV bset *HCS12_CRG_PLLCTL #CRG_PLLCTL_PLLON diff --git a/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c b/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c index dcefa1dc6..46733da01 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c @@ -75,7 +75,7 @@ #define MIN_PRER 1024 /* 2**10, B=1 */ #define MAX_PRER 65536 /* 2**16, B=7 */ - + #define MIN_MODCNT 1 /* A=0 */ #define MAX_MODCNT 16 /* A=15 */ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_vectors.S b/nuttx/arch/hc/src/m9s12/m9s12_vectors.S index 4b10ed62a..d7d929b65 100755 --- a/nuttx/arch/hc/src/m9s12/m9s12_vectors.S +++ b/nuttx/arch/hc/src/m9s12/m9s12_vectors.S @@ -80,7 +80,7 @@ * PCH * High Address PCL <-- SP before interrupt */ - + .macro HANDLER, label, irqno \label: ldab #\irqno /* Load B=IRQ number */ @@ -293,7 +293,7 @@ vcommon: #endif /* Save the PPAGE register */ - + #ifndef CONFIG_HCS12_NONBANKED movb HCS12_MMC_PPAGE, 1, -sp #endif @@ -318,7 +318,7 @@ vcommon: bne up_fullcontextrestore /* Restore registers and return */ - + /* Restore the PPAGE register */ #ifndef CONFIG_HCS12_NONBANKED |