diff --git a/VersionASM b/VersionASM index 332dc81ec42457832cdc77bd0fd9c69103001241..8193fc7679a13ff5cf66fae1fbc31caff937e519 100644 --- a/VersionASM +++ b/VersionASM @@ -6,9 +6,9 @@ GBLS Module_MinorVersion GBLS Module_Date GBLS Module_FullVersion -Module_MajorVersion SETS "5.08" -Module_Version SETA 508 +Module_MajorVersion SETS "5.09" +Module_Version SETA 509 Module_MinorVersion SETS "" -Module_Date SETS "01 Dec 1999" -Module_FullVersion SETS "5.08" +Module_Date SETS "20 Jan 2000" +Module_FullVersion SETS "5.09" END diff --git a/VersionNum b/VersionNum index 838be98b4ea03175f4d2b79cb3c19238fa9c8d7b..76423606d17a1afe478cf01efe31e2607065bcd3 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (5.08) +/* (5.09) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 5.08 +#define Module_MajorVersion_CMHG 5.09 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 01 Dec 1999 +#define Module_Date_CMHG 20 Jan 2000 -#define Module_MajorVersion "5.08" -#define Module_Version 508 +#define Module_MajorVersion "5.09" +#define Module_Version 509 #define Module_MinorVersion "" -#define Module_Date "01 Dec 1999" +#define Module_Date "20 Jan 2000" -#define Module_FullVersion "5.08" +#define Module_FullVersion "5.09" diff --git a/s/Middle b/s/Middle index 7d3fede924b9b1777ca361f7b23a9457a5434b3c..c8d618c84f6fbe6576f92fecbf47523a352e52b1 100644 --- a/s/Middle +++ b/s/Middle @@ -1283,6 +1283,7 @@ IOST_BATMAN * 64 ;Stork keyboard/battery controller seems to be present ; by this call in preference to a locally provided value. 40 + [ :LNOT: MACFROMNVRAM MOV r0, #0 LDRB r1, [ r0, #RawMachineID ] ; The family byte TEQ r1, #&81 ; Is this a custom part? @@ -1312,9 +1313,10 @@ IOST_BATMAN * 64 ;Stork keyboard/battery controller seems to be present ] MOV r1, #0 ; Top 16 bits are zero ExitSWIHandler + ] ExitNoEthernetAddress - [ :LNOT: STB + [ :LNOT: STB :LAND: :LNOT: MACFROMNVRAM MOV r0, #0 MOV r1, #0 ExitSWIHandler @@ -1329,7 +1331,7 @@ ExitNoEthernetAddress ExitSWIHandler ] - [ STB + [ STB :LOR: MACFROMNVRAM GetMachineAddressCMOS ; Out: r0 = lower 4 bytes (or 0) ; r1 = upper 2 bytes (or 0)