From 2d052aaf0885b74a42ea774fa9fb8c3843990357 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 13 Apr 2011 18:18:58 +0000 Subject: [PATCH] Cosmetic git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3499 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/include/lpc17xx/irq.h | 2 +- arch/arm/src/lpc17xx/lpc17_serial.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/lpc17xx/irq.h b/arch/arm/include/lpc17xx/irq.h index 7807e0260e..aebdc31596 100755 --- a/arch/arm/include/lpc17xx/irq.h +++ b/arch/arm/include/lpc17xx/irq.h @@ -115,7 +115,7 @@ #define LPC17_IRQ_I2C0 (LPC17_IRQ_EXTINT+10) /* I2C0 SI (state change) */ #define LPC17_IRQ_I2C1 (LPC17_IRQ_EXTINT+11) /* I2C1 SI (state change) */ #define LPC17_IRQ_I2C2 (LPC17_IRQ_EXTINT+12) /* I2C2 SI (state change) */ -#define LPC17_IRQ_SPIF (LPC17_IRQ_EXTINT+13) /* SPI SPI Interrupt Flag (SPIF) +#define LPC17_IRQ_SPIF (LPC17_IRQ_EXTINT+13) /* SPI SPI Interrupt Flag (SPIF) * Mode Fault (MODF) */ #define LPC17_IRQ_SSP0 (LPC17_IRQ_EXTINT+14) /* SSP0 Tx FIFO half empty of SSP0 * Rx FIFO half full of SSP0 diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c index f5c20aca61..146e985ebc 100755 --- a/arch/arm/src/lpc17xx/lpc17_serial.c +++ b/arch/arm/src/lpc17xx/lpc17_serial.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/lpc17xx/lpc17_serial.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -595,7 +595,7 @@ static inline uint32_t lpc17_uartcclkdiv(uint32_t baud) } /************************************************************************************ - * Name: lpc17_uart0config, uart1config, uart2config, nad uart3config + * Name: lpc17_uart0config, uart1config, uart2config, and uart3config * * Descrption: * Configure the UART. UART0/1/2/3 peripherals are configured using the following @@ -1283,6 +1283,7 @@ void up_earlyserialinit(void) #endif up_disableuartint(&g_uart0priv, NULL); #endif + #ifdef CONFIG_LPC17_UART1 g_uart1priv.cclkdiv = lpc17_uartcclkdiv(CONFIG_UART1_BAUD); #ifndef CONFIG_UART1_SERIAL_CONSOLE @@ -1290,6 +1291,7 @@ void up_earlyserialinit(void) #endif up_disableuartint(&g_uart1priv, NULL); #endif + #ifdef CONFIG_LPC17_UART2 g_uart2priv.cclkdiv = lpc17_uartcclkdiv(CONFIG_UART2_BAUD); #ifndef CONFIG_UART2_SERIAL_CONSOLE @@ -1297,6 +1299,7 @@ void up_earlyserialinit(void) #endif up_disableuartint(&g_uart2priv, NULL); #endif + #ifdef CONFIG_LPC17_UART3 g_uart3priv.cclkdiv = lpc17_uartcclkdiv(CONFIG_UART3_BAUD); #ifndef CONFIG_UART3_SERIAL_CONSOLE