From 3e7e3a11cfb99cbf90ce2f5551c1b930d24b4b3a Mon Sep 17 00:00:00 2001
From: Paul Skirrow <pskirrow@gitlab.riscosopen.org>
Date: Tue, 22 Feb 2000 14:46:21 +0000
Subject: [PATCH] Removed redundant MACFROMNVRAM introduced in Kernel 5.09.
Detail:
MACFROMNVRAM was intended to force the Kernel to fetch the MAC
address from NVRAM for Customer F 5. In practice it is not needed
as its main purpose was to avoid getting the MAC address from
the RawMachineID but this will not happen in Customer F 5 as
RawMachineID will not be set.
Admin:
Not tested.
MACFROMNVRAM will be removed from HdrSrc.
Version 5.17. Tagged as 'Kernel-5_17'
---
VersionASM | 8 ++++----
VersionNum | 14 +++++++-------
s/Middle | 6 ++----
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/VersionASM b/VersionASM
index f7b64c9e..1111ca84 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 f54b2533..e69f5976 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 78d60602..8d565f7b 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)
--
GitLab