summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/lpc17xx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-04-13 16:22:22 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-04-13 16:22:22 -0600
commit70b6bb22af51defd713adfd452309f32f0e523aa (patch)
treeb483c578cf6ae76888b89188bedb03f539ab4cd3 /nuttx/arch/arm/src/lpc17xx
parent3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff)
downloadnuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz
nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2
nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip
More trailing whilespace removal
Diffstat (limited to 'nuttx/arch/arm/src/lpc17xx')
-rw-r--r--nuttx/arch/arm/src/lpc17xx/Kconfig4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/Make.defs2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_adc.h4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_dac.c4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_serial.c8
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c18
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_start.c4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c4
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c52
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c2
19 files changed, 64 insertions, 64 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig
index 20b4b37e6..d1e76062d 100644
--- a/nuttx/arch/arm/src/lpc17xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc17xx/Kconfig
@@ -493,7 +493,7 @@ config ADC_CHANLIST
config ADC_NCHANNELS
int "ADC0 number of channels"
depends on ADC_CHANLIST
- default 0
+ default 0
---help---
If ADC_CHANLIST is enabled, then the platform specific code
must do two things: (1) define ADC_NCHANNELS in the configuration
@@ -606,7 +606,7 @@ config SDIO_DMA
default y if LPC17_GPDMA
depends on LPC17_GPDMA
---help---
- Support DMA data transfers.
+ Support DMA data transfers.
Enable SD card DMA data transfers. This is a marginally optional.
For most usages, SD accesses will cause data overruns if used without
DMA. Requires LPC17_SDCARD and config LPC17_GPDMA.
diff --git a/nuttx/arch/arm/src/lpc17xx/Make.defs b/nuttx/arch/arm/src/lpc17xx/Make.defs
index be695a777..a7fa299df 100644
--- a/nuttx/arch/arm/src/lpc17xx/Make.defs
+++ b/nuttx/arch/arm/src/lpc17xx/Make.defs
@@ -36,7 +36,7 @@
# The start-up, "head", file
ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-HEAD_ASRC =
+HEAD_ASRC =
else
HEAD_ASRC = lpc17_vectors.S
endif
diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h
index fcf0fa3d4..bc3ae3c92 100644
--- a/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h
+++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h
@@ -60,12 +60,12 @@
/* Clocking and power control - Phase locked loops */
-#define LPC17_SYSCON_PLL0CON_OFFSET 0x0080 /* PLL0 Control Register */
+#define LPC17_SYSCON_PLL0CON_OFFSET 0x0080 /* PLL0 Control Register */
#define LPC17_SYSCON_PLL0CFG_OFFSET 0x0084 /* PLL0 Configuration Register */
#define LPC17_SYSCON_PLL0STAT_OFFSET 0x0088 /* PLL0 Status Register */
#define LPC17_SYSCON_PLL0FEED_OFFSET 0x008c /* PLL0 Feed Register */
-#define LPC17_SYSCON_PLL1CON_OFFSET 0x00a0 /* PLL1 Control Register */
+#define LPC17_SYSCON_PLL1CON_OFFSET 0x00a0 /* PLL1 Control Register */
#define LPC17_SYSCON_PLL1CFG_OFFSET 0x00a4 /* PLL1 Configuration Register */
#define LPC17_SYSCON_PLL1STAT_OFFSET 0x00a8 /* PLL1 Status Register */
#define LPC17_SYSCON_PLL1FEED_OFFSET 0x00ac /* PLL1 Feed Register */
diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h
index 84b019d61..74a210944 100644
--- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h
+++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h
@@ -377,7 +377,7 @@
/* Error Warning Limit */
-#define CAN_EWL_SHIFT (0) /* Bits 0-7: Error warning limit */
+#define CAN_EWL_SHIFT (0) /* Bits 0-7: Error warning limit */
#define CAN_EWL_MASK (0xff << CAN_EWL_SHIFT)
/* Bits 8-31: Reserved */
/* Status Register */
@@ -482,7 +482,7 @@
#define CAN_TDA_DATA4_SHIFT (24) /* Bits 24-31: RTR=0 && DLC >= 4 */
#define CAN_TDA_DATA4_MASK (0x0ff << CAN_TDA_DATA4_SHIFT)
-/* Transmit data bytes 5-8 (Tx Buffer 1), Transmit data bytes 5-8 (Tx Buffer 2), and
+/* Transmit data bytes 5-8 (Tx Buffer 1), Transmit data bytes 5-8 (Tx Buffer 2), and
* Transmit data bytes 5-8 (Tx Buffer 3) common bit field definitions.
*/
diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h
index d7b919cb6..ef334a1a6 100644
--- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h
+++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h
@@ -71,7 +71,7 @@
/* Cursor Image registers, n=0-255 */
-#define LPC17_LCD_CRSR_IMG_OFFSET(n) (0x0800 + ((n) << 2))
+#define LPC17_LCD_CRSR_IMG_OFFSET(n) (0x0800 + ((n) << 2))
#define LPC17_LCD_CRSR_CRTL_OFFSET (0x0c00) /* Cursor Control register */
#define LPC17_LCD_CRSR_CFG_OFFSET (0x0c04) /* Cursor Configuration register */
diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h
index 10abbd232..16a21a162 100644
--- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h
+++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h
@@ -263,7 +263,7 @@
#define MCPWM_CAPCLR_MCCLR0 (1 << 0) /* Bit 0: Clear MCCAP0 register */
#define MCPWM_CAPCLR_MCCLR1 (1 << 1) /* Bit 1: Clear MCCAP1 register */
#define MCPWM_CAPCLR_MCCLR2 (1 << 2) /* Bit 2: Clear MCCAP2 register */
- /* Bits 2-31: Reserved */
+ /* Bits 2-31: Reserved */
/************************************************************************************
* Public Types
diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h
index d1e6dd013..32b02455c 100644
--- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h
+++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h
@@ -49,7 +49,7 @@
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
-
+
/* Register offsets *****************************************************************/
/* USB Host Controller (OHCI) *******************************************************/
/* See include/nuttx/usb/ohci.h */
@@ -326,7 +326,7 @@
/* USB Device Interrupt Status, USB Device Interrupt Enable, USB Device Interrupt
* Clear, USB Device Interrupt Set, and USB Device Interrupt Priority
*/
-
+
#define USBDEV_INT_FRAME (1 << 0) /* Bit 0: frame interrupt (every 1 ms) */
#define USBDEV_INT_EPFAST (1 << 1) /* Bit 1: Fast endpoint interrupt */
#define USBDEV_INT_EPSLOW (1 << 2) /* Bit 2: Slow endpoints interrupt */
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h b/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h
index a1bd9fe4d..d7736b979 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h
@@ -53,7 +53,7 @@
* the ADC0_MASK within the board-specific library.
*/
-#ifdef CONFIG_ADC_CHANLIST
+#ifdef CONFIG_ADC_CHANLIST
# if !defined(CONFIG_ADC_NCHANNELS)
# error "CONFIG_ADC_CHANLIST must defined in this configuration"
# elif CONFIG_ADC_NCHANNELS < 1
@@ -92,7 +92,7 @@ extern "C"
* the ADC0_MASK within the board-specific library.
*/
-#ifdef CONFIG_ADC_CHANLIST
+#ifdef CONFIG_ADC_CHANLIST
EXTERN uint8_t g_adc_chanlist[CONFIG_ADC_NCHANNELS];
#endif
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c b/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c
index 4f3e5a512..87cc6a717 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c
@@ -4,7 +4,7 @@
* Copyright (C) 2011 Li Zhuoyi. All rights reserved.
* Author: Li Zhuoyi <lzyy.cn@gmail.com>
* History: 0.1 2011-08-05 initial version
- *
+ *
* This file is a part of NuttX:
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
@@ -117,7 +117,7 @@ static void dac_reset(FAR struct dac_dev_s *dev)
{
irqstate_t flags;
uint32_t regval;
-
+
flags = irqsave();
regval = getreg32(LPC17_SYSCON_PCLKSEL0);
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
index d5ff51f61..7876da0ac 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
@@ -163,7 +163,7 @@ int lpc17_dumpgpio(lpc17_pinset_t pinset, const char *msg)
#if defined(LPC176x)
lldbg(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
pinsel, pinsel ? getreg32(pinsel) : 0,
- pinmode, pinmode ? getreg32(pinmode) : 0,
+ pinmode, pinmode ? getreg32(pinmode) : 0,
g_odmode[port], getreg32(g_odmode[port]));
#elif defined(LPC178x)
lldbg(" IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c b/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c
index 1d6b4b1d6..7cb51ed07 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c
@@ -396,7 +396,7 @@ static void lpc17_gpiodemux(uint32_t intbase, uint32_t intmask,
*
* Description:
* Handle the GPIO interrupt. For the LPC176x family, that interrupt could
- * also that also indicates that an EINT3 interrupt has occurred. NOTE:
+ * also that also indicates that an EINT3 interrupt has occurred. NOTE:
* This logic would have to be extended if EINT3 is actually used for
* External Interrupt 3 on an LPC176x platform.
*
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h
index c508ddf6a..5e039dad7 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h
@@ -141,11 +141,11 @@
#define LPC17_TD_SIZE 32
/* Configurable number of user transfer descriptors (TDs). */
-
+
#ifndef CONFIG_USBHOST_NTDS
# define CONFIG_USBHOST_NTDS 3
#endif
-
+
#if CONFIG_USBHOST_NTDS < 2
# error "Insufficent TDs"
#endif
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h
index 66eb68b9b..12c2fba9d 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h
@@ -88,7 +88,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno);
*
* Input Parameters:
* dev - An instance of the SDIO driver device state structure.
- * cardinslot - true is a card has been detected in the slot; false if a
+ * cardinslot - true is a card has been detected in the slot; false if a
* card has been removed from the slot. Only transitions
* (inserted->removed or removed->inserted should be reported)
*
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c b/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c
index 57a775a6a..7c0f0e04a 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c
@@ -611,7 +611,7 @@ static inline uint32_t lpc17_uartcclkdiv(uint32_t baud)
{
return SYSCON_PCLKSEL_CCLK;
}
-
+
/* Check divisor == 2. This works if:
*
* 2 * CCLK / BAUD / 16 < 0xffff, or
@@ -636,7 +636,7 @@ static inline uint32_t lpc17_uartcclkdiv(uint32_t baud)
* And
*
* 4 * CCLK / BAUD / 16 >= MinDL, or
- * BAUD <= CCLK / 4 / MinDL
+ * BAUD <= CCLK / 4 / MinDL
*/
else if (baud < (LPC17_CCLK / 4 / UART_MINDL ))
@@ -652,7 +652,7 @@ static inline uint32_t lpc17_uartcclkdiv(uint32_t baud)
* And
*
* 8 * CCLK / BAUD / 16 >= MinDL, or
- * BAUD <= CCLK / 2 / MinDL
+ * BAUD <= CCLK / 2 / MinDL
*/
else /* if (baud < (LPC17_CCLK / 2 / UART_MINDL )) */
@@ -942,7 +942,7 @@ static int up_setup(struct uart_dev_s *dev)
(UART_FCR_RXTRIGGER_8|UART_FCR_TXRST|UART_FCR_RXRST|UART_FCR_FIFOEN));
/* Enable Auto-RTS and Auto-CS Flow Control in the Modem Control Register */
-
+
#if defined(CONFIG_UART1_IFLOWCONTROL) || defined(CONFIG_UART1_OFLOWCONTROL)
if (priv->uartbase == LPC17_UART1_BASE)
{
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
index 08599e68e..aae65f651 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -73,7 +73,7 @@
/* Debug ********************************************************************/
/* The following enable debug output from this file:
- *
+ *
* CONFIG_DEBUG - Define to enable general debug features
* CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG)
* CONFIG_DEBUG_VERBOSE - Define to enable verbose SSP debug
@@ -212,7 +212,7 @@ static struct lpc17_sspdev_s g_ssp0dev =
#ifdef CONFIG_LPC17_SSP_INTERRUPTS
.sspirq = LPC17_IRQ_SSP0,
#endif
-};
+};
#endif /* CONFIG_LPC17_SSP0 */
#ifdef CONFIG_LPC17_SSP1
@@ -246,7 +246,7 @@ static struct lpc17_sspdev_s g_ssp1dev =
#ifdef CONFIG_LPC17_SSP_INTERRUPTS
.sspirq = LPC17_IRQ_SSP1,
#endif
-};
+};
#endif /* CONFIG_LPC17_SSP1 */
#ifdef CONFIG_LPC17_SSP2
@@ -280,7 +280,7 @@ static struct lpc17_sspdev_s g_ssp2dev =
#ifdef CONFIG_LPC17_SSP_INTERRUPTS
.sspirq = LPC17_IRQ_SSP2,
#endif
-};
+};
#endif /* CONFIG_LPC17_SSP2 */
/****************************************************************************
@@ -462,7 +462,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
cpsdvsr = (cpsdvsr + 1) & ~1;
/* Save the new CPSDVSR and SCR values */
-
+
ssp_putreg(priv, LPC17_SSP_CPSR_OFFSET, cpsdvsr);
regval = ssp_getreg(priv, LPC17_SSP_CR0_OFFSET);
@@ -520,19 +520,19 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
{
case SPIDEV_MODE0: /* CPOL=0; CPHA=0 */
break;
-
+
case SPIDEV_MODE1: /* CPOL=0; CPHA=1 */
regval |= SSP_CR0_CPHA;
break;
-
+
case SPIDEV_MODE2: /* CPOL=1; CPHA=0 */
regval |= SSP_CR0_CPOL;
break;
-
+
case SPIDEV_MODE3: /* CPOL=1; CPHA=1 */
regval |= (SSP_CR0_CPOL|SSP_CR0_CPHA);
break;
-
+
default:
sspdbg("Bad mode: %d\n", mode);
DEBUGASSERT(FALSE);
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_start.c b/nuttx/arch/arm/src/lpc17xx/lpc17_start.c
index 7f8756f4c..80f136f11 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_start.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_start.c
@@ -122,7 +122,7 @@ static inline void lpc17_fpuconfig(void)
* with the volatile FP registers stacked above the basic context.
*/
- regval = getcontrol();
+ regval = getcontrol();
regval |= (1 << 2);
setcontrol(regval);
@@ -152,7 +152,7 @@ static inline void lpc17_fpuconfig(void)
* with the volatile FP registers stacked in the saved context.
*/
- regval = getcontrol();
+ regval = getcontrol();
regval &= ~(1 << 2);
setcontrol(regval);
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
index 938d0c8a7..7dbb2170b 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -1490,7 +1490,7 @@ static void lpc17_usbreset(struct lpc17_usbdev_s *priv)
lpc17_putreg(USB_SLOW_INT|USB_DEVSTATUS_INT|USB_FAST_INT|USB_FRAME_INT|USB_ERROR_INT,
LPC17_USBDEV_INTEN);
- /* Tell the class driver that we are disconnected. The class
+ /* Tell the class driver that we are disconnected. The class
* driver should then accept any new configurations.
*/
@@ -3130,7 +3130,7 @@ static int lpc17_wakeup(struct usbdev_s *dev)
* Name: lpc17_selfpowered
*
* Description:
- * Sets/clears the device selfpowered feature
+ * Sets/clears the device selfpowered feature
*
*******************************************************************************/
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
index 1e1681ee5..c9e1a3a7a 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -271,13 +271,13 @@ static void lpc17_setinttab(uint32_t value, unsigned int interval, unsigned int
#endif
static inline int lpc17_addinted(struct lpc17_usbhost_s *priv,
- FAR const struct usbhost_epdesc_s *epdesc,
+ FAR const struct usbhost_epdesc_s *epdesc,
struct lpc17_ed_s *ed);
static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
struct lpc17_ed_s *ed);
static inline int lpc17_addisoced(struct lpc17_usbhost_s *priv,
- FAR const struct usbhost_epdesc_s *epdesc,
+ FAR const struct usbhost_epdesc_s *epdesc,
struct lpc17_ed_s *ed);
static inline int lpc17_remisoced(struct lpc17_usbhost_s *priv,
struct lpc17_ed_s *ed);
@@ -724,7 +724,7 @@ static void lpc17_freeio(uint8_t *buffer)
* Helper function to add an ED to the bulk list.
*
*******************************************************************************/
-
+
static inline int lpc17_addbulked(struct lpc17_usbhost_s *priv,
struct lpc17_ed_s *ed)
{
@@ -757,7 +757,7 @@ static inline int lpc17_addbulked(struct lpc17_usbhost_s *priv,
* Helper function remove an ED from the bulk list.
*
*******************************************************************************/
-
+
static inline int lpc17_rembulked(struct lpc17_usbhost_s *priv,
struct lpc17_ed_s *ed)
{
@@ -891,9 +891,9 @@ static void lpc17_setinttab(uint32_t value, unsigned int interval, unsigned int
* 2. Some devices may get polled at a much higher rate than they request.
*
*******************************************************************************/
-
+
static inline int lpc17_addinted(struct lpc17_usbhost_s *priv,
- FAR const struct usbhost_epdesc_s *epdesc,
+ FAR const struct usbhost_epdesc_s *epdesc,
struct lpc17_ed_s *ed)
{
#ifndef CONFIG_USBHOST_INT_DISABLE
@@ -1000,7 +1000,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv,
* 2. Some devices may get polled at a much higher rate than they request.
*
*******************************************************************************/
-
+
static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
struct lpc17_ed_s *ed)
{
@@ -1088,7 +1088,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
uvdbg("min interval: %d offset: %d\n", interval, offset);
/* Save the new minimum interval */
-
+
if ((ed->hw.ctrl && ED_CONTROL_D_MASK) == ED_CONTROL_D_IN)
{
priv->ininterval = interval;
@@ -1127,9 +1127,9 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
* Helper functions to add an ED to the periodic table.
*
*******************************************************************************/
-
+
static inline int lpc17_addisoced(struct lpc17_usbhost_s *priv,
- FAR const struct usbhost_epdesc_s *epdesc,
+ FAR const struct usbhost_epdesc_s *epdesc,
struct lpc17_ed_s *ed)
{
#ifndef CONFIG_USBHOST_ISOC_DISABLE
@@ -1146,7 +1146,7 @@ static inline int lpc17_addisoced(struct lpc17_usbhost_s *priv,
* Helper functions to remove an ED from the periodic table.
*
*******************************************************************************/
-
+
static inline int lpc17_remisoced(struct lpc17_usbhost_s *priv,
struct lpc17_ed_s *ed)
{
@@ -1302,7 +1302,7 @@ static int lpc17_ctrltd(struct lpc17_usbhost_s *priv, uint32_t dirpid,
{
ret = OK;
}
- else
+ else
{
uvdbg("Bad TD completion status: %d\n", EDCTRL->tdstatus);
ret = EDCTRL->tdstatus == TD_CC_STALL ? -EPERM : -EIO;
@@ -1397,7 +1397,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
}
/* Check if we are now disconnected */
-
+
else if (priv->connected)
{
/* Yes.. disconnect the device */
@@ -1446,7 +1446,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
}
/* Writeback Done Head interrupt */
-
+
if ((pending & OHCI_INT_WDH) != 0)
{
struct lpc17_gtd_s *td;
@@ -1617,7 +1617,7 @@ static int lpc17_enumerate(FAR struct usbhost_connection_s *conn, int rphndx)
udbg("Not connected\n");
return -ENODEV;
}
-
+
/* USB 2.0 spec says at least 50ms delay before port reset */
(void)usleep(100*1000);
@@ -1681,7 +1681,7 @@ static int lpc17_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcadd
/* Set the EP0 ED control word */
- EDCTRL->hw.ctrl = (uint32_t)funcaddr << ED_CONTROL_FA_SHIFT |
+ EDCTRL->hw.ctrl = (uint32_t)funcaddr << ED_CONTROL_FA_SHIFT |
(uint32_t)maxpacketsize << ED_CONTROL_MPS_SHIFT;
if (priv->lowspeed)
@@ -1780,9 +1780,9 @@ static int lpc17_epalloc(FAR struct usbhost_driver_s *drvr,
g_edfree = ((struct lpc17_list_s*)ed)->flink;
/* Configure the endpoint descriptor. */
-
+
memset((void*)ed, 0, sizeof(struct lpc17_ed_s));
- ed->hw.ctrl = (uint32_t)(epdesc->funcaddr) << ED_CONTROL_FA_SHIFT |
+ ed->hw.ctrl = (uint32_t)(epdesc->funcaddr) << ED_CONTROL_FA_SHIFT |
(uint32_t)(epdesc->addr) << ED_CONTROL_EN_SHIFT |
(uint32_t)(epdesc->mxpacketsize) << ED_CONTROL_MPS_SHIFT;
@@ -2259,7 +2259,7 @@ static int lpc17_ctrlout(FAR struct usbhost_driver_s *drvr,
* - Never called from an interrupt handler.
*
*******************************************************************************/
-
+
static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
FAR uint8_t *buffer, size_t buflen)
{
@@ -2277,10 +2277,10 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
in = (ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN;
uvdbg("EP%d %s toggle:%d maxpacket:%d buflen:%d\n",
- (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT,
+ (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT,
in ? "IN" : "OUT",
(ed->hw.headp & ED_HEADP_C) != 0 ? 1 : 0,
- (ed->hw.ctrl & ED_CONTROL_MPS_MASK) >> ED_CONTROL_MPS_SHIFT,
+ (ed->hw.ctrl & ED_CONTROL_MPS_MASK) >> ED_CONTROL_MPS_SHIFT,
buflen);
/* We must have exclusive access to the endpoint, the TD pool, the I/O buffer
@@ -2360,7 +2360,7 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
/* BulkListFilled. This bit is used to indicate whether there are any
* TDs on the Bulk list.
*/
-
+
regval = lpc17_getreg(LPC17_USBHOST_CMDST);
regval |= OHCI_CMDST_BLF;
lpc17_putreg(regval, LPC17_USBHOST_CMDST);
@@ -2375,7 +2375,7 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
{
ret = OK;
}
- else
+ else
{
uvdbg("Bad TD completion status: %d\n", ed->tdstatus);
ret = -EIO;
@@ -2443,7 +2443,7 @@ static void lpc17_disconnect(FAR struct usbhost_driver_s *drvr)
priv->class = NULL;
}
-
+
/*******************************************************************************
* Initialization
*******************************************************************************/
@@ -2687,11 +2687,11 @@ FAR struct usbhost_connection_s *lpc17_usbhost_initialize(int controller)
/* Software reset */
lpc17_putreg(OHCI_CMDST_HCR, LPC17_USBHOST_CMDST);
-
+
/* Write Fm interval (FI), largest data packet counter (FSMPS), and
* periodic start.
*/
-
+
lpc17_putreg(DEFAULT_FMINTERVAL, LPC17_USBHOST_FMINT);
lpc17_putreg(DEFAULT_PERSTART, LPC17_USBHOST_PERSTART);
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c b/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c
index a9bddfc8c..8a2d23dde 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c
@@ -98,7 +98,7 @@ void lpc17_userspace(void)
/* Initialize all of user-space .data */
DEBUGASSERT(USERSPACE->us_datasource != 0 &&
- USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 &&
+ USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 &&
USERSPACE->us_datastart <= USERSPACE->us_dataend);
src = (uint8_t*)USERSPACE->us_datasource;