From d4596a38fdbfea1bb39359e83f9e4614e8612134 Mon Sep 17 00:00:00 2001
From: Kevin Bracey <kbracey@gitlab.riscosopen.org>
Date: Fri, 1 Oct 1999 15:32:31 +0000
Subject: [PATCH] Added ComboClock14MHz switch - only supported by SMC669.
Version 4.91. Tagged as 'Kernel-4_91'
---
VersionASM | 8 ++++----
VersionNum | 14 +++++++-------
s/PMF/osinit | 6 +++++-
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/VersionASM b/VersionASM
index 680eb02a..0df897f1 100644
--- a/VersionASM
+++ b/VersionASM
@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
-Module_MajorVersion SETS "4.90"
-Module_Version SETA 490
+Module_MajorVersion SETS "4.91"
+Module_Version SETA 491
Module_MinorVersion SETS ""
-Module_Date SETS "29 Sep 1999"
-Module_FullVersion SETS "4.90"
+Module_Date SETS "01 Oct 1999"
+Module_FullVersion SETS "4.91"
END
diff --git a/VersionNum b/VersionNum
index 1c5ff5d4..3acb2fce 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (4.90)
+/* (4.91)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 4.90
+#define Module_MajorVersion_CMHG 4.91
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 29 Sep 1999
+#define Module_Date_CMHG 01 Oct 1999
-#define Module_MajorVersion "4.90"
-#define Module_Version 490
+#define Module_MajorVersion "4.91"
+#define Module_Version 491
#define Module_MinorVersion ""
-#define Module_Date "29 Sep 1999"
+#define Module_Date "01 Oct 1999"
-#define Module_FullVersion "4.90"
+#define Module_FullVersion "4.91"
diff --git a/s/PMF/osinit b/s/PMF/osinit
index 27748ca5..e7a076d2 100644
--- a/s/PMF/osinit
+++ b/s/PMF/osinit
@@ -1206,7 +1206,11 @@ ConfigSMC669Table
; DCB &0B, 0 ; floppy data rates (default)
; DCB &0C, 0 ; UART2 & UART1 standard speed, UART2 standard mode,
; UART2 full duplex, XMIT active hi, RCV active hi (default)
- DCB &10, 2_01000000 ; 24MHz input to PLL (*not* default)
+ [ ComboClock14MHz
+; DCB &10, 2_00000000 ; 14.318MHz input to PLL (default)
+ |
+ DCB &10, 2_01000000 ; 24MHz input to PLL
+ ]
; DCB &1E, &80 ; GAMECS disabled (default)
; DCB &1F, 0 ; floppy drive types (default)
DCB &20, &FC ; FDC@3F0-7
--
GitLab