Index: trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm	(revision 150)
+++ trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm	(revision 152)
@@ -19,5 +19,5 @@
 ;--------------------------------------------------------------------
 FloppyDrive_IsInt40hInstalled:
-	cmp		WORD [es:INTV_FLOPPY_FUNC*4+2], 0C000h	; Any ROM segment?
+	cmp		WORD [es:BIOS_DISKETTE_INTERRUPT_40h*4+2], 0C000h	; Any ROM segment?
 %ifdef USE_AT	; No need to verify on XT systems.
 	jb		SHORT .Int40hHandlerIsNotInstalled
@@ -45,5 +45,5 @@
 
 	call	.LoadInt40hVerifyParameters
-	int		INTV_DISK_FUNC
+	int		BIOS_DISK_INTERRUPT_13h
 	jc		SHORT .Int40hIsInstalled	; Maybe there are not any floppy drives at all
 	push	es
@@ -51,5 +51,5 @@
 
 	call	.LoadInt40hVerifyParameters
-	int		INTV_FLOPPY_FUNC
+	int		BIOS_DISKETTE_INTERRUPT_40h
 
 	pop		dx
@@ -113,5 +113,5 @@
 	mov		ah, 08h			; Get Drive Parameters
 	xor		bx, bx			; FLOPPY_TYPE_525_OR_35_DD when function not supported
-	int		INTV_FLOPPY_FUNC
+	int		BIOS_DISKETTE_INTERRUPT_40h
 	ret
 
@@ -167,5 +167,5 @@
 	mov		ah, 08h					; Get Drive Parameters
 	cwd								; Floppy Drive 00h
-	int		INTV_FLOPPY_FUNC
+	int		BIOS_DISKETTE_INTERRUPT_40h
 	mov		cl, dl					; Number of Floppy Drives to CL
 
Index: trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm	(revision 150)
+++ trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm	(revision 152)
@@ -89,14 +89,16 @@
 .StoreDptPointersToIntVectors:
 	mov		dl, 80h
+	call	RamVars_IsDriveHandledByThisBIOS
+	jnc		SHORT .FindForDrive81h	; Store nothing if not our drive
 	call	FindDPT_ForDriveNumber	; DPT to DS:DI
-	jnc		SHORT .FindForDrive81h	; Store nothing if not our drive
-	mov		[es:INTV_HD0DPT*4], di
-	mov		[es:INTV_HD0DPT*4+2], ds
+	mov		[es:HD0_DPT_POINTER_41h*4], di
+	mov		[es:HD0_DPT_POINTER_41h*4+2], ds
 .FindForDrive81h:
 	inc		dx
+	call	RamVars_IsDriveHandledByThisBIOS
+	jnc		SHORT .ResetDetectedDrives
 	call	FindDPT_ForDriveNumber
-	jnc		SHORT .ResetDetectedDrives
-	mov		[es:INTV_HD1DPT*4], di
-	mov		[es:INTV_HD1DPT*4+2], ds
+	mov		[es:HD1_DPT_POINTER_46h*4], di
+	mov		[es:HD1_DPT_POINTER_46h*4+2], ds
 	; Fall to .ResetDetectedDrives
 
Index: trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm	(revision 150)
+++ trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm	(revision 152)
@@ -29,9 +29,9 @@
 ;--------------------------------------------------------------------
 .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,6 +42,6 @@
 	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,5 +57,5 @@
 ;--------------------------------------------------------------------
 .InitializeInt19h:
-	mov		bx, INTV_BOOTSTRAP
+	mov		bx, BIOS_BOOT_LOADER_INTERRUPT_19h
 	mov		si, Int19hMenu_BootLoader
 	call	Interrupts_InstallHandlerToVectorInBXFromCSSI
@@ -110,5 +110,5 @@
 ;--------------------------------------------------------------------
 .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,5 +125,5 @@
 ;--------------------------------------------------------------------
 .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,5 +177,5 @@
 .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,5 +192,5 @@
 ;--------------------------------------------------------------------
 .UnmaskLowIrqController:
-	mov		dx, PORT_8259MA_IMR	; Load Mask Register address
+	mov		dx, MASTER_8259_IMR
 	; Fall to .ClearBitFrom8259MaskRegister
 
