From c3c2d693ad3be9ca88fe9866042955cdf2436a80 Mon Sep 17 00:00:00 2001
From: Kevin Bracey <kbracey@gitlab.riscosopen.org>
Date: Mon, 25 Oct 1999 17:10:52 +0000
Subject: [PATCH] IRQs rejigged for HdrSrc 0.52.
Version 5.02. Tagged as 'Kernel-5_02'
---
VersionASM | 6 +++---
VersionNum | 10 +++++-----
s/NewIRQs | 19 ++++++++++++-------
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/VersionASM b/VersionASM
index 3acf034d..4515926b 100644
--- a/VersionASM
+++ b/VersionASM
@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
-Module_MajorVersion SETS "5.01"
-Module_Version SETA 501
+Module_MajorVersion SETS "5.02"
+Module_Version SETA 502
Module_MinorVersion SETS ""
Module_Date SETS "25 Oct 1999"
-Module_FullVersion SETS "5.01"
+Module_FullVersion SETS "5.02"
END
diff --git a/VersionNum b/VersionNum
index e654f61a..66c9a4cd 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (5.01)
+/* (5.02)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.01
+#define Module_MajorVersion_CMHG 5.02
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Oct 1999
-#define Module_MajorVersion "5.01"
-#define Module_Version 501
+#define Module_MajorVersion "5.02"
+#define Module_Version 502
#define Module_MinorVersion ""
#define Module_Date "25 Oct 1999"
-#define Module_FullVersion "5.01"
+#define Module_FullVersion "5.02"
diff --git a/s/NewIRQs b/s/NewIRQs
index 9889571e..92313592 100644
--- a/s/NewIRQs
+++ b/s/NewIRQs
@@ -588,16 +588,21 @@ IrqReqADev3 * PrinterAck_DevNo
IrqReqAPrio1 * 1:SHL:1 ; not used
IrqReqADev1 * 1
+ [ ReassignedIOMDInterrupts
+ ASSERT IOMDr_PrinterIRQ_DevNo = 2
+
IrqReqAPrio2 * IOMD_printer_IRQ_bit
-IrqReqADev2 * IOMD_PrinterIRQ_DevNo
+IrqReqADev2 * IOMDr_PrinterIRQ_DevNo
- [ ReassignedIOMDInterrupts
- ASSERT IOMD_PrinterIRQ_DevNo = 2
IrqReqAPrio3 * 1:SHL:0 ; not used
IrqReqADev3 * 0
|
ASSERT IOMD_PrinterIRQ_DevNo = 0
ASSERT IOMD_FloppyIndex_DevNo = 2
+
+IrqReqAPrio2 * IOMD_printer_IRQ_bit
+IrqReqADev2 * IOMDr_PrinterIRQ_DevNo
+
IrqReqAPrio3 * IOMD_floppy_index_bit
IrqReqADev3 * IOMD_FloppyIndex_DevNo
]
@@ -704,16 +709,16 @@ IrqReqBDev7 * Serial_DevNo
[ IO_Type = "IOMD"
[ ReassignedIOMDInterrupts
IrqReqBPrio0 * IOMD_MPEGAudio_IRQ_bit
-IrqReqBDev0 * IOMD_MPEGAudio_DevNo
+IrqReqBDev0 * IOMDr_MPEGAudio_DevNo
IrqReqBPrio1 * IOMD_MPEGVideo_IRQ_bit
-IrqReqBDev1 * IOMD_MPEGVideo_DevNo
+IrqReqBDev1 * IOMDr_MPEGVideo_DevNo
IrqReqBPrio6 * IOMD_Network_IRQ_bit
-IrqReqBDev6 * IOMD_Network_DevNo
+IrqReqBDev6 * IOMDr_Network_DevNo
IrqReqBPrio7 * IOMD_serial_IRQ_bit
-IrqReqBDev7 * IOMD_Serial_DevNo
+IrqReqBDev7 * IOMDr_Serial_DevNo
|
IrqReqBPrio0 * IOMD_floppy_IRQ_bit
IrqReqBDev0 * DiscChanged_DevNo
--
GitLab