diff --git a/VersionNum b/VersionNum index e93b99e2db4f420892a0fab7011ca4328b47bb19..57b90caec47904b0b7a9b6c580fe3b7445ad39af 100644 --- a/VersionNum +++ b/VersionNum @@ -1,21 +1,21 @@ -/* (0.81) +/* (0.82) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 0.81 +#define Module_MajorVersion_CMHG 0.82 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 10 Aug 2019 +#define Module_Date_CMHG 05 Feb 2020 -#define Module_MajorVersion "0.81" -#define Module_Version 81 +#define Module_MajorVersion "0.82" +#define Module_Version 82 #define Module_MinorVersion "" -#define Module_Date "10 Aug 2019" +#define Module_Date "05 Feb 2020" -#define Module_ApplicationDate "10-Aug-19" +#define Module_ApplicationDate "05-Feb-20" #define Module_ComponentName "HAL_BCM2835" -#define Module_FullVersion "0.81" -#define Module_HelpVersion "0.81 (10 Aug 2019)" -#define Module_LibraryVersionInfo "0:81" +#define Module_FullVersion "0.82" +#define Module_HelpVersion "0.82 (05 Feb 2020)" +#define Module_LibraryVersionInfo "0:82" diff --git a/s/UART b/s/UART index 8b735d04273333561508782660ae384317af392a..2d0a3cbf68187e3c16958182ab11ec1817488519 100644 --- a/s/UART +++ b/s/UART @@ -122,6 +122,9 @@ HAL_UARTStartUp LDR a2, PeriBase ; first turn on the serial pins ADD a3, a2, #GPIO_Base ; (for setting pins up) LDR a2, [a3, #GPFSel1] ; + [ ModemControl + ORR a2, a2, #8_77000000 ; set GPIO 16 + 17 to alt3 (111) + ] BIC a2, a2, #8_00770000 ; ORR a2, a2, #8_00440000 ; set GPIO 14 + 15 to alt0 (100) STR a2, [a3, #GPFSel1] ; @@ -637,9 +640,12 @@ HAL_UARTModemControl STRNE a2, [a1, #UARTCR] PLP DataSyncBarrier a2 - MOV a1, ip + ; Ensure DTR + ORR a1, ip, #1:SHL:0 EXIT | + ; Fake control lines as though a modem is plugged in + MOV a1, #2_00011 MOV pc, lr ] @@ -672,7 +678,7 @@ HAL_UARTModemStatus ; Get current status LDR a2, [a1, #UARTFLAG] DataSyncBarrier a4 - AND a2, a2, #FLAG_CTS + AND a2, a2, #1:SHL:FLAG_CTS ; Get old status LDR a4, UARTOldModemStatus ; Store new status @@ -680,8 +686,13 @@ HAL_UARTModemStatus PLP a3 ; Calc return value EOR a1, a4, a2 - MOV a1, a1, LSR #UI_CTS - ORR a1, a1, a2, LSL #4-UI_CTS + MOV a1, a1, LSR #FLAG_CTS + ORR a1, a1, a2, LSL #4-FLAG_CTS + ; Ensure DSR + ORR a1, a1, #1:SHL:5 + | + ; Fake control lines as though a modem is plugged in but offline + MOV a1, #2_00110000 ] MOV pc, lr