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

Fixed bugs 2953981 and 2953985. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1634 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2010-02-18 20:02:09 +00:00
parent 439038efb4
commit aa71eb0989
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/hal/platforms/LPC214x/lpc214x.h
View File

@ -113,6 +113,7 @@ typedef struct {
typedef struct { typedef struct {
IOREG32 PS_SEL0; IOREG32 PS_SEL0;
IOREG32 PS_SEL1; IOREG32 PS_SEL1;
IOREG32 _dummy[3];
IOREG32 PS_SEL2; IOREG32 PS_SEL2;
} PS; } PS;

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

@ -85,12 +85,13 @@ static void uart_init(SerialDriver *sdp) {
*/ */
static void uart_deinit(UART *u) { static void uart_deinit(UART *u) {
u->UART_LCR = LCR_DLAB;
u->UART_DLL = 1; u->UART_DLL = 1;
u->UART_DLM = 0; u->UART_DLM = 0;
u->UART_LCR = 0;
u->UART_FDR = 0x10; u->UART_FDR = 0x10;
u->UART_IER = 0; u->UART_IER = 0;
u->UART_FCR = FCR_RXRESET | FCR_TXRESET; u->UART_FCR = FCR_RXRESET | FCR_TXRESET;
u->UART_LCR = 0;
u->UART_ACR = 0; u->UART_ACR = 0;
u->UART_TER = TER_ENABLE; u->UART_TER = TER_ENABLE;
} }

4
readme.txt
View File

@ -52,6 +52,10 @@
***************************************************************************** *****************************************************************************
*** 1.5.2 *** *** 1.5.2 ***
- FIX: Fixed wrong UART deinitialization sequence in LPC214x serial driver
(bug 2953985)(backported in 1.4.1).
- FIX: Fixed wrong PINSEL2 offset into lpc214x.h (bug 2953981)(backported
in 1.4.1).
- FIX: Fixed invalid UART-related macro in the LPC214x HAL (bug 2953195) - FIX: Fixed invalid UART-related macro in the LPC214x HAL (bug 2953195)
(backported in 1.4.1). (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