andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1625 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2010-02-17 18:30:29 +00:00
parent 76802b45d7
commit ca6cbafae3
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/hal/platforms/LPC214x/serial_lld.c
View File

@ -266,12 +266,12 @@ void sd_lld_init(void) {
#if USE_LPC214x_UART0 #if USE_LPC214x_UART0
sdObjectInit(&SD1, NULL, notify1); sdObjectInit(&SD1, NULL, notify1);
SD1.uart = U0Base; SD1.uart = U0Base;
SetVICVector(UART0IrqHandler, LPC214x_UART1_PRIORITY, SOURCE_UART0); SetVICVector(UART0IrqHandler, LPC214x_UART0_PRIORITY, SOURCE_UART0);
#endif #endif
#if USE_LPC214x_UART1 #if USE_LPC214x_UART1
sdObjectInit(&SD2, NULL, notify2); sdObjectInit(&SD2, NULL, notify2);
SD2.uart = U1Base; SD2.uart = U1Base;
SetVICVector(UART1IrqHandler, LPC214x_UART2_PRIORITY, SOURCE_UART1); SetVICVector(UART1IrqHandler, LPC214x_UART1_PRIORITY, SOURCE_UART1);
#endif #endif
} }
@ -286,13 +286,13 @@ void sd_lld_start(SerialDriver *sdp) {
sdp->config = &default_config; sdp->config = &default_config;
if (sdp->state == SD_STOP) { if (sdp->state == SD_STOP) {
#if USE_LPC214x_UART1 #if USE_LPC214x_UART0
if (&SD1 == sdp) { if (&SD1 == sdp) {
PCONP = (PCONP & PCALL) | PCUART0; PCONP = (PCONP & PCALL) | PCUART0;
VICIntEnable = INTMASK(SOURCE_UART0); VICIntEnable = INTMASK(SOURCE_UART0);
} }
#endif #endif
#if USE_LPC214x_UART2 #if USE_LPC214x_UART1
if (&SD2 == sdp) { if (&SD2 == sdp) {
PCONP = (PCONP & PCALL) | PCUART1; PCONP = (PCONP & PCALL) | PCUART1;
VICIntEnable = INTMASK(SOURCE_UART1); VICIntEnable = INTMASK(SOURCE_UART1);
@ -313,14 +313,14 @@ void sd_lld_stop(SerialDriver *sdp) {
if (sdp->state == SD_READY) { if (sdp->state == SD_READY) {
uart_deinit(sdp->uart); uart_deinit(sdp->uart);
#if USE_LPC214x_UART1 #if USE_LPC214x_UART0
if (&SD1 == sdp) { if (&SD1 == sdp) {
PCONP = (PCONP & PCALL) & ~PCUART0; PCONP = (PCONP & PCALL) & ~PCUART0;
VICIntEnClear = INTMASK(SOURCE_UART0); VICIntEnClear = INTMASK(SOURCE_UART0);
return; return;
} }
#endif #endif
#if USE_LPC214x_UART2 #if USE_LPC214x_UART1
if (&SD2 == sdp) { if (&SD2 == sdp) {
PCONP = (PCONP & PCALL) & ~PCUART1; PCONP = (PCONP & PCALL) & ~PCUART1;
VICIntEnClear = INTMASK(SOURCE_UART1); VICIntEnClear = INTMASK(SOURCE_UART1);

16
os/hal/platforms/LPC214x/serial_lld.h
View File

@ -39,7 +39,7 @@
/** /**
* @brief UART0 driver enable switch. * @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 . * @note The default is @p TRUE .
*/ */
#if !defined(USE_LPC214x_UART0) || defined(__DOXYGEN__) #if !defined(USE_LPC214x_UART0) || defined(__DOXYGEN__)
@ -48,7 +48,7 @@
/** /**
* @brief UART1 driver enable switch. * @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. * @note The default is @p TRUE.
*/ */
#if !defined(USE_LPC214x_UART1) || defined(__DOXYGEN__) #if !defined(USE_LPC214x_UART1) || defined(__DOXYGEN__)
@ -69,17 +69,17 @@
#endif #endif
/** /**
* @brief UART1 interrupt priority level setting. * @brief UART0 interrupt priority level setting.
*/ */
#if !defined(LPC214x_UART1_PRIORITY) || defined(__DOXYGEN__) #if !defined(LPC214x_UART0_PRIORITY) || defined(__DOXYGEN__)
#define LPC214x_UART1_PRIORITY 1 #define LPC214x_UART0_PRIORITY 1
#endif #endif
/** /**
* @brief UART2 interrupt priority level setting. * @brief UART1 interrupt priority level setting.
*/ */
#if !defined(LPC214x_UART2_PRIORITY) || defined(__DOXYGEN__) #if !defined(LPC214x_UART1_PRIORITY) || defined(__DOXYGEN__)
#define LPC214x_UART2_PRIORITY 2 #define LPC214x_UART1_PRIORITY 2
#endif #endif
/*===========================================================================*/ /*===========================================================================*/

2
readme.txt
View File

@ -52,6 +52,8 @@
***************************************************************************** *****************************************************************************
*** 1.5.2 *** *** 1.5.2 ***
- FIX: Fixed invalid UART-related macro in the LPC214x HAL (bug 2953195)
(backported in 1.4.1).
- FIX: Impossible to enforce alignment greater of a pointer size for heap/core - FIX: Impossible to enforce alignment greater of a pointer size for heap/core
objects (bug 2952961)(backported in 1.4.1). objects (bug 2952961)(backported in 1.4.1).
- FIX: Wrong prototype in template file chcore.c (bug 2951529)(backported - FIX: Wrong prototype in template file chcore.c (bug 2951529)(backported