Changeset 364 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc

Timestamp:

Mar 27, 2012, 4:21:58 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Advanced ATA Module variables are now kept in DPTs.
• Forced full mode when using Advanced ATA Module.

File:

• trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc

@@ -41 +41 @@
 ; IDE device only
 FLGH_DPT_INITERROR              EQU (1<<7)
+%ifdef MODULE_ADVANCED_ATA
+FLGH_DPT_IORDY                  EQU (1<<6)  ; Controller and Drive supports IORDY
+%endif
 
 ; Serial device only
@@ -63 +66 @@
     .bSetBlock                  resb    1   ; Current block size (do not set to zero!)
     .bMaxBlock                  resb    1   ; Maximum block size, 0 = block mode not supported
-
-%ifdef MODULE_ADVANCED_ATA  ; +2 extra bytes = 14 bytes
-    .bPioMode                   resb    1
-    .bDevice                    resb    1
-%endif
 endstruc
 
 
+; Additional variables needed to initialize and reset Advanced IDE Controllers.
+; EBDA must be reserved for DPTs when using these!
 %ifdef MODULE_ADVANCED_ATA
-; Temporary extension for DPT_ATA. Contents will be copied to BOOTMENUINFO and
-; then these variables will be overridden by next DPT.
 struc DPT_ADVANCED_ATA
     .dpt_ata                resb    DPT_ATA_size
-    .wIdeBasePort           resb    2   ; IDE Base Port
-    .wMinPioActiveTimeNs    resb    2   ; Minimum PIO Active Time in ns
-    .wMinPioRecoveryTimeNs  resb    2   ; Minimum PIO Recovery Time in ns
-    .wControllerID          resb    2   ; Controller specific ID WORD
+    .wControllerID          resb    2   ; Controller specific ID WORD (from Advanced Controller detection)
     .wControllerBasePort    resb    2   ; Advanced Controller port (not IDE port)
+    .wMinPioCycleTime       resb    2   ; Minimum PIO Cycle Time in ns
+    .bPioMode               resb    1   ; Best supported PIO mode
+    .bDevice                resb    1   ; Device Type from IDEVARS (overrided when 32-bit controller detected)
 endstruc
 %endif
 
 
+; DPT for Serial devices
 %ifdef MODULE_SERIAL
-; DPT for Serial devices
 struc DPT_SERIAL
     .dpt                        resb    DPT_size
@@ -98 +96 @@
 
 ; This is the common size for all DPTs. All DPTs must be equal size.
+%ifdef MODULE_ADVANCED_ATA
+LARGEST_DPT_SIZE                EQU     DPT_ADVANCED_ATA_size
+%else
 LARGEST_DPT_SIZE                EQU     DPT_ATA_size
+%endif