Changeset 493 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Main.asm

Timestamp:

Dec 21, 2012, 8:44:25 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Separated MODULE_8BIT_IDE into the basic part used by XTIDE rev 1 and rev 2 which is PIO based, and MODULE_8BIT_IDE_ADVANCED for JRIDE and XTCF support which requires memory mapping and/or DMA. This allows for creating an 8KB image with boot menu support (but no hotkeys) for the XTIDE rev 1. Cleaned up how we reset the drive translation information, ensuring it is properly set between boot attempt on a primary and secondary drive - as a result we clean it when needed, rather than trying to always keep it clean. Also fixed translation bugs in int13h.asm where I had previously missed converting some MODULE_HOTKEYS into MODULE_DRIVEXLATE.

File:

• trunk/XTIDE_Universal_BIOS/Src/Main.asm (modified) (4 diffs)

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
@@ -140 +144 @@
     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.bXTCFcontrolRegister,  db  XTCF_8BIT_PIO_MODE
     at  ROMVARS.ideVars1+IDEVARS.bDevice,               db  DEVICE_8BIT_XTCF_PIO8
     at  ROMVARS.ideVars1+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)
     at  ROMVARS.ideVars1+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)
+%else
+    at  ROMVARS.ideVars1+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)
+    at  ROMVARS.ideVars1+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)
+%endif      
 
     at  ROMVARS.ideVars2+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION)
@@ -227 +236 @@
 %endif
     %include "IdeCommand.asm"
-%ifdef MODULE_8BIT_IDE
+%ifdef MODULE_8BIT_IDE_ADVANCED
     %include "JrIdeTransfer.asm"    ; Must be included after IdeCommand.asm
     %include "IdeDmaBlock.asm"
@@ -261 +270 @@
     %include "AH11h_HRecal.asm"     ; Required by Int13h_Jump.asm
     %include "AH15h_HSize.asm"      ; Required by Int13h_Jump.asm
-%ifdef MODULE_8BIT_IDE
+%ifdef MODULE_8BIT_IDE_ADVANCED
     %include "AH1Eh_XTCF.asm"
 %endif