Commit 9a2c1030 authored by Robert Sprowson's avatar Robert Sprowson

Appease Thor

SDIO.s: a condition code mixup meant that during intense SD card activity the thunder bolt symbol would appear due to poking the non-LED lines on 3B+
GPIO.s: extend the 'free for use' table to include 3A+ pins, otherwise it read off the end; add an ASSERT to catch this in future

Version 0.77. Tagged as 'BCM2835-0_77'
parent a8c411bf
/* (0.76)
/* (0.77)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.76
#define Module_MajorVersion_CMHG 0.77
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 07 Jul 2018
#define Module_Date_CMHG 01 Dec 2018
#define Module_MajorVersion "0.76"
#define Module_Version 76
#define Module_MajorVersion "0.77"
#define Module_Version 77
#define Module_MinorVersion ""
#define Module_Date "07 Jul 2018"
#define Module_Date "01 Dec 2018"
#define Module_ApplicationDate "07-Jul-18"
#define Module_ApplicationDate "01-Dec-18"
#define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.76"
#define Module_HelpVersion "0.76 (07 Jul 2018)"
#define Module_LibraryVersionInfo "0:76"
#define Module_FullVersion "0.77"
#define Module_HelpVersion "0.77 (01 Dec 2018)"
#define Module_LibraryVersionInfo "0:77"
......@@ -867,73 +867,6 @@ GPIO_FuncSelect_Table
FuncSelectTable 53
ALIGN
[ {FALSE}
; Alt table 8 bytes per port 1st byte = mode 0 etc, &FF = not available
; Ref: section 6.2 of BCM2835 ARM peripherals datasheet
GPIO_Alt_Table
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 0
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 1
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 2
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 3
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, 2_010 ; 4
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, 2_010 ; 5
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, 2_010 ; 6
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 7
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 8
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 9
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 10
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 11
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, 2_010 ; 12
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, 2_010 ; 13
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, 2_010 ; 14
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, 2_010 ; 15
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, 2_010 ; 16
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, 2_010 ; 17
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, 2_010 ; 18
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, 2_010 ; 19
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, 2_010 ; 20
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, 2_010 ; 21
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, &FF ; 22
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, &FF ; 23
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, &FF ; 24
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, 2_011, &FF ; 25
DCB 2_000, 2_001, &FF, &FF, &FF, 2_111, 2_011, &FF ; 26
DCB 2_000, 2_001, &FF, &FF, &FF, 2_111, 2_011, &FF ; 27
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, &FF, &FF ; 28
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, &FF, &FF ; 29
DCB 2_000, 2_001, &FF, 2_101, 2_110, &FF, &FF, 2_010 ; 30
DCB 2_000, 2_001, &FF, 2_101, 2_110, &FF, &FF, 2_010 ; 31
DCB 2_000, 2_001, 2_100, 2_101, &FF, 2_111, &FF, 2_010 ; 32
DCB 2_000, 2_001, 2_100, 2_101, &FF, 2_111, &FF, 2_010 ; 33
DCB 2_000, 2_001, &FF, 2_101, &FF, 2_111, &FF, 2_010 ; 34
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, &FF, &FF ; 35
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, &FF, &FF ; 36
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, &FF, &FF ; 37
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, &FF, &FF ; 38
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, &FF, &FF ; 39
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, 2_011, 2_010 ; 40
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, 2_011, 2_010 ; 41
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, 2_011, 2_010 ; 42
DCB 2_000, 2_001, 2_100, 2_101, &FF, &FF, 2_011, 2_010 ; 43
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, 2_011, &FF ; 44
DCB 2_000, 2_001, 2_100, 2_101, 2_110, &FF, 2_011, &FF ; 45
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 46
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 47
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 48
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 49
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 50
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 51
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 52
DCB 2_000, 2_001, &FF, &FF, &FF, &FF, &FF, &FF ; 53
ALIGN
]
; Available pins per target board
; Ref: http://elinux.org/RPi_BCM2835_GPIOs
GPIOFreeToUse
......@@ -961,6 +894,9 @@ GPIOFreeToUse
DCD 2_00000000000000000000000000000000
DCD 2_00001111111111111111111111111111 ; 3B+
DCD 2_00000000000000000000000000000000
DCD 2_00001111111111111111111111111111 ; 3A+
DCD 2_00000000000000000000000000000000
ASSERT (.-GPIOFreeToUse) :SHR: 3 = GPIORevision_RaspberryPi_Max
; Pin enumerations
GPIO_Port0_Table
......
......@@ -388,7 +388,7 @@ SDIO_InitDevices ROUT
ADDHS a2, a2, #GetCardDetect_BPlus_Compute - GetCardDetect_AB
TEQ a3, #BoardRevision_Model_B3
TEQNE a3, #BoardRevision_Model_B3Plus
TEQ a3, #BoardRevision_Model_A3Plus
TEQNE a3, #BoardRevision_Model_A3Plus
ADREQL a1, SetActivity_B3
STR a1, SDHCIDevice + HALDevice_SDHCISetActivity
STR a2, SDHCIDevice + HALDevice_SDHCIGetCardDetect
......
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