sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Purely cosmetic changes from review of last PR.

Browse Source
This commit is contained in:
Gregory Nutt 2017-02-25 11:43:05 -06:00
parent 38df949adc
commit 90e63ba18e
3 changed files with 57 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm/src/kinetis/kinetis_lowputc.c
View File

@ -127,7 +127,6 @@
# endif # endif
#endif /* HAVE_UART_CONSOLE */ #endif /* HAVE_UART_CONSOLE */
#if defined(HAVE_LPUART_CONSOLE) #if defined(HAVE_LPUART_CONSOLE)
# if ((CONSOLE_FREQ / (CONSOLE_BAUD * 32)) > (LPUART_BAUD_SBR_MASK >> LPUART_BAUD_SBR_SHIFT)) # if ((CONSOLE_FREQ / (CONSOLE_BAUD * 32)) > (LPUART_BAUD_SBR_MASK >> LPUART_BAUD_SBR_SHIFT))
# error "LPUART Console: Baud rate not obtainable with this input clock!" # error "LPUART Console: Baud rate not obtainable with this input clock!"
@ -140,17 +139,6 @@
LPUART_BAUD_M10 | LPUART_BAUD_MAEN2 | \ LPUART_BAUD_M10 | LPUART_BAUD_MAEN2 | \
LPUART_BAUD_MAEN2) LPUART_BAUD_MAEN2)
#endif #endif
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@ -161,13 +149,12 @@
*/ */
#ifdef CONFIG_KINETIS_UARTFIFOS #ifdef CONFIG_KINETIS_UARTFIFOS
static uint8_t g_sizemap[8] = {1, 4, 8, 16, 32, 64, 128, 0}; static uint8_t g_sizemap[8] =
{
1, 4, 8, 16, 32, 64, 128, 0
};
#endif #endif
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -314,6 +301,7 @@ void kinetis_lowsetup(void)
CONSOLE_PARITY, CONSOLE_BITS, CONSOLE_2STOP); CONSOLE_PARITY, CONSOLE_BITS, CONSOLE_2STOP);
# endif # endif
#endif /* HAVE_UART_DEVICE */ #endif /* HAVE_UART_DEVICE */
#if HAVE_LPUART_DEVICE #if HAVE_LPUART_DEVICE
/* Clocking Source for LPUARTs 0 selected in SIM_SOPT2 */ /* Clocking Source for LPUARTs 0 selected in SIM_SOPT2 */
@ -521,6 +509,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud,
{ {
depth = (3 * depth) >> 2; depth = (3 * depth) >> 2;
} }
putreg8(depth , uart_base+KINETIS_UART_RWFIFO_OFFSET); putreg8(depth , uart_base+KINETIS_UART_RWFIFO_OFFSET);
depth = g_sizemap[(regval & UART_PFIFO_TXFIFOSIZE_MASK) >> UART_PFIFO_TXFIFOSIZE_SHIFT]; depth = g_sizemap[(regval & UART_PFIFO_TXFIFOSIZE_MASK) >> UART_PFIFO_TXFIFOSIZE_SHIFT];
@ -528,6 +517,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud,
{ {
depth = (depth >> 2); depth = (depth >> 2);
} }
putreg8(depth, uart_base+KINETIS_UART_TWFIFO_OFFSET); putreg8(depth, uart_base+KINETIS_UART_TWFIFO_OFFSET);
/* Enable RX and TX FIFOs */ /* Enable RX and TX FIFOs */
@ -552,7 +542,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud,
/* Now we can (re-)enable the transmitter and receiver */ /* Now we can (re-)enable the transmitter and receiver */
regval = getreg8(uart_base+KINETIS_UART_C2_OFFSET); regval = getreg8(uart_base+KINETIS_UART_C2_OFFSET);
regval |= (UART_C2_RE | UART_C2_TE); regval |= (UART_C2_RE | UART_C2_TE);
putreg8(regval, uart_base+KINETIS_UART_C2_OFFSET); putreg8(regval, uart_base+KINETIS_UART_C2_OFFSET);
} }
@ -635,6 +625,7 @@ void kinetis_lpuartconfigure(uintptr_t uart_base, uint32_t baud,
osrreg = osr; osrreg = osr;
} }
} }
UNUSED(actual_baud); UNUSED(actual_baud);
DEBUGASSERT(actual_baud-baud < (baud /100) * 2); DEBUGASSERT(actual_baud-baud < (baud /100) * 2);
DEBUGASSERT(sbrreg != 0 && sbrreg < 8192); DEBUGASSERT(sbrreg != 0 && sbrreg < 8192);

