Commit 57fc88a7 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix compile error

Detail:
  s/UART - Fixed HAL_UARTModemControl to use UART_MCR_DTR and UART_MCR_RTS constants instead of DTR and RTS
Admin:
  OMAP4 HAL now compiles again


Version 0.04. Tagged as 'OMAP4-0_04'
parent 4cbd9513
/* (0.03)
/* (0.04)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.03
#define Module_MajorVersion_CMHG 0.04
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Dec 2011
#define Module_Date_CMHG 06 Dec 2011
#define Module_MajorVersion "0.03"
#define Module_Version 3
#define Module_MajorVersion "0.04"
#define Module_Version 4
#define Module_MinorVersion ""
#define Module_Date "04 Dec 2011"
#define Module_Date "06 Dec 2011"
#define Module_ApplicationDate "04-Dec-11"
#define Module_ApplicationDate "06-Dec-11"
#define Module_ComponentName "OMAP4"
#define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP4"
#define Module_FullVersion "0.03"
#define Module_HelpVersion "0.03 (04 Dec 2011)"
#define Module_LibraryVersionInfo "0:3"
#define Module_FullVersion "0.04"
#define Module_HelpVersion "0.04 (06 Dec 2011)"
#define Module_LibraryVersionInfo "0:4"
......@@ -391,13 +391,13 @@ HAL_UARTModemControl
PHPSEI ip, a4
LDRB a4, [a1, #UART_MCR]
CMP a2, #-1
ORR a3, a3, #256-(DTR+RTS) ; Only allow DTR+RTS to be modified
AND a2, a2, #DTR+RTS
ORR a3, a3, #256-(UART_MCR_DTR+UART_MCR_RTS) ; Only allow DTR+RTS to be modified
AND a2, a2, #UART_MCR_DTR+UART_MCR_RTS
ANDNE a3, a3, a4
EORNE a3, a3, a2
STRNEB a3, [a1, #UART_MCR]
PLP ip
AND a1, a4, #DTR+RTS
AND a1, a4, #UART_MCR_DTR+UART_MCR_RTS
MOV pc, lr
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment