Changeset 152 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm

Timestamp:

May 1, 2011, 10:42:58 AM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• XTIDE mod should now be supported (untested).
• Interrupt Service Routine no longer requires variable from RAMVARS.
• Some small improvements.

File:

• trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm (modified) (7 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm

@@ -29 +29 @@
 ;--------------------------------------------------------------------
 .InitializeInt13hAnd40h:
-    mov     ax, [es:INTV_DISK_FUNC*4]           ; Load old INT 13h offset
-    mov     dx, [es:INTV_DISK_FUNC*4+2]         ; Load old INT 13h segment
+    mov     ax, [es:BIOS_DISK_INTERRUPT_13h*4]  ; Load old INT 13h offset
+    mov     dx, [es:BIOS_DISK_INTERRUPT_13h*4+2]; Load old INT 13h segment
     mov     [RAMVARS.fpOldI13h], ax             ; Store old INT 13h offset
     mov     [RAMVARS.fpOldI13h+2], dx           ; Store old INT 13h segment
-    mov     bx, INTV_DISK_FUNC                  ; INT 13h interrupt vector offset
+    mov     bx, BIOS_DISK_INTERRUPT_13h         ; INT 13h interrupt vector offset
     mov     si, Int13h_DiskFunctionsHandler     ; Interrupt handler offset
     call    Interrupts_InstallHandlerToVectorInBXFromCSSI
@@ -42 +42 @@
     call    FloppyDrive_IsInt40hInstalled
     jc      SHORT .InitializeInt19h
-    mov     [es:INTV_FLOPPY_FUNC*4], ax     ; Store old INT 13h offset
-    mov     [es:INTV_FLOPPY_FUNC*4+2], dx   ; Store old INT 13h segment
+    mov     [es:BIOS_DISKETTE_INTERRUPT_40h*4], ax      ; Store old INT 13h offset
+    mov     [es:BIOS_DISKETTE_INTERRUPT_40h*4+2], dx    ; Store old INT 13h segment
     ; Fall to .InitializeInt19h
 
@@ -57 +57 @@
 ;--------------------------------------------------------------------
 .InitializeInt19h:
-    mov     bx, INTV_BOOTSTRAP
+    mov     bx, BIOS_BOOT_LOADER_INTERRUPT_19h
     mov     si, Int19hMenu_BootLoader
     call    Interrupts_InstallHandlerToVectorInBXFromCSSI
@@ -110 +110 @@
 ;--------------------------------------------------------------------
 .InstallHighIrqHandler:
-    add     bx, BYTE INTV_IRQ8 - 8          ; Interrupt vector number
+    add     bx, BYTE HARDWARE_IRQ_8_INTERRUPT_70h - 8   ; Interrupt vector number
     mov     si, IdeIrq_InterruptServiceRoutineForIrqs8to15
     jmp     SHORT Interrupts_InstallHandlerToVectorInBXFromCSSI
@@ -125 +125 @@
 ;--------------------------------------------------------------------
 .InstallLowIrqHandler:
-    add     bx, BYTE INTV_IRQ0              ; Interrupt vector number
+    add     bx, BYTE HARDWARE_IRQ_0_INTERRUPT_08h       ; Interrupt vector number
     mov     si, IdeIrq_InterruptServiceRoutineForIrqs2to7
     ; Fall to Interrupts_InstallHandlerToVectorInBXFromCSSI
@@ -177 +177 @@
 .UnmaskHighIrqController:
     sub     al, 8               ; Slave interrupt number
-    mov     dx, PORT_8259SL_IMR ; Load Slave Mask Register address
+    mov     dx, SLAVE_8259_IMR
     call    .ClearBitFrom8259MaskRegister
     mov     al, 2               ; Master IRQ 2 to allow slave IRQs
@@ -192 +192 @@
 ;--------------------------------------------------------------------
 .UnmaskLowIrqController:
-    mov     dx, PORT_8259MA_IMR ; Load Mask Register address
+    mov     dx, MASTER_8259_IMR
     ; Fall to .ClearBitFrom8259MaskRegister