diff --git a/VersionASM b/VersionASM index 346a55e0269d7e11ae61878b19ed8b6cfd8f93ea..dc9fc3cb927ce5eb0bae2808ae465e0b67faa4c7 100644 --- a/VersionASM +++ b/VersionASM @@ -6,9 +6,9 @@ GBLS Module_MinorVersion GBLS Module_Date GBLS Module_FullVersion -Module_MajorVersion SETS "5.13" -Module_Version SETA 513 +Module_MajorVersion SETS "5.14" +Module_Version SETA 514 Module_MinorVersion SETS "" -Module_Date SETS "26 Jan 2000" -Module_FullVersion SETS "5.13" +Module_Date SETS "27 Jan 2000" +Module_FullVersion SETS "5.14" END diff --git a/VersionNum b/VersionNum index 578dec477eb44f1ce1deeeeb5b287fb8c23433af..4055daae665a983914a65404ffd072a1ce09a50c 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (5.13) +/* (5.14) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 5.13 +#define Module_MajorVersion_CMHG 5.14 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 26 Jan 2000 +#define Module_Date_CMHG 27 Jan 2000 -#define Module_MajorVersion "5.13" -#define Module_Version 513 +#define Module_MajorVersion "5.14" +#define Module_Version 514 #define Module_MinorVersion "" -#define Module_Date "26 Jan 2000" +#define Module_Date "27 Jan 2000" -#define Module_FullVersion "5.13" +#define Module_FullVersion "5.14" diff --git a/s/PMF/i2cutils b/s/PMF/i2cutils index 6cdfe5cf6931e196c47126e1b758727cc8e04d41..a2cbc60029f0e2854c9a735f35c8ac299466e5b8 100644 --- a/s/PMF/i2cutils +++ b/s/PMF/i2cutils @@ -461,10 +461,12 @@ Write Pull "R0-R4, PC", CC ; don't write to OTP section ] + [ E2ROMSupport MOV R14, #0 ; don't write to protected section LDRB R14, [R14, #NVRamWriteSize] CMP R0, R14, LSL #8 ; (note assumption that NVRamWriteSize is Pull "R0-R4, PC", HS ; outside mangled region). + ] MOV R2, R0 MOV R3, R1 @@ -1268,6 +1270,7 @@ ValChecksum ENTRY "R1-R2" MOV R0, #0 MOV R1, #CMOSxseed + [ E2ROMSupport [ :LNOT: :DEF: TestHarness MOV R2, #0 ; read number of 256 byte blocks and calculate end address LDRB R2, [R2, #NVRamSize] @@ -1275,6 +1278,9 @@ ValChecksum ENTRY "R1-R2" LDRB R2, NVSize ] MOV R2, R2, LSL #8 + | + MOV R2, #240 + ] BL ChecksumBlock ; @@ -1306,6 +1312,7 @@ MakeChecksum ROUT Push "R1-R2,R14" MOV R0, #0 MOV R1, #CMOSxseed + [ E2ROMSupport [ :LNOT: :DEF: TestHarness MOV R2, #0 LDRB R2, [R2, #NVRamSize] @@ -1313,6 +1320,9 @@ MakeChecksum ROUT LDRB R2, NVSize ] MOV R2, R2, LSL #8 + | + MOV R2, #240 + ] BL ChecksumBlock MOV R0, #CheckSumCMOS BL Write @@ -1341,6 +1351,7 @@ MakeChecksum ROUT SetTime ROUT Push "R4, R14" ; save registers + [ E2ROMSupport [ :LNOT: :DEF: TestHarness MOV R14, #0 LDRB R14, [R14, #RTCFitted] @@ -1357,7 +1368,7 @@ SetTime ROUT BL RegToRealTime ] Pull "R4, PC" - + ] 20 ; write year to CMOS RAM