From 9eefa962d3b454ea47a3ea1dacca066e155c647d Mon Sep 17 00:00:00 2001
From: Kevin Bracey <kbracey@gitlab.riscosopen.org>
Date: Mon, 1 Nov 1999 12:16:46 +0000
Subject: [PATCH] OS_ReadSysInfo 3 was incorrectly reporting a 37C665 as a
37C669.
Version 5.06. Tagged as 'Kernel-5_06'
---
VersionASM | 8 ++++----
VersionNum | 14 +++++++-------
s/PMF/osinit | 8 +++++---
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/VersionASM b/VersionASM
index 61bc473f..4954fd10 100644
--- a/VersionASM
+++ b/VersionASM
@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
-Module_MajorVersion SETS "5.05"
-Module_Version SETA 505
+Module_MajorVersion SETS "5.06"
+Module_Version SETA 506
Module_MinorVersion SETS ""
-Module_Date SETS "29 Oct 1999"
-Module_FullVersion SETS "5.05"
+Module_Date SETS "01 Nov 1999"
+Module_FullVersion SETS "5.06"
END
diff --git a/VersionNum b/VersionNum
index 01b83422..d6be956d 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (5.05)
+/* (5.06)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.05
+#define Module_MajorVersion_CMHG 5.06
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 29 Oct 1999
+#define Module_Date_CMHG 01 Nov 1999
-#define Module_MajorVersion "5.05"
-#define Module_Version 505
+#define Module_MajorVersion "5.06"
+#define Module_Version 506
#define Module_MinorVersion ""
-#define Module_Date "29 Oct 1999"
+#define Module_Date "01 Nov 1999"
-#define Module_FullVersion "5.05"
+#define Module_FullVersion "5.06"
diff --git a/s/PMF/osinit b/s/PMF/osinit
index 4698ce1b..7a714c04 100644
--- a/s/PMF/osinit
+++ b/s/PMF/osinit
@@ -1130,7 +1130,7 @@ ConfigureCombo ENTRY "r0-r2"
STRNEB lr, [r2, #SMC_data-SMC_CSR] ; and write it
BNE %BT20
- MOV r1, #IOST_37C669
+ LDRB r1, [r1] ; pull chip ID out of table
; Record type of chip found
30
@@ -1169,7 +1169,8 @@ ConfigSMC665Table
; UART2 full duplex, XMIT active hi, RCV active hi (default)
DCB &00, 2_10111011 ; Valid config, OSC & BR on, FDC enabled & powered,
; IDE AT & enabled
- DCB SMC_endconfig, 0 ; Exit config mode
+ DCB SMC_endconfig ; Exit config mode
+ DCB IOST_37C665 ; Handy place to keep ID
ConfigSMC669Table
DCB &01, 2_10010100 ; Enable config, // is extended, // is powered
@@ -1205,7 +1206,8 @@ ConfigSMC669Table
DCB &28, 2_01000011 ; UART1 uses IRQ_D, UART2 uses IRQ_C
DCB &29, 0 ; IRQIN does not use any IRQ_x (default)
DCB &00, 2_10001010 ; Valid config, FDC powered, IDE enabled
- DCB SMC_endconfig, 0 ; Exit config mode
+ DCB SMC_endconfig ; Exit config mode
+ DCB IOST_37C669
ConfigUMC8669Table
DCB UMC_config, &C0, 2_00111110 ; IR full-duplex, games off, IDE on,
--
GitLab