diff --git a/VersionASM b/VersionASM index 64ebfb167986b45760b4b0346f5d86ba6857fa5f..6bf97687346cdc533517a06fbb273d9ea2609c03 100644 --- a/VersionASM +++ b/VersionASM @@ -13,11 +13,11 @@ GBLS Module_ComponentPath Module_MajorVersion SETS "5.35" Module_Version SETA 535 -Module_MinorVersion SETS "4.79.2.187" +Module_MinorVersion SETS "4.79.2.188" Module_Date SETS "07 Apr 2013" Module_ApplicationDate SETS "07-Apr-13" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.187)" -Module_HelpVersion SETS "5.35 (07 Apr 2013) 4.79.2.187" +Module_FullVersion SETS "5.35 (4.79.2.188)" +Module_HelpVersion SETS "5.35 (07 Apr 2013) 4.79.2.188" END diff --git a/VersionNum b/VersionNum index 591d21d8ae2eb6be8e09c25bdc0f1d8b43cccbc5..1b92219544e881dd9bc66f876f29dc9622f40dc2 100644 --- a/VersionNum +++ b/VersionNum @@ -5,12 +5,12 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.187 +#define Module_MinorVersion_CMHG 4.79.2.188 #define Module_Date_CMHG 07 Apr 2013 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.187" +#define Module_MinorVersion "4.79.2.188" #define Module_Date "07 Apr 2013" #define Module_ApplicationDate "07-Apr-13" @@ -18,6 +18,6 @@ #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.187)" -#define Module_HelpVersion "5.35 (07 Apr 2013) 4.79.2.187" +#define Module_FullVersion "5.35 (4.79.2.188)" +#define Module_HelpVersion "5.35 (07 Apr 2013) 4.79.2.188" #define Module_LibraryVersionInfo "5:35" diff --git a/s/Middle b/s/Middle index f9ba75efbd07cd57fd206430011749365a663cfd..4886e9fff0c3bd68205f3c1a6a19ba75e1bcfb60 100644 --- a/s/Middle +++ b/s/Middle @@ -1553,6 +1553,13 @@ IOST_BATMAN * 64 ;Stork keyboard/battery controller seems to be present ; by this call in preference to a locally provided value. 40 + Push "r2-r3,r9,r14" + AddressHAL + MOV r0, #0 + CallHAL HAL_ExtMachineID + Pull "r2-r3,r9,r14" + TEQ r0, #0 + BNE ExitNoEthernetAddress ; Extended machine ID is implemented - don't attempt to extract a MAC from RawMachineID, it's just a hash of the extended ID LDR r0, =ZeroPage LDRB r1, [ r0, #RawMachineID ] ; The family byte TEQ r1, #&81 ; Excellent,a custom part - we'll use it