diff --git a/VersionASM b/VersionASM index 29102a0883d397ae516b9a2bccdc06531a760789..ec88ecd2277e58042df142045d8a168a38d0ccb1 100644 --- a/VersionASM +++ b/VersionASM @@ -8,11 +8,11 @@ GBLS Module_FullVersion GBLS Module_ApplicationDate2 GBLS Module_ApplicationDate4 -Module_MajorVersion SETS "5.34" -Module_Version SETA 534 +Module_MajorVersion SETS "5.35" +Module_Version SETA 535 Module_MinorVersion SETS "" -Module_Date SETS "07 Sep 2000" -Module_ApplicationDate2 SETS "07-Sep-00" -Module_ApplicationDate4 SETS "07-Sep-2000" -Module_FullVersion SETS "5.34" +Module_Date SETS "08 Sep 2000" +Module_ApplicationDate2 SETS "08-Sep-00" +Module_ApplicationDate4 SETS "08-Sep-2000" +Module_FullVersion SETS "5.35" END diff --git a/VersionNum b/VersionNum index 726a076dd3a36417eca22a8456ddf3f5bcf5f452..df2d35eaaf17b633179746c1bd3eabd3cd1ff372 100644 --- a/VersionNum +++ b/VersionNum @@ -1,18 +1,18 @@ -/* (5.34) +/* (5.35) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 5.34 +#define Module_MajorVersion_CMHG 5.35 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 07 Sep 2000 +#define Module_Date_CMHG 08 Sep 2000 -#define Module_MajorVersion "5.34" -#define Module_Version 534 +#define Module_MajorVersion "5.35" +#define Module_Version 535 #define Module_MinorVersion "" -#define Module_Date "07 Sep 2000" +#define Module_Date "08 Sep 2000" -#define Module_ApplicationDate2 "07-Sep-00" -#define Module_ApplicationDate4 "07-Sep-2000" +#define Module_ApplicationDate2 "08-Sep-00" +#define Module_ApplicationDate4 "08-Sep-2000" -#define Module_FullVersion "5.34" +#define Module_FullVersion "5.35" diff --git a/s/PMF/i2cutils b/s/PMF/i2cutils index 008479f9f2aafb0d317d2113e2053ceaa176b43d..f87ab27eae418481287af81dca7f675fd2709589 100644 --- a/s/PMF/i2cutils +++ b/s/PMF/i2cutils @@ -131,6 +131,7 @@ SetC1C0 ROUT MOV R2, #IOC STRB R0, [R2, #IOCControl] + [ E2ROMSupport [ :LNOT: :DEF: TestHarness MOV R0, #0 LDRB R0, [R0, #NVRamSpeed] @@ -139,6 +140,9 @@ SetC1C0 ROUT ] TEQ R0, #0 MOVEQ R0, #10 ; default value if speed not checked yet + | + MOV R0, #10 ; default to slowest value if we have E2ROMSupport is false + ] BL DoMicroDelay [ No26bitCode