Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Ben Avison
HAL_BCM2835
Commits
e83ce7be
Commit
e83ce7be
authored
Sep 10, 2017
by
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
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
66 deletions
+35
-66
Makefile
Makefile
+1
-1
VersionNum
VersionNum
+12
-12
s/KbdScan
s/KbdScan
+12
-33
s/Top
s/Top
+10
-20
No files found.
Makefile
View file @
e83ce7be
...
...
@@ -17,7 +17,7 @@
COMPONENT
=
BCM2835 HAL
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
=
CMHGFILE
=
...
...
VersionNum
View file @
e83ce7be
/* (0.7
1
)
/* (0.7
3
)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.7
1
#define Module_MinorVersion_CMHG 1.70.2.
2
#define Module_Date_CMHG
31 Jul
2017
#define Module_MajorVersion_CMHG 0.7
3
#define Module_MinorVersion_CMHG 1.70.2.
3
#define Module_Date_CMHG
10 Sep
2017
#define Module_MajorVersion "0.7
1
"
#define Module_Version 7
1
#define Module_MinorVersion "1.70.2.
2
"
#define Module_Date "
31 Jul
2017"
#define Module_MajorVersion "0.7
3
"
#define Module_Version 7
3
#define Module_MinorVersion "1.70.2.
3
"
#define Module_Date "
10 Sep
2017"
#define Module_ApplicationDate "
31-Jul
-17"
#define Module_ApplicationDate "
10-Sep
-17"
#define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.7
1
(1.70.2.
2
)"
#define Module_HelpVersion "0.7
1
(
31 Jul
2017) 1.70.2.
2
"
#define Module_LibraryVersionInfo "0:7
1
"
#define Module_FullVersion "0.7
3
(1.70.2.
3
)"
#define Module_HelpVersion "0.7
3
(
10 Sep
2017) 1.70.2.
3
"
#define Module_LibraryVersionInfo "0:7
3
"
s/
Stubs
→
s/
KbdScan
View file @
e83ce7be
;
; Copyright (c) 2012, RISC OS Open Ltd
; Copyright (c) 2012, Adrian Lees
; Copyright (c) 2017, RISC OS Open Ltd
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
...
...
@@ -25,44 +24,24 @@
; 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
; 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
GET
Hdr:ListOpts
GET
Hdr:Macros
GET
Hdr:Proc
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
HALStub
"HAL_KbdScanSetup"
MOV
pc
,
lr
EXPORT
HAL_KbdScanDependencies
HAL_KbdScan
HALStub
"HAL_KbdScan"
MOV
a1
,#
KbdFlag_Present
:OR:
KbdFlag_Done
; signal keyboard scan complete
MOV
pc
,
lr
HAL_KbdScanFinish
HALStub
"Hal_KbdScanFinish"
MOV
pc
,
lr
HAL_KbdScanInterrupt
HALStub
"HAL_KbdScanInterrupt"
MOV
pc
,
lr
HAL_KbdScanDependencies
ROUT
ADR
a1
,
%FT10
MOV
pc
,
lr
10
; Modules needed for keyboard scanning, no need to list those
; before 'FirstUnpluggableModule' since they can't be unplugged
DCB
"SharedCLibrary,BufferManager,DeviceFS,RTSupport,USBDriver,"
DCB
"DWCDriver,InternationalKeyboard"
,
0
END
s/Top
View file @
e83ce7be
...
...
@@ -132,10 +132,7 @@
IMPORT
HAL_PlatformName
IMPORT
HAL_KbdScanSetup
IMPORT
HAL_KbdScan
IMPORT
HAL_KbdScanFinish
IMPORT
HAL_KbdScanInterrupt
IMPORT
HAL_KbdScanDependencies
IMPORT
HAL_USBControllerInfo
...
...
@@ -634,8 +631,7 @@ $table DATA
HALEntry
HAL_UARTModemControl
HALEntry
HAL_UARTModemStatus
HALEntry
HAL_UARTDevice
HALEntry
HAL_Reset
HALEntry
HAL_UARTDefault
[
Debug
HALEntry
HAL_DebugRX
...
...
@@ -662,34 +658,28 @@ $table DATA
HALEntry
HAL_InitDevices
HALEntry
HAL_KbdScan
Setup
HAL
Entry
HAL_KbdScan
HAL
Entry
HAL_KbdScanFinish
HAL
Entry
HAL_KbdScanInterrupt
HALEntry
HAL_KbdScan
Dependencies
Null
Entry
Null
Entry
Null
Entry
HALEntry
HAL_PhysInfo
HALEntry
HAL_
USBControllerInfo
HALEntry
HAL_
Reset
QA7Entry
HAL_IRQMax
NullEntry
; HALEntry HAL_VideoRender
HALEntry
HAL_USBControllerInfo
NullEntry
; HAL_USBPortPower
NullEntry
; HAL_USBPortStatus
NullEntry
; HAL_USBPortIRQStatus
NullEntry
; HAL_USBPortIRQClear
NullEntry
; HAL_USBPortDevice
NullEntry
; HALEntry HAL_VideoIICOp
HALEntry
HAL_TimerIRQClear
NullEntry
; HAL_TimerIRQStatus
HALEntry
HAL_ExtMachineID
NullEntry
; HALEntry HAL_VideoFramestoreAddress
HALEntry
HAL_UARTDefault
entries
SETA
(
.
-
$table
)/
4
$descriptor
DATA
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment