diff options
Diffstat (limited to 'nuttx/arch/arm/src/kinetis')
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_clrpend.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_enet.h | 20 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_lowputc.c | 20 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_memorymap.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_serial.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_timerisr.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_userspace.c | 2 |
9 files changed, 31 insertions, 31 deletions
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c b/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c index ad6e42884..c4012d8bc 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c @@ -62,7 +62,7 @@ /**************************************************************************** * Private Function Prototypes ****************************************************************************/ - + void __ramfunc__ kinesis_setdividers(uint32_t div1, uint32_t div2, uint32_t div3, uint32_t div4); @@ -205,8 +205,8 @@ void kinetis_pllconfig(void) * Flash clock = MCG / BOARD_OUTDIV4 */ - kinesis_setdividers(BOARD_OUTDIV1, BOARD_OUTDIV2, BOARD_OUTDIV3, BOARD_OUTDIV4); - + kinesis_setdividers(BOARD_OUTDIV1, BOARD_OUTDIV2, BOARD_OUTDIV3, BOARD_OUTDIV4); + /* Set the VCO divider, VDIV, is defined in the board.h file. VDIV * selects the amount to divide the VCO output of the PLL. The VDIV bits * establish the multiplication factor applied to the reference clock @@ -352,7 +352,7 @@ kinesis_setdividers(uint32_t div1, uint32_t div2, uint32_t div3, uint32_t div4) /* Save the current value of the Flash Access Protection Register */ regval = getreg32(KINETIS_FMC_PFAPR); - + /* Set M0PFD through M7PFD to 1 to disable prefetch */ putreg32(FMC_PFAPR_M7PFD | FMC_PFAPR_M6PFD | FMC_PFAPR_M5PFD | @@ -369,7 +369,7 @@ kinesis_setdividers(uint32_t div1, uint32_t div2, uint32_t div3, uint32_t div4) /* Wait for dividers to change */ for (i = 0 ; i < div4 ; i++); - + /* Re-store the saved value of FMC_PFAPR */ putreg32(regval, KINETIS_FMC_PFAPR); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c b/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c index 2837d867f..97ae5a610 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c @@ -71,7 +71,7 @@ * * Description: * Clear a pending interrupt at the NVIC. This does not seem to be required - * for most interrupts. Don't know why... + * for most interrupts. Don't know why... * * I keep it in a separate file so that it will not increase the footprint * on Kinetis platforms that do not need this function. diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.h b/nuttx/arch/arm/src/kinetis/kinetis_enet.h index 0a5e78ea9..1843afcd0 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.h @@ -295,7 +295,7 @@ /* Receive Descriptor Ring Start Register */ /* Bits 0-2: Reserved */ #define ENET_RDSR_SHIFT (3) /* Bits 3-31: Start of the receive buffer descriptor queue */ -#define ENET_RDSR_MASK (0xfffffff8) +#define ENET_RDSR_MASK (0xfffffff8) /* Transmit Buffer Descriptor Ring Start Register */ /* Bits 0-2: Reserved */ @@ -476,9 +476,9 @@ #ifdef CONFIG_ENDIAN_BIG # define TXDESC_TSE (1 << 8) -# define TXDESC_OE (1 << 9) -# define TXDESC_LCE (1 << 10) -# define TXDESC_FE (1 << 11) +# define TXDESC_OE (1 << 9) +# define TXDESC_LCE (1 << 10) +# define TXDESC_FE (1 << 11) # define TXDESC_EE (1 << 12) # define TXDESC_UE (1 << 13) # define TXDESC_TXE (1 << 15) @@ -495,15 +495,15 @@ # define TXDESC_TS (1 << 5) # define TXDESC_INT (1 << 6) -# define TXDESC_TSE (1 << 16) -# define TXDESC_OE (1 << 17) -# define TXDESC_LCE (1 << 18) -# define TXDESC_FE (1 << 19) +# define TXDESC_TSE (1 << 16) +# define TXDESC_OE (1 << 17) +# define TXDESC_LCE (1 << 18) +# define TXDESC_FE (1 << 19) # define TXDESC_EE (1 << 20) # define TXDESC_UE (1 << 21) # define TXDESC_TXE (1 << 23) -# define TXDESC_BDU (1 << 7) +# define TXDESC_BDU (1 << 7) #endif /* Legacy (and Common) RX Buffer Descriptor Bit Definitions */ @@ -552,7 +552,7 @@ # define RXDESC_PE (1 << 26) # define RXDESC_ME (1 << 31) -# define RXDESC_BDU (1 << 31) +# define RXDESC_BDU (1 << 31) #else # define RXDESC_UC (1 << 0) # define RXDESC_CE (1 << 1) diff --git a/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h b/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h index 2c77dd4ba..199a02a0d 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h @@ -47,7 +47,7 @@ /******************************************************************************************** * Pre-processor Definitions ********************************************************************************************/ -/* Reference: Paragraph 10.3.1, p 258, of FreeScale document K60P144M100SF2RM +/* Reference: Paragraph 10.3.1, p 258, of FreeScale document K60P144M100SF2RM * * In most cases, there are alternative configurations for various pins. Those alternative * pins are labeled with a suffix like _1, _2, etc. in order to distinguish them. Logic in diff --git a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c index f52d3ba35..c3599618c 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c @@ -56,7 +56,7 @@ /************************************************************************** * Private Definitions **************************************************************************/ - + /* Select UART parameters for the selected console */ #if defined(CONFIG_UART0_SERIAL_CONSOLE) @@ -126,7 +126,7 @@ static uint8_t g_sizemap[8] = {1, 4, 8, 16, 32, 64, 128, 0}; /************************************************************************** * Private Functions **************************************************************************/ - + /************************************************************************** * Public Functions **************************************************************************/ @@ -347,7 +347,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, { regval |= UART_C1_M; } - + /* The only other option is 8-bit operation */ else @@ -361,7 +361,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, sbr = clock / (baud << 4); DEBUGASSERT(sbr < 0x2000); - + /* Save the new baud divisor, retaining other bits in the UARTx_BDH * register. */ @@ -373,7 +373,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, regval = sbr & 0xff; putreg8(regval, uart_base+KINETIS_UART_BDL_OFFSET); - + /* Calculate a fractional divider to get closer to the requested baud. * The fractional divider, BRFA, is a 5 bit fractional value that is * logically added to the SBR: @@ -386,7 +386,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, tmp = clock - (sbr * (baud << 4)); brfa = (tmp << 5) / (baud << 4); - + /* Set the BRFA field (retaining other bits in the UARTx_C4 register) */ regval = getreg8(uart_base+KINETIS_UART_C4_OFFSET) & UART_C4_BRFA_MASK; @@ -412,14 +412,14 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, depth = (3 * depth) >> 2; } putreg8(depth , uart_base+KINETIS_UART_RWFIFO_OFFSET); - + depth = g_sizemap[(regval & UART_PFIFO_TXFIFOSIZE_MASK) >> UART_PFIFO_TXFIFOSIZE_SHIFT]; if (depth > 3) { depth = (depth >> 2); } putreg8(depth, uart_base+KINETIS_UART_TWFIFO_OFFSET); - + /* Enable RX and TX FIFOs */ putreg8(UART_PFIFO_RXFE | UART_PFIFO_TXFE, uart_base+KINETIS_UART_PFIFO_OFFSET); @@ -431,8 +431,8 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, * (1 in this case) is less than or equal to 0. * RWFIFO[RXWATER] = 1: RDRF will be set when the number of queued bytes * (1 in this case) is greater than or equal to 1. - * - * Set the watermarks to one/zero and disable the FIFOs + * + * Set the watermarks to one/zero and disable the FIFOs */ putreg8(1, uart_base+KINETIS_UART_RWFIFO_OFFSET); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h b/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h index 7253717bd..ef1d22265 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h @@ -185,7 +185,7 @@ # define KINETIS_MCM_BASE 0xe0080000 /* Miscellaneous Control Module (including ETB Almost Full) */ # define KINETIS_ROMTAB_BASE 0xe00ff000 /* ROM Table - allows auto-detection of debug components */ -/* K60 Family +/* K60 Family * * The memory map for the following parts is defined in Freescale document * K60P144M100SF2RM diff --git a/nuttx/arch/arm/src/kinetis/kinetis_serial.c b/nuttx/arch/arm/src/kinetis/kinetis_serial.c index fc74f22ba..4cf414fd6 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_serial.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_serial.c @@ -707,7 +707,7 @@ static int up_attach(struct uart_dev_s *dev) static void up_detach(struct uart_dev_s *dev) { struct up_dev_s *priv = (struct up_dev_s*)dev->priv; - + /* Disable interrupts */ up_restoreuartint(priv, 0); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c b/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c index 9f9f14ba6..8dd514a9c 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c @@ -126,7 +126,7 @@ void up_timerinit(void) regval |= (NVIC_SYSH_PRIORITY_DEFAULT << NVIC_SYSH_PRIORITY_PR15_SHIFT); putreg32(regval, NVIC_SYSH12_15_PRIORITY); - /* Note that is should not be neccesary to set the SYSTICK clock source: + /* Note that is should not be neccesary to set the SYSTICK clock source: * "The CLKSOURCE bit in SysTick Control and Status register is always set * to select the core clock." */ diff --git a/nuttx/arch/arm/src/kinetis/kinetis_userspace.c b/nuttx/arch/arm/src/kinetis/kinetis_userspace.c index 75b3c08fd..d0d57145d 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_userspace.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_userspace.c @@ -98,7 +98,7 @@ void kinetis_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; |