Changeset 559 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src

Timestamp:

Jun 24, 2013, 2:22:36 PM (11 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• All XT builds now default to 1 controller.
• Very late initialization handler now waits read command until installing and calling 19h.

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Handlers/Int13hBiosInit.asm (modified) (2 diffs)
• Main.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13hBiosInit.asm

@@ -26 +26 @@
 
 Int13hBiosInit_Handler:
+    ; Ignore all but read command (assumed to read boot sector)
+    cmp     ah, READ_SECTORS_INTO_MEMORY
+    jne     SHORT .MainBiosStillInInitializationMode
+
     LOAD_BDA_SEGMENT_TO ds, ax
 
@@ -33 +37 @@
     mov     [BIOS_BOOT_LOADER_INTERRUPT_19h*4+2], cs
     int     BIOS_BOOT_LOADER_INTERRUPT_19h  ; Does not return
+
+    ; Main BIOS might reset floppy drives etc. so let's wait longer
+    ; before installing our INT 19h handler.
+.MainBiosStillInInitializationMode:
+    int     TEMPORARY_VECTOR_FOR_SYSTEM_INT13h
+    retf    2
 
 

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -128 +128 @@
     at  ROMVARS.wBootTimeout,   dw  BOOT_MENU_DEFAULT_TIMEOUT
 %endif
-%ifdef MODULE_8BIT_IDE_ADVANCED
-    at  ROMVARS.bIdeCnt,        db  2                       ; Number of supported controllers
-%else
     at  ROMVARS.bIdeCnt,        db  1
-%endif
     at  ROMVARS.bBootDrv,       db  80h                     ; Boot Menu default drive
     at  ROMVARS.bMinFddCnt,     db  0                       ; Do not force minimum number of floppy drives
@@ -138 +134 @@
     at  ROMVARS.bIdleTimeout,   db  0                       ; Standby timer disabled by default
 
-    at  ROMVARS.ideVars0+IDEVARS.wBasePort,         dw  DEVICE_XTIDE_DEFAULT_PORT           ; Controller Command Block base port
-    at  ROMVARS.ideVars0+IDEVARS.wControlBlockPort, dw  DEVICE_XTIDE_DEFAULT_PORTCTRL       ; Controller Control Block base port
-    at  ROMVARS.ideVars0+IDEVARS.bDevice,           db  DEVICE_8BIT_XTIDE_REV1
+%ifdef MODULE_8BIT_IDE_ADVANCED
+    at  ROMVARS.ideVars0+IDEVARS.wBasePort,             dw  DEVICE_XTIDE_DEFAULT_PORT       ; Controller Command Block base port
+    at  ROMVARS.ideVars0+IDEVARS.bDevice,               db  DEVICE_8BIT_XTCF_PIO8
+%else
+    at  ROMVARS.ideVars0+IDEVARS.wBasePort,             dw  DEVICE_XTIDE_DEFAULT_PORT       ; Controller Command Block base port
+    at  ROMVARS.ideVars0+IDEVARS.wControlBlockPort,     dw  DEVICE_XTIDE_DEFAULT_PORTCTRL   ; Controller Control Block base port
+    at  ROMVARS.ideVars0+IDEVARS.bDevice,               db  DEVICE_8BIT_XTIDE_REV1
+%endif
     at  ROMVARS.ideVars0+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)
     at  ROMVARS.ideVars0+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)
-
-%ifdef MODULE_8BIT_IDE_ADVANCED
-    at  ROMVARS.ideVars1+IDEVARS.wBasePort,             dw  DEVICE_XTIDE_DEFAULT_PORT       ; Controller Command Block base port
-    at  ROMVARS.ideVars1+IDEVARS.bDevice,               db  DEVICE_8BIT_XTCF_PIO8
-%endif
 
     at  ROMVARS.ideVars1+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)