Changeset 267 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Timestamp:

Feb 24, 2012, 8:34:41 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• More JR-IDE/ISA fixes.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Files:

• IdeCommand.asm (modified) (6 diffs)
• IdeError.asm (modified) (3 diffs)
• IdeWait.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm

@@ -19 +19 @@
     call    AccessDPT_GetDeviceControlByteToAL
     or      al, FLG_DEVCONTROL_SRST | FLG_DEVCONTROL_nIEN   ; Set Reset bit
-    OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER DEVICE_CONTROL_REGISTER_out
+    OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER     DEVICE_CONTROL_REGISTER_out
     mov     ax, HSR0_RESET_WAIT_US
     call    Timer_DelayMicrosecondsFromAX
@@ -27 +27 @@
     or      al, FLG_DEVCONTROL_nIEN
     and     al, ~FLG_DEVCONTROL_SRST                        ; Clear reset bit
-    OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER DEVICE_CONTROL_REGISTER_out
+    OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER     DEVICE_CONTROL_REGISTER_out
     mov     ax, HSR1_RESET_WAIT_US
     call    Timer_DelayMicrosecondsFromAX
@@ -122 +122 @@
 .DoNotSetInterruptInServiceFlag:
 %endif
-    OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER DEVICE_CONTROL_REGISTER_out
+    OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER     DEVICE_CONTROL_REGISTER_out
 
     ; Output Feature Number
     mov     al, [bp+IDEPACK.bFeatures]
-    OUTPUT_AL_TO_IDE_REGISTER FEATURES_REGISTER_out
+    OUTPUT_AL_TO_IDE_REGISTER   FEATURES_REGISTER_out
 
     ; Output Sector Address High (only used by LBA48)
@@ -140 +140 @@
     ; Output command
     mov     al, [bp+IDEPACK.bCommand]
-    OUTPUT_AL_TO_IDE_REGISTER COMMAND_REGISTER_out
+    OUTPUT_AL_TO_IDE_REGISTER   COMMAND_REGISTER_out
 
     ; Wait until command completed
@@ -182 +182 @@
     ; Select Master or Slave Drive
     mov     al, [bp+IDEPACK.bDrvAndHead]
-    OUTPUT_AL_TO_IDE_REGISTER DRIVE_AND_HEAD_SELECT_REGISTER
+    OUTPUT_AL_TO_IDE_REGISTER   DRIVE_AND_HEAD_SELECT_REGISTER
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_DRDY, FLG_STATUS_DRDY)
     cmp     BYTE [bp+IDEPACK.bCommand], COMMAND_IDENTIFY_DEVICE
@@ -204 +204 @@
 ALIGN JUMP_ALIGN
 IDEDEVICE%+OutputSectorCountAndAddress:
-    OUTPUT_AL_TO_IDE_REGISTER SECTOR_COUNT_REGISTER
+    OUTPUT_AL_TO_IDE_REGISTER   SECTOR_COUNT_REGISTER
 
     mov     al, ah
-    OUTPUT_AL_TO_IDE_REGISTER LBA_LOW_REGISTER
+    OUTPUT_AL_TO_IDE_REGISTER   LBA_LOW_REGISTER
 
     mov     al, cl
-    OUTPUT_AL_TO_IDE_REGISTER LBA_MIDDLE_REGISTER
+    OUTPUT_AL_TO_IDE_REGISTER   LBA_MIDDLE_REGISTER
 
     mov     al, ch
-    JUMP_TO_OUTPUT_AL_TO_IDE_REGISTER LBA_HIGH_REGISTER
+    JUMP_TO_OUTPUT_AL_TO_IDE_REGISTER   LBA_HIGH_REGISTER

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeError.asm

@@ -20 +20 @@
 IDEDEVICE%+Error_GetBiosErrorCodeToAHfromPolledStatusRegisterInAL:
     mov     ah, al          ; IDE Status Register to AH
-    INPUT_TO_AL_FROM_IDE_REGISTER ERROR_REGISTER_in
+    INPUT_TO_AL_FROM_IDE_REGISTER   ERROR_REGISTER_in
+
+%ifndef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS    ; JR-IDE/ISA
+    jmp     ContinueFromMemIdeError
+%else
+ContinueFromMemIdeError:
     xchg    al, ah          ; Status Register now in AL, Error Register now in AH
 
@@ -30 +35 @@
 
     ; Fall to GetBiosErrorCodeToAHfromStatusAndErrorRegistersInAX
-%ifndef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS    ; JR-IDE/ISA
-    jmp     GetBiosErrorCodeToAHfromStatusAndErrorRegistersInAX
-%endif
+
 
 ;--------------------------------------------------------------------
@@ -46 +49 @@
 ;       BX
 ;--------------------------------------------------------------------
-%ifdef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS
 ALIGN JUMP_ALIGN
 GetBiosErrorCodeToAHfromStatusAndErrorRegistersInAX:

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeWait.asm

@@ -9 +9 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
-;       SS:BP:  Ptr to IDEPACK or PIOVARS
+;       SS:BP:  Ptr to IDEPACK, PIOVARS or MEMPIOVARS
 ;   Returns:
 ;       AH:     INT 13h Error Code