aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-17 18:30:29 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-17 18:30:29 +0000
commitca6cbafae34a25b1f63e1547ed69e3239f63d475 (patch)
treedcd7d586cc445179ed2dacaa5b249d4a6c5fae97 /os
parent76802b45d7f67f2e9db1bb6e8a1e11757b0abe2d (diff)
downloadChibiOS-ca6cbafae34a25b1f63e1547ed69e3239f63d475.tar.gz
ChibiOS-ca6cbafae34a25b1f63e1547ed69e3239f63d475.tar.bz2
ChibiOS-ca6cbafae34a25b1f63e1547ed69e3239f63d475.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1625 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/hal/platforms/LPC214x/serial_lld.c12
-rw-r--r--os/hal/platforms/LPC214x/serial_lld.h16
2 files changed, 14 insertions, 14 deletions
diff --git a/os/hal/platforms/LPC214x/serial_lld.c b/os/hal/platforms/LPC214x/serial_lld.c
index b44e5eaf9..5f01bcf48 100644
--- a/os/hal/platforms/LPC214x/serial_lld.c
+++ b/os/hal/platforms/LPC214x/serial_lld.c
@@ -266,12 +266,12 @@ void sd_lld_init(void) {
#if USE_LPC214x_UART0
sdObjectInit(&SD1, NULL, notify1);
SD1.uart = U0Base;
- SetVICVector(UART0IrqHandler, LPC214x_UART1_PRIORITY, SOURCE_UART0);
+ SetVICVector(UART0IrqHandler, LPC214x_UART0_PRIORITY, SOURCE_UART0);
#endif
#if USE_LPC214x_UART1
sdObjectInit(&SD2, NULL, notify2);
SD2.uart = U1Base;
- SetVICVector(UART1IrqHandler, LPC214x_UART2_PRIORITY, SOURCE_UART1);
+ SetVICVector(UART1IrqHandler, LPC214x_UART1_PRIORITY, SOURCE_UART1);
#endif
}
@@ -286,13 +286,13 @@ void sd_lld_start(SerialDriver *sdp) {
sdp->config = &default_config;
if (sdp->state == SD_STOP) {
-#if USE_LPC214x_UART1
+#if USE_LPC214x_UART0
if (&SD1 == sdp) {
PCONP = (PCONP & PCALL) | PCUART0;
VICIntEnable = INTMASK(SOURCE_UART0);
}
#endif
-#if USE_LPC214x_UART2
+#if USE_LPC214x_UART1
if (&SD2 == sdp) {
PCONP = (PCONP & PCALL) | PCUART1;
VICIntEnable = INTMASK(SOURCE_UART1);
@@ -313,14 +313,14 @@ void sd_lld_stop(SerialDriver *sdp) {
if (sdp->state == SD_READY) {
uart_deinit(sdp->uart);
-#if USE_LPC214x_UART1
+#if USE_LPC214x_UART0
if (&SD1 == sdp) {
PCONP = (PCONP & PCALL) & ~PCUART0;
VICIntEnClear = INTMASK(SOURCE_UART0);
return;
}
#endif
-#if USE_LPC214x_UART2
+#if USE_LPC214x_UART1
if (&SD2 == sdp) {
PCONP = (PCONP & PCALL) & ~PCUART1;
VICIntEnClear = INTMASK(SOURCE_UART1);
diff --git a/os/hal/platforms/LPC214x/serial_lld.h b/os/hal/platforms/LPC214x/serial_lld.h
index 3e0e4200f..fe2746dea 100644
--- a/os/hal/platforms/LPC214x/serial_lld.h
+++ b/os/hal/platforms/LPC214x/serial_lld.h
@@ -39,7 +39,7 @@
/**
* @brief UART0 driver enable switch.
- * @details If set to @p TRUE the support for USART1 is included.
+ * @details If set to @p TRUE the support for UART0 is included.
* @note The default is @p TRUE .
*/
#if !defined(USE_LPC214x_UART0) || defined(__DOXYGEN__)
@@ -48,7 +48,7 @@
/**
* @brief UART1 driver enable switch.
- * @details If set to @p TRUE the support for USART2 is included.
+ * @details If set to @p TRUE the support for UART1 is included.
* @note The default is @p TRUE.
*/
#if !defined(USE_LPC214x_UART1) || defined(__DOXYGEN__)
@@ -69,17 +69,17 @@
#endif
/**
- * @brief UART1 interrupt priority level setting.
+ * @brief UART0 interrupt priority level setting.
*/
-#if !defined(LPC214x_UART1_PRIORITY) || defined(__DOXYGEN__)
-#define LPC214x_UART1_PRIORITY 1
+#if !defined(LPC214x_UART0_PRIORITY) || defined(__DOXYGEN__)
+#define LPC214x_UART0_PRIORITY 1
#endif
/**
- * @brief UART2 interrupt priority level setting.
+ * @brief UART1 interrupt priority level setting.
*/
-#if !defined(LPC214x_UART2_PRIORITY) || defined(__DOXYGEN__)
-#define LPC214x_UART2_PRIORITY 2
+#if !defined(LPC214x_UART1_PRIORITY) || defined(__DOXYGEN__)
+#define LPC214x_UART1_PRIORITY 2
#endif
/*===========================================================================*/