Commit 23e6c9b9 authored by Robert Catherall's avatar Robert Catherall
Browse files

Fixed compile time error that occured if E2ROMSupport was false

(NVRamSpeed is not defined in the Kernel workspace so we need an
 alternative way to work the speed of the I2C bus - so I've used
 I2Cticks - defined in PMF.i2cutils)

Version 5.34. Tagged as 'Kernel-5_34'
parent 5f4a3516
......@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
Module_MajorVersion SETS "5.33"
Module_Version SETA 533
Module_MajorVersion SETS "5.34"
Module_Version SETA 534
Module_MinorVersion SETS ""
Module_Date SETS "04 Sep 2000"
Module_ApplicationDate2 SETS "04-Sep-00"
Module_ApplicationDate4 SETS "04-Sep-2000"
Module_FullVersion SETS "5.33"
Module_Date SETS "07 Sep 2000"
Module_ApplicationDate2 SETS "07-Sep-00"
Module_ApplicationDate4 SETS "07-Sep-2000"
Module_FullVersion SETS "5.34"
END
/* (5.33)
/* (5.34)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.33
#define Module_MajorVersion_CMHG 5.34
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Sep 2000
#define Module_Date_CMHG 07 Sep 2000
#define Module_MajorVersion "5.33"
#define Module_Version 533
#define Module_MajorVersion "5.34"
#define Module_Version 534
#define Module_MinorVersion ""
#define Module_Date "04 Sep 2000"
#define Module_Date "07 Sep 2000"
#define Module_ApplicationDate2 "04-Sep-00"
#define Module_ApplicationDate4 "04-Sep-2000"
#define Module_ApplicationDate2 "07-Sep-00"
#define Module_ApplicationDate4 "07-Sep-2000"
#define Module_FullVersion "5.33"
#define Module_FullVersion "5.34"
......@@ -1305,8 +1305,12 @@ IOST_BATMAN * 64 ;Stork keyboard/battery controller seems to be present
ORRNE r2, r2, #&00000100 ;NE, Morris based machine with IOMDL
ORRNE r2, r2, #&00010000 ;NE, and VIDC2L
]
[ E2ROMSupport
MOV r1, #0
LDRB r1, [r1, #NVRamSpeed]
|
MOV r1,#I2Cticks ; defined in PMF.i2cutils
]
SUB r1, r1, #1 ; catch zero = slow (just in case)
CMP r1, #3-1 ; speed is 3 for 400kHz, 10 for 100kHz.
ORRLS r2, r2, #&01000000 ; indicate fast speed
......
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