And IRQs tweaked one more time.

Version 5.03. Tagged as 'Kernel-5_03'

VersionASM

@@ -6,9 +6,9 @@
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
 			GBLS	Module_FullVersion
-Module_MajorVersion	SETS    "5.02"
-Module_Version          SETA    502
+Module_MajorVersion	SETS    "5.03"
+Module_Version          SETA    503
 Module_MinorVersion	SETS	""
 Module_Date		SETS    "25 Oct 1999"
-Module_FullVersion      SETS    "5.02"
+Module_FullVersion      SETS    "5.03"
                         END

VersionNum

-/* (5.02)
+/* (5.03)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	5.02
+#define Module_MajorVersion_CMHG     	5.03
 #define Module_MinorVersion_CMHG	
 #define Module_Date_CMHG      		25 Oct 1999
 
-#define Module_MajorVersion     	"5.02"
-#define Module_Version                  502
+#define Module_MajorVersion     	"5.03"
+#define Module_Version                  503
 #define Module_MinorVersion		""
 #define Module_Date      		"25 Oct 1999"
 
-#define Module_FullVersion              "5.02"
+#define Module_FullVersion              "5.03"

s/KbdResRCMM

@@ -134,7 +134,11 @@ SetUpKbd
         STRB    R0, UART_MCR
 
         MOV     R0, #IOMD_Base
+ [ ReassignedIOMDInterrupts
+        MOV     R1, #IOMDr_serial_IRQ_bit
+ |
         MOV     R1, #IOMD_serial_IRQ_bit
+ ]
         STRB    R1, [R0, #IOCIRQMSKB]
 
         MOV     R0, #InitKbdWs

s/NewIRQs

@@ -591,7 +591,7 @@ IrqReqADev1 * 1
  [ ReassignedIOMDInterrupts
  ASSERT IOMDr_PrinterIRQ_DevNo = 2
 
-IrqReqAPrio2 * IOMD_printer_IRQ_bit
+IrqReqAPrio2 * IOMDr_printer_IRQ_bit
 IrqReqADev2 * IOMDr_PrinterIRQ_DevNo
 
 IrqReqAPrio3 * 1:SHL:0          ; not used
@@ -600,7 +600,7 @@ IrqReqADev3 * 0
  ASSERT IOMD_PrinterIRQ_DevNo = 0
  ASSERT IOMD_FloppyIndex_DevNo = 2
 
-IrqReqAPrio2 * IOMD_printer_IRQ_bit
+IrqReqAPrio2 * IOMDr_printer_IRQ_bit
 IrqReqADev2 * IOMDr_PrinterIRQ_DevNo
 
 IrqReqAPrio3 * IOMD_floppy_index_bit
@@ -708,16 +708,16 @@ IrqReqBDev7 * Serial_DevNo
 
  [ IO_Type = "IOMD"
  [ ReassignedIOMDInterrupts
-IrqReqBPrio0 * IOMD_MPEGAudio_IRQ_bit
+IrqReqBPrio0 * IOMDr_MPEGAudio_IRQ_bit
 IrqReqBDev0 * IOMDr_MPEGAudio_DevNo
 
-IrqReqBPrio1 * IOMD_MPEGVideo_IRQ_bit
+IrqReqBPrio1 * IOMDr_MPEGVideo_IRQ_bit
 IrqReqBDev1 * IOMDr_MPEGVideo_DevNo
 
-IrqReqBPrio6 * IOMD_Network_IRQ_bit
+IrqReqBPrio6 * IOMDr_Network_IRQ_bit
 IrqReqBDev6 * IOMDr_Network_DevNo
 
-IrqReqBPrio7 * IOMD_serial_IRQ_bit
+IrqReqBPrio7 * IOMDr_serial_IRQ_bit
 IrqReqBDev7 * IOMDr_Serial_DevNo
  |
 IrqReqBPrio0 * IOMD_floppy_IRQ_bit