From 15d157efb41fa2251acd9655c5c3ffc2f0731ccc Mon Sep 17 00:00:00 2001 From: Kevin Bracey <kbracey@gitlab.riscosopen.org> Date: Tue, 19 Oct 1999 09:26:49 +0000 Subject: [PATCH] Was using flags=2 to get PortManager to turn off outputs instead of flags=1. Version 4.99. Tagged as 'Kernel-4_99' --- VersionASM | 8 ++++---- VersionNum | 14 +++++++------- s/vdu/vdudriver | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/VersionASM b/VersionASM index 3f939af..3334a3a 100644 --- a/VersionASM +++ b/VersionASM @@ -6,9 +6,9 @@ GBLS Module_MinorVersion GBLS Module_Date GBLS Module_FullVersion -Module_MajorVersion SETS "4.98" -Module_Version SETA 498 +Module_MajorVersion SETS "4.99" +Module_Version SETA 499 Module_MinorVersion SETS "" -Module_Date SETS "18 Oct 1999" -Module_FullVersion SETS "4.98" +Module_Date SETS "19 Oct 1999" +Module_FullVersion SETS "4.99" END diff --git a/VersionNum b/VersionNum index 84dccb3..d53b539 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (4.98) +/* (4.99) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 4.98 +#define Module_MajorVersion_CMHG 4.99 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 18 Oct 1999 +#define Module_Date_CMHG 19 Oct 1999 -#define Module_MajorVersion "4.98" -#define Module_Version 498 +#define Module_MajorVersion "4.99" +#define Module_Version 499 #define Module_MinorVersion "" -#define Module_Date "18 Oct 1999" +#define Module_Date "19 Oct 1999" -#define Module_FullVersion "4.98" +#define Module_FullVersion "4.99" diff --git a/s/vdu/vdudriver b/s/vdu/vdudriver index 840caaf..d41bf26 100644 --- a/s/vdu/vdudriver +++ b/s/vdu/vdudriver @@ -856,7 +856,7 @@ TV_Mode_string LDR R1, [R0, #(PseudoRegister_HClockSpeed:SHR:22)-&80*4] ; are we using HCLK? CMP R1, #-1 Push "r0-r1" - MOVEQ R0, #2 ; if not, pull the TV_Mode GPIO line low (if present) + MOVEQ R0, #1 ; if not, pull the TV_Mode GPIO line low (if present) MOVNE R0, #3 ; if we are, pull it high ADR R1, TV_Mode_string SWI XPortMan_AccessBit ; (don't forget svc_PortMan below) @@ -2589,7 +2589,7 @@ svc_PortMan LDR R0, [WsPtr, #VIDCControlCopy] ; get saved VIDC control register AND R0, R0, #CR_VCLK :OR: CR_HCLK :OR: CR_RCLK TEQ R0, #CR_HCLK ; are we using HCLK? - MOVNE R0, #2 ; no: TV_Mode = 0 + MOVNE R0, #1 ; no: TV_Mode = 0 MOVEQ R0, #3 ; yes: TV_Mode = 1 addr R1, TV_Mode_string SWI XPortMan_AccessBit -- GitLab