75
arch/arm/src/kinetis/kinetis_lpserial.c
View File

@ -66,6 +66,7 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Some sanity checks *******************************************************/ /* Some sanity checks *******************************************************/
/* Is there at least one LPUART enabled and configured as a RS-232 device? */ /* Is there at least one LPUART enabled and configured as a RS-232 device? */
@ -107,35 +108,35 @@
/* Pick ttys1. This could be any of LPUART0-1 excluding the console LPUART. */ /* Pick ttys1. This could be any of LPUART0-1 excluding the console LPUART. */
#if defined(CONFIG_KINETIS_LPUART0) && !defined(LPUART0_ASSIGNED) #if defined(CONFIG_KINETIS_LPUART0) && !defined(LPUART0_ASSIGNED)
# define TTYS1_DEV g_lpuart0port /* LPUART0 is ttyS1 */ # define TTYS1_DEV g_lpuart0port /* LPUART0 is ttyS1 */
# define LPUART0_ASSIGNED 1 # define LPUART0_ASSIGNED 1
#elif defined(CONFIG_KINETIS_LPUART1) && !defined(LPUART1_ASSIGNED) #elif defined(CONFIG_KINETIS_LPUART1) && !defined(LPUART1_ASSIGNED)
# define TTYS1_DEV g_lpuart1port /* LPUART1 is ttyS1 */ # define TTYS1_DEV g_lpuart1port /* LPUART1 is ttyS1 */
# define LPUART1_ASSIGNED 1 # define LPUART1_ASSIGNED 1
#endif #endif
#define LPUART_CTRL_ERROR_INTS (LPUART_CTRL_ORIE | LPUART_CTRL_FEIE | \ #define LPUART_CTRL_ERROR_INTS (LPUART_CTRL_ORIE | LPUART_CTRL_FEIE | \
LPUART_CTRL_NEIE | LPUART_CTRL_PEIE) LPUART_CTRL_NEIE | LPUART_CTRL_PEIE)
#define LPUART_CTRL_RX_INTS LPUART_CTRL_RIE #define LPUART_CTRL_RX_INTS LPUART_CTRL_RIE
#define LPUART_CTRL_TX_INTS LPUART_CTRL_TIE #define LPUART_CTRL_TX_INTS LPUART_CTRL_TIE
#define LPUART_CTRL_ALL_INTS (LPUART_CTRL_TX_INTS | LPUART_CTRL_RX_INTS | \ #define LPUART_CTRL_ALL_INTS (LPUART_CTRL_TX_INTS | LPUART_CTRL_RX_INTS | \
LPUART_CTRL_MA1IE | LPUART_CTRL_MA1IE | \ LPUART_CTRL_MA1IE | LPUART_CTRL_MA1IE | \
LPUART_CTRL_ILIE | LPUART_CTRL_TCIE) LPUART_CTRL_ILIE | LPUART_CTRL_TCIE)
#define LPUART_STAT_ERRORS (LPUART_STAT_OR | LPUART_STAT_FE | \ #define LPUART_STAT_ERRORS (LPUART_STAT_OR | LPUART_STAT_FE | \
LPUART_STAT_PF | LPUART_STAT_NF) LPUART_STAT_PF | LPUART_STAT_NF)
/* The LPUART does not have an common set of aligned bits for the interrupt /* The LPUART does not have an common set of aligned bits for the interrupt
* enable and the status. So map the ctrl to the stat bits * enable and the status. So map the ctrl to the stat bits
*/ */
#define LPUART_CTRL_TR_INTS (LPUART_CTRL_TX_INTS | LPUART_CTRL_RX_INTS) #define LPUART_CTRL_TR_INTS (LPUART_CTRL_TX_INTS | LPUART_CTRL_RX_INTS)
#define LPUART_CTRL2STAT(c) ((((c) & LPUART_CTRL_ERROR_INTS) >> 8) | \ #define LPUART_CTRL2STAT(c) ((((c) & LPUART_CTRL_ERROR_INTS) >> 8) | \
((c) & (LPUART_CTRL_TR_INTS))) ((c) & (LPUART_CTRL_TR_INTS)))
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -277,7 +278,8 @@ static uart_dev_t g_lpuart1port =
* Name: kinetis_serialin * Name: kinetis_serialin
****************************************************************************/ ****************************************************************************/
static inline uint32_t kinetis_serialin(struct kinetis_dev_s *priv, int offset) static inline uint32_t kinetis_serialin(struct kinetis_dev_s *priv,
int offset)
{ {
return getreg32(priv->uartbase + offset); return getreg32(priv->uartbase + offset);
} }
@ -286,7 +288,8 @@ static inline uint32_t kinetis_serialin(struct kinetis_dev_s *priv, int offset)
* Name: kinetis_serialout * Name: kinetis_serialout
****************************************************************************/ ****************************************************************************/
static inline void kinetis_serialout(struct kinetis_dev_s *priv, int offset, uint32_t value) static inline void kinetis_serialout(struct kinetis_dev_s *priv, int offset,
uint32_t value)
{ {
putreg32(value, priv->uartbase + offset); putreg32(value, priv->uartbase + offset);
} }
@ -403,14 +406,15 @@ static void kinetis_shutdown(struct uart_dev_s *dev)
* Name: kinetis_attach * Name: kinetis_attach
* *
* Description: * Description:
* Configure the LPUART to operation in interrupt driven mode. This method is * Configure the LPUART to operation in interrupt driven mode. This
* called when the serial port is opened. Normally, this is just after the * method is called when the serial port is opened. Normally, this is
* the setup() method is called, however, the serial console may operate in * just after the the setup() method is called, however, the serial
* a non-interrupt driven mode during the boot phase. * console may operate in a non-interrupt driven mode during the boot phase.
* *
* RX and TX interrupts are not enabled when by the attach method (unless the * RX and TX interrupts are not enabled when by the attach method (unless
* hardware supports multiple levels of interrupt enabling). The RX and TX * the hardware supports multiple levels of interrupt enabling). The RX
* interrupts are not enabled until the txint() and rxint() methods are called. * and TX interrupts are not enabled until the txint() and rxint() methods
* are called.
* *
****************************************************************************/ ****************************************************************************/
@ -436,9 +440,9 @@ static int kinetis_attach(struct uart_dev_s *dev)
* Name: kinetis_detach * Name: kinetis_detach
* *
* Description: * Description:
* Detach LPUART interrupts. This method is called when the serial port is * Detach LPUART interrupts. This method is called when the serial port
* closed normally just before the shutdown method is called. The exception * is closed normally just before the shutdown method is called. The
* is the serial console which is never shutdown. * exception is the serial console which is never shutdown.
* *
****************************************************************************/ ****************************************************************************/
@ -460,9 +464,9 @@ static void kinetis_detach(struct uart_dev_s *dev)
* Name: kinetis_interrupts * Name: kinetis_interrupts
* *
* Description: * Description:
* This is the LPUART status interrupt handler. It will be invoked when an * This is the LPUART status interrupt handler. It will be invoked when
* interrupt received on the 'irq' It should call uart_transmitchars or * an interrupt received on the 'irq' It should call uart_transmitchars
* uart_receivechar to perform the appropriate data transfers. The * or uart_receivechar to perform the appropriate data transfers. The
* interrupt handling logic must be able to map the 'irq' number into the * interrupt handling logic must be able to map the 'irq' number into the
* Appropriate uart_dev_s structure in order to call these functions. * Appropriate uart_dev_s structure in order to call these functions.
* *
@ -471,7 +475,7 @@ static void kinetis_detach(struct uart_dev_s *dev)
static int kinetis_interrupt(int irq, void *context) static int kinetis_interrupt(int irq, void *context)
{ {
struct uart_dev_s *dev = NULL; struct uart_dev_s *dev = NULL;
struct kinetis_dev_s *priv; struct kinetis_dev_s *priv;
uint32_t stat; uint32_t stat;
uint32_t ctrl; uint32_t ctrl;
@ -622,6 +626,7 @@ static int kinetis_receive(struct uart_dev_s *dev, uint32_t *status)
struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev->priv; struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev->priv;
uint32_t regval; uint32_t regval;
int data; int data;
/* Get error status information: /* Get error status information:
* *
* OR: Receiver Overrun Flag. To clear OR, when STAT read with OR set, * OR: Receiver Overrun Flag. To clear OR, when STAT read with OR set,
@ -653,6 +658,7 @@ static int kinetis_receive(struct uart_dev_s *dev, uint32_t *status)
{ {
kinetis_serialout(priv, KINETIS_LPUART_STAT_OFFSET, regval); kinetis_serialout(priv, KINETIS_LPUART_STAT_OFFSET, regval);
} }
return data; return data;
} }
@ -672,8 +678,8 @@ static void kinetis_rxint(struct uart_dev_s *dev, bool enable)
flags = enter_critical_section(); flags = enter_critical_section();
if (enable) if (enable)
{ {
/* Receive an interrupt when their is anything in the Rx data register (or an Rx /* Receive an interrupt when their is anything in the Rx data register
* related error occurs). * (or an Rx related error occurs).
*/ */
#ifndef CONFIG_SUPPRESS_SERIAL_INTS #ifndef CONFIG_SUPPRESS_SERIAL_INTS
@ -898,4 +904,3 @@ int up_putc(int ch)
} }
#endif /* USE_SERIALDRIVER */ #endif /* USE_SERIALDRIVER */

