Commit 9df42334 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Switch out pre-HAL code

This is the HAL branch of the module, so there's no need to carry round all the IOC poking code which never gets called.

Version 0.18, 4.5.2.13. Tagged as 'IIC-0_18-4_5_2_13'
parent 0f24c2e2
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.18"
Module_Version SETA 18
Module_MinorVersion SETS "4.5.2.12"
Module_MinorVersion SETS "4.5.2.13"
Module_Date SETS "02 Feb 2017"
Module_ApplicationDate SETS "02-Feb-17"
Module_ComponentName SETS "IIC"
Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/IIC"
Module_FullVersion SETS "0.18 (4.5.2.12)"
Module_HelpVersion SETS "0.18 (02 Feb 2017) 4.5.2.12"
Module_FullVersion SETS "0.18 (4.5.2.13)"
Module_HelpVersion SETS "0.18 (02 Feb 2017) 4.5.2.13"
END
......@@ -5,12 +5,12 @@
*
*/
#define Module_MajorVersion_CMHG 0.18
#define Module_MinorVersion_CMHG 4.5.2.12
#define Module_MinorVersion_CMHG 4.5.2.13
#define Module_Date_CMHG 02 Feb 2017
#define Module_MajorVersion "0.18"
#define Module_Version 18
#define Module_MinorVersion "4.5.2.12"
#define Module_MinorVersion "4.5.2.13"
#define Module_Date "02 Feb 2017"
#define Module_ApplicationDate "02-Feb-17"
......@@ -18,6 +18,6 @@
#define Module_ComponentName "IIC"
#define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/IIC"
#define Module_FullVersion "0.18 (4.5.2.12)"
#define Module_HelpVersion "0.18 (02 Feb 2017) 4.5.2.12"
#define Module_FullVersion "0.18 (4.5.2.13)"
#define Module_HelpVersion "0.18 (02 Feb 2017) 4.5.2.13"
#define Module_LibraryVersionInfo "0:18"
......@@ -46,7 +46,7 @@
GET VersionASM
GBLL ReentrancyCheck
ReentrancyCheck SETL {TRUE} ; Harmless if you don't need it
ReentrancyCheck SETL {TRUE} :LAND: :LNOT:HAL ; Harmless if you don't need it
GBLL KernelDoesIIC
KernelDoesIIC SETL {TRUE} :LAND: ReentrancyCheck ; Until the kernel's IIC support is farmed out
......@@ -486,18 +486,20 @@ IIC_SWIHandler ROUT
MOVEQ PC, R10 ; 32-bit exit: NZC corrupted
MOVNES PC, R10 ; 26-bit exit: NZC preserved
10
[ :LNOT:HAL
LDR R14, [R0]
SUB R14, R14, #ErrorNumber_NoSuchSWI :AND: &FF00
TEQ R14, #ErrorNumber_NoSuchSWI :AND: &FF
Pull "R0-R1",EQ
BEQ %FT20 ; OS_IICOp not known, bitbash IOC ourselves
]
ADD R13, R13, #4
Pull "R1"
TEQ PC, PC
MOVEQ PC, R10 ; 32-bit exit: NZC corrupted
MOVNES PC, R10 ; 26-bit exit: NZC preserved
[ :LNOT:HAL
20
[ ReentrancyCheck
[ KernelDoesIIC
......@@ -536,7 +538,6 @@ iis_end
MOV R11, #1
STR R11, IICSWIThreaded
]
Push R10
BL Start
......@@ -593,6 +594,7 @@ TXCheckAck ROUT
TEQ PC, PC
MOVEQ PC, R14 ; 32-bit exit: NZC corrupted
ORRS PC, R14, #V_bit ; 26-bit exit: NZC preserved
] ; :LNOT:HAL
ReturnNoSuchSWIError
ADR R0, ErrorBlock_NoSuchSWI
......@@ -619,6 +621,7 @@ ReturnIICInUseError
]
MakeInternatErrorBlock IIC_BadBus,,BdBus
[ :LNOT:HAL
; *****************************************************************************
;
; SetC1C0 - Set clock and data lines to values in R1 and R0 respectively
......@@ -890,6 +893,7 @@ RXByte ROUT
MOV R0, R3 ; return the result in R0
Pull "R1-R4, PC"
] ; :LNOT:HAL
; *****************************************************************************
;
......
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