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/arm/src/samd | |
parent | 3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff) | |
download | nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2 nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip |
More trailing whilespace removal
Diffstat (limited to 'nuttx/arch/arm/src/samd')
-rw-r--r-- | nuttx/arch/arm/src/samd/Make.defs | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/samd/sam_clockconfig.c | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/samd/sam_idle.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/samd/sam_port.c | 14 | ||||
-rw-r--r-- | nuttx/arch/arm/src/samd/sam_userspace.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/nuttx/arch/arm/src/samd/Make.defs b/nuttx/arch/arm/src/samd/Make.defs index 602a0fbed..d1630b414 100644 --- a/nuttx/arch/arm/src/samd/Make.defs +++ b/nuttx/arch/arm/src/samd/Make.defs @@ -33,7 +33,7 @@ # ############################################################################ -HEAD_ASRC = +HEAD_ASRC = CMN_ASRCS = up_exception.S up_saveusercontext.S up_fullcontextrestore.S CMN_ASRCS += up_switchcontext.S vfork.S @@ -67,7 +67,7 @@ ifeq ($(CONFIG_DEBUG),y) CMN_CSRCS += up_dumpnvic.c endif -CHIP_ASRCS = +CHIP_ASRCS = CHIP_CSRCS = sam_clockconfig.c sam_idle.c sam_irq.c sam_lowputc.c CHIP_CSRCS += sam_port.c sam_sercom.c sam_serial.c sam_start.c CHIP_CSRCS += sam_timerisr.c sam_usart.c diff --git a/nuttx/arch/arm/src/samd/sam_clockconfig.c b/nuttx/arch/arm/src/samd/sam_clockconfig.c index 7556d3b79..0fef4a3b3 100644 --- a/nuttx/arch/arm/src/samd/sam_clockconfig.c +++ b/nuttx/arch/arm/src/samd/sam_clockconfig.c @@ -821,7 +821,7 @@ static inline void sam_gclk_config(FAR const struct sam_gclkconfig_s *config) /* Wait for synchronization */ sam_gclck_waitsyncbusy(); - + /* Select the generator */ putreg32(((uint32_t)config->gclk << GCLK_GENDIV_ID_SHIFT), @@ -897,7 +897,7 @@ static inline void sam_config_gclks(void) /* Wait for the reset to complete */ while ((getreg8(SAM_GCLK_CTRL) & GCLK_CTRL_SWRST) != 0); - + /* Configure all GCLK generators, skipping GLCK_MAIN which is configured * below. */ diff --git a/nuttx/arch/arm/src/samd/sam_idle.c b/nuttx/arch/arm/src/samd/sam_idle.c index ea18904bf..8b8d3565b 100644 --- a/nuttx/arch/arm/src/samd/sam_idle.c +++ b/nuttx/arch/arm/src/samd/sam_idle.c @@ -87,7 +87,7 @@ static void up_idlepm(void) enum pm_state_e newstate; irqstate_t flags; int ret; - + /* Decide, which power saving level can be obtained */ newstate = pm_checkstate(); diff --git a/nuttx/arch/arm/src/samd/sam_port.c b/nuttx/arch/arm/src/samd/sam_port.c index 42a732227..8614383ee 100644 --- a/nuttx/arch/arm/src/samd/sam_port.c +++ b/nuttx/arch/arm/src/samd/sam_port.c @@ -177,8 +177,8 @@ static inline void sam_configinput(uintptr_t base, port_pinset_t pinset) break; } - /* Configure the pin as an input */ - + /* Configure the pin as an input */ + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } @@ -281,8 +281,8 @@ static inline void sam_configoutput(uintptr_t base, port_pinset_t pinset) regval |= PORT_WRCONFIG_DRVSTR; } - /* Configure the pin as an output */ - + /* Configure the pin as an output */ + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } @@ -356,8 +356,8 @@ static inline void sam_configperiph(uintptr_t base, port_pinset_t pinset) break; } - /* Configure the pin for the peripheral function */ - + /* Configure the pin for the peripheral function */ + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } @@ -410,7 +410,7 @@ static inline void sam_configreset(uintptr_t base, port_pinset_t pinset) /* Disable the peripheral multiplexor, disable the input, disable * pull-up/down, reset driver strength, etc. */ - + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } diff --git a/nuttx/arch/arm/src/samd/sam_userspace.c b/nuttx/arch/arm/src/samd/sam_userspace.c index 71bbb1ba3..0f40d617e 100644 --- a/nuttx/arch/arm/src/samd/sam_userspace.c +++ b/nuttx/arch/arm/src/samd/sam_userspace.c @@ -97,7 +97,7 @@ void sam_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; |