17
configs/freedom-k66f/include/board.h
View File

@ -60,7 +60,6 @@
* is 12 MHz oscillator * is 12 MHz oscillator
* *
* X501 a High-frequency, low-power Xtal * X501 a High-frequency, low-power Xtal
*
*/ */
#define BOARD_EXTAL_LP 1 #define BOARD_EXTAL_LP 1
@ -99,10 +98,10 @@
#define BOARD_OUTDIV3 3 /* FlexBus = MCG / 3, 60 MHz */ #define BOARD_OUTDIV3 3 /* FlexBus = MCG / 3, 60 MHz */
#define BOARD_OUTDIV4 7 /* Flash clock = MCG / 7, 25.7 MHz */ #define BOARD_OUTDIV4 7 /* Flash clock = MCG / 7, 25.7 MHz */
#define BOARD_CORECLK_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV1) #define BOARD_CORECLK_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV1)
#define BOARD_BUS_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV2) #define BOARD_BUS_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV2)
#define BOARD_FLEXBUS_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV3) #define BOARD_FLEXBUS_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV3)
#define BOARD_FLASHCLK_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV4) #define BOARD_FLASHCLK_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV4)
/* Use BOARD_MCG_FREQ as the output SIM_SOPT2 MUX selected by /* Use BOARD_MCG_FREQ as the output SIM_SOPT2 MUX selected by
* SIM_SOPT2[PLLFLLSEL] * SIM_SOPT2[PLLFLLSEL]
@ -138,11 +137,11 @@
BOARD_SIM_CLKDIV3_PLLFLLDIV * \ BOARD_SIM_CLKDIV3_PLLFLLDIV * \
BOARD_SIM_CLKDIV3_PLLFLLFRAC) BOARD_SIM_CLKDIV3_PLLFLLFRAC)
#define BOARD_LPUART0_CLKSRC SIM_SOPT2_LPUARTSRC_MCGCLK #define BOARD_LPUART0_CLKSRC SIM_SOPT2_LPUARTSRC_MCGCLK
#define BOARD_LPUART0_FREQ BOARD_SIM_CLKDIV3_FREQ #define BOARD_LPUART0_FREQ BOARD_SIM_CLKDIV3_FREQ
#define BOARD_TPM_CLKSRC SIM_SOPT2_TPMSRC_MCGCLK #define BOARD_TPM_CLKSRC SIM_SOPT2_TPMSRC_MCGCLK
#define BOARD_TPM_FREQ BOARD_SIM_CLKDIV3_FREQ #define BOARD_TPM_FREQ BOARD_SIM_CLKDIV3_FREQ
/* SDHC clocking ********************************************************************/ /* SDHC clocking ********************************************************************/