diff --git a/VersionASM b/VersionASM index f7b64c9e918c02bb0b8c3e8af405613db5fe8ef1..1111ca844a7ecd0bc1644fdc9f704042655065fd 100644 --- a/VersionASM +++ b/VersionASM @@ -6,9 +6,9 @@ GBLS Module_MinorVersion GBLS Module_Date GBLS Module_FullVersion -Module_MajorVersion SETS "5.16" -Module_Version SETA 516 +Module_MajorVersion SETS "5.17" +Module_Version SETA 517 Module_MinorVersion SETS "" -Module_Date SETS "17 Feb 2000" -Module_FullVersion SETS "5.16" +Module_Date SETS "22 Feb 2000" +Module_FullVersion SETS "5.17" END diff --git a/VersionNum b/VersionNum index f54b25339b328dbcf3a85194bce1a2c28dd23ae9..e69f59768751827fe2211d05925957d9063212ce 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (5.16) +/* (5.17) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 5.16 +#define Module_MajorVersion_CMHG 5.17 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 17 Feb 2000 +#define Module_Date_CMHG 22 Feb 2000 -#define Module_MajorVersion "5.16" -#define Module_Version 516 +#define Module_MajorVersion "5.17" +#define Module_Version 517 #define Module_MinorVersion "" -#define Module_Date "17 Feb 2000" +#define Module_Date "22 Feb 2000" -#define Module_FullVersion "5.16" +#define Module_FullVersion "5.17" diff --git a/s/Middle b/s/Middle index 78d60602e9f5aeea345eadbb7c42d854cb315a34..8d565f7b77c492a35095b0448030b49988f80045 100644 --- a/s/Middle +++ b/s/Middle @@ -1289,7 +1289,6 @@ 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? @@ -1319,10 +1318,9 @@ IOST_BATMAN * 64 ;Stork keyboard/battery controller seems to be present ] MOV r1, #0 ; Top 16 bits are zero ExitSWIHandler - ] ExitNoEthernetAddress - [ :LNOT: STB :LAND: :LNOT: MACFROMNVRAM + [ :LNOT: STB MOV r0, #0 MOV r1, #0 ExitSWIHandler @@ -1337,7 +1335,7 @@ ExitNoEthernetAddress ExitSWIHandler ] - [ STB :LOR: MACFROMNVRAM + [ STB GetMachineAddressCMOS ; Out: r0 = lower 4 bytes (or 0) ; r1 = upper 2 bytes (or 0)