Commit e83ce7be authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Merge latest changes from main branch

Version 0.73, 1.70.2.3. Tagged as 'BCM2835-0_73-1_70_2_3'
parent 7a939c99
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
COMPONENT = BCM2835 HAL COMPONENT = BCM2835 HAL
TARGET = BCM2835 TARGET = BCM2835
OBJS = Top CLib CMOS Debug Interrupts SDIO Stubs Timers UART USB Video DMA Messaging GPIO VCHIQ IIC RTC SPI Touch DBell OBJS = Top CLib CMOS Debug Interrupts SDIO Timers UART USB Video DMA Messaging GPIO VCHIQ IIC RTC SPI Touch KbdScan DBell
HDRS = HDRS =
CMHGFILE = CMHGFILE =
......
/* (0.71) /* (0.73)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.71 #define Module_MajorVersion_CMHG 0.73
#define Module_MinorVersion_CMHG 1.70.2.2 #define Module_MinorVersion_CMHG 1.70.2.3
#define Module_Date_CMHG 31 Jul 2017 #define Module_Date_CMHG 10 Sep 2017
#define Module_MajorVersion "0.71" #define Module_MajorVersion "0.73"
#define Module_Version 71 #define Module_Version 73
#define Module_MinorVersion "1.70.2.2" #define Module_MinorVersion "1.70.2.3"
#define Module_Date "31 Jul 2017" #define Module_Date "10 Sep 2017"
#define Module_ApplicationDate "31-Jul-17" #define Module_ApplicationDate "10-Sep-17"
#define Module_ComponentName "BCM2835" #define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835" #define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.71 (1.70.2.2)" #define Module_FullVersion "0.73 (1.70.2.3)"
#define Module_HelpVersion "0.71 (31 Jul 2017) 1.70.2.2" #define Module_HelpVersion "0.73 (10 Sep 2017) 1.70.2.3"
#define Module_LibraryVersionInfo "0:71" #define Module_LibraryVersionInfo "0:73"
; ;
; Copyright (c) 2012, RISC OS Open Ltd ; Copyright (c) 2017, RISC OS Open Ltd
; Copyright (c) 2012, Adrian Lees
; All rights reserved. ; All rights reserved.
; ;
; Redistribution and use in source and binary forms, with or without ; Redistribution and use in source and binary forms, with or without
...@@ -25,44 +24,24 @@ ...@@ -25,44 +24,24 @@
; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE. ; POSSIBILITY OF SUCH DAMAGE.
;
; With many thanks to Broadcom Europe Ltd for releasing the source code to
; its Linux drivers, thus making this port possible.
; ;
AREA |ARM$$code|, CODE, READONLY, PIC AREA |ARM$$code|, CODE, READONLY, PIC
GET Hdr:ListOpts GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:Proc
GET Hdr:HALEntries GET Hdr:HALEntries
GET hdr.BCM2835
GET hdr.StaticWS
EXPORT HAL_KbdScanSetup
EXPORT HAL_KbdScan
EXPORT HAL_KbdScanFinish
EXPORT HAL_KbdScanInterrupt
MACRO
HALStub $str
; Might want to make this do something again?
MEND
HAL_KbdScanSetup EXPORT HAL_KbdScanDependencies
HALStub "HAL_KbdScanSetup"
MOV pc,lr
HAL_KbdScan HAL_KbdScanDependencies ROUT
HALStub "HAL_KbdScan" ADR a1, %FT10
MOV a1,#KbdFlag_Present :OR: KbdFlag_Done ; signal keyboard scan complete MOV pc, lr
MOV pc,lr 10
; Modules needed for keyboard scanning, no need to list those
HAL_KbdScanFinish ; before 'FirstUnpluggableModule' since they can't be unplugged
HALStub "Hal_KbdScanFinish" DCB "SharedCLibrary,BufferManager,DeviceFS,RTSupport,USBDriver,"
MOV pc,lr DCB "DWCDriver,InternationalKeyboard", 0
HAL_KbdScanInterrupt
HALStub "HAL_KbdScanInterrupt"
MOV pc,lr
END END
...@@ -132,10 +132,7 @@ ...@@ -132,10 +132,7 @@
IMPORT HAL_PlatformName IMPORT HAL_PlatformName
IMPORT HAL_KbdScanSetup IMPORT HAL_KbdScanDependencies
IMPORT HAL_KbdScan
IMPORT HAL_KbdScanFinish
IMPORT HAL_KbdScanInterrupt
IMPORT HAL_USBControllerInfo IMPORT HAL_USBControllerInfo
...@@ -634,8 +631,7 @@ $table DATA ...@@ -634,8 +631,7 @@ $table DATA
HALEntry HAL_UARTModemControl HALEntry HAL_UARTModemControl
HALEntry HAL_UARTModemStatus HALEntry HAL_UARTModemStatus
HALEntry HAL_UARTDevice HALEntry HAL_UARTDevice
HALEntry HAL_UARTDefault
HALEntry HAL_Reset
[ Debug [ Debug
HALEntry HAL_DebugRX HALEntry HAL_DebugRX
...@@ -662,34 +658,28 @@ $table DATA ...@@ -662,34 +658,28 @@ $table DATA
HALEntry HAL_InitDevices HALEntry HAL_InitDevices
HALEntry HAL_KbdScanSetup HALEntry HAL_KbdScanDependencies
HALEntry HAL_KbdScan NullEntry
HALEntry HAL_KbdScanFinish NullEntry
HALEntry HAL_KbdScanInterrupt NullEntry
HALEntry HAL_PhysInfo HALEntry HAL_PhysInfo
HALEntry HAL_USBControllerInfo HALEntry HAL_Reset
QA7Entry HAL_IRQMax QA7Entry HAL_IRQMax
NullEntry ; HALEntry HAL_VideoRender HALEntry HAL_USBControllerInfo
NullEntry ; HAL_USBPortPower NullEntry ; HAL_USBPortPower
NullEntry ; HAL_USBPortStatus NullEntry ; HAL_USBPortIRQStatus
NullEntry ; HAL_USBPortIRQClear
NullEntry ; HAL_USBPortDevice NullEntry ; HAL_USBPortDevice
NullEntry ; HALEntry HAL_VideoIICOp
HALEntry HAL_TimerIRQClear HALEntry HAL_TimerIRQClear
NullEntry ; HAL_TimerIRQStatus NullEntry ; HAL_TimerIRQStatus
HALEntry HAL_ExtMachineID HALEntry HAL_ExtMachineID
NullEntry ; HALEntry HAL_VideoFramestoreAddress
HALEntry HAL_UARTDefault
entries SETA (.-$table)/4 entries SETA (.-$table)/4
$descriptor DATA $descriptor DATA
......
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