Changeset 226 in xtideuniversalbios

Timestamp:

Jan 28, 2012, 3:08:47 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Moved .bSerialPortAndBaud out of the main DPT into a an attached struc DPT_SERIAL, used by the serial port code only

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/CustomDPT.inc (modified) (2 diffs)
• Src/Device/Serial/SerialCommand.asm (modified) (3 diffs)
• Src/Device/Serial/SerialDPT.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc

@@ -12 +12 @@
     .bFlagsHigh                 resb    1
     .bIdevarsOffset             resb    1   ; Offset to IDEVARS for this drive
-%ifdef MODULE_SERIAL
-    .bSerialPortAndBaud         resb    1   ; Packed I/O port and baud rate for serial drives
-%else
-                                resb    1   ; without serial port support, alignment byte
-%endif
+                                resb    1   ; alignment byte
 
     ; IDE Drive related
@@ -35 +31 @@
     .bMaxBlock                  resb    1   ; Maximum block size, 0 = block mode not supported
 endstruc
+
+%ifdef MODULE_SERIAL
+; DPT for Serial devices
+struc DPT_SERIAL 
+    .dpt                        resb    DPT_size
+
+    .bSerialPortAndBaud         resb    1   ; Packed I/O port and baud rate for serial drives
+                                resb    1   ; unused alignment
+endstruc
+%endif
 
 LARGEST_DPT_SIZE                EQU     DPT_ATA_size

trunk/XTIDE_Universal_BIOS/Src/Device/Serial/SerialCommand.asm

@@ -91 +91 @@
         mov     [bp+IDEPACK.bFeatures],ah       ; store protocol command
 
-        mov     dl, byte [di+DPT.bSerialPortAndBaud]
+        mov     dl, byte [di+DPT_SERIAL.bSerialPortAndBaud]
 
 ; fall-through
@@ -113 +113 @@
         push    di
         push    bp
-        push    es
 
 ;
@@ -438 +437 @@
         pop     bp              ;  recover ax (command and count) from stack, throw away
 
-        pop     es
         pop     bp
         pop     di

trunk/XTIDE_Universal_BIOS/Src/Device/Serial/SerialDPT.asm

@@ -18 +18 @@
         or      byte [di+DPT.bFlagsHigh], FLGH_DPT_SERIAL_DEVICE
         mov     al, [RAMVARS.xlateVars+XLATEVARS.bLastSerial]
-        mov     byte [di+DPT.bSerialPortAndBaud], al
+        mov     byte [di+DPT_SERIAL.bSerialPortAndBaud], al
         ret