Changeset 364 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/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.

Location:

trunk/XTIDE_Universal_BIOS/Inc

Files:

• ATA_ID.inc (modified) (4 diffs)
• BootMenu.inc (modified) (1 diff)
• CustomDPT.inc (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Inc/ATA_ID.inc

@@ -5 +5 @@
 
 ; PIO Minimum Cycle Times (t0)
-; Timings for Advanced modes 3 and 4 can be read from ATA info WORDs 67 and 68
+; Timings for Advanced Modes (3 and above) can be read from ATA info WORDs 67 and 68
+; Those usually have the same Cycle Time as below
 PIO_0_MIN_CYCLE_TIME_NS     EQU     600
 PIO_1_MIN_CYCLE_TIME_NS     EQU     383
@@ -11 +12 @@
 PIO_3_MIN_CYCLE_TIME_NS     EQU     180
 PIO_4_MIN_CYCLE_TIME_NS     EQU     120
+PIO_5_MIN_CYCLE_TIME_NS     EQU     100     ; CF specification
+PIO_6_MIN_CYCLE_TIME_NS     EQU     80      ; CF specification
 
 ; PIO Minimum Address Valid Times (t1)
@@ -18 +21 @@
 PIO_3_MIN_ADDRESS_VALID_NS  EQU     30
 PIO_4_MIN_ADDRESS_VALID_NS  EQU     25
+PIO_5_MIN_ADDRESS_VALID_NS  EQU     25      ; Could not find info
+PIO_6_MIN_ADDRESS_VALID_NS  EQU     25      ; Could not find info
 
 ; PIO Minimum Active Times (t2)
@@ -25 +30 @@
 PIO_3_MIN_ACTIVE_TIME_NS    EQU     80
 PIO_4_MIN_ACTIVE_TIME_NS    EQU     70
+PIO_5_MIN_ACTIVE_TIME_NS    EQU     70      ; Could not find info
+PIO_6_MIN_ACTIVE_TIME_NS    EQU     70      ; Could not find info
 
 ; PIO Minimum Recovery Times or Inactive Times (t2i) can be calculated

trunk/XTIDE_Universal_BIOS/Inc/BootMenu.inc

@@ -27 +27 @@
                             resb    2   ; Zero word (ensures string terminates)
     .wInitErrorFlags        resb    2   ; Errors during initialization
-
+    
 %ifdef MODULE_ADVANCED_ATA
-    .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
-    .wControllerBasePort    resb    2   ; Advanced Controller port (not IDE port)
-                            resb    12  ; padding to make BOOTMENUINFO size an even multiple of DPT size
-
+                            resb    6   ; padding to make BOOTMENUINFO size an even multiple of DPT size
 %else
                             resb    2   ; padding to make BOOTMENUINFO size an even multiple of DPT size
 %endif
+                            
+                            
 endstruc
 

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