Changeset 334 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/Serial

Timestamp:

Mar 13, 2012, 5:29:34 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial server DPT flag optimization, remove Serial/IDE specific header on drive scan results, added GNU GPL v2 banner at boot.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device/Serial

Files:

• SerialCommand.asm (modified) (2 diffs)
• SerialDPT.asm (modified) (1 diff)

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

@@ -54 +54 @@
 %include "SerialServer.asm"
 
-%if SerialCommand_FallThroughToSerialServer_SendReceive <> SerialServer_SendReceive
-%error "SerialServer_SendReceive must be the first routine at the top of SerialServer.asm in the Assembly_Library"
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS        
+    %if SerialCommand_FallThroughToSerialServer_SendReceive <> SerialServer_SendReceive
+        %error "SerialServer_SendReceive must be the first routine at the top of SerialServer.asm in the Assembly_Library"
+    %endif
 %endif
 
@@ -163 +165 @@
 %include "SerialServerScan.asm"
 
-%if SerialCommand_FallThroughToSerialServerScan_ScanForServer <> SerialServerScan_ScanForServer
-%error "SerialServerScan_ScanForServer must be the first routine at the top of SerialServerScan.asm in the Assembly_Library"
-%endif              
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS                
+    %if SerialCommand_FallThroughToSerialServerScan_ScanForServer <> SerialServerScan_ScanForServer
+        %error "SerialServerScan_ScanForServer must be the first routine at the top of SerialServerScan.asm in the Assembly_Library"
+    %endif
+%endif
 
 

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

@@ -25 +25 @@
 ; if the floppy support is disabled.
 ;
-        mov     al, [es:si+SerialServer_ATA_wFloppyFlagAndType]
-        or      al, FLGH_DPT_SERIAL_DEVICE
-        or      byte [di+DPT.bFlagsHigh], al
-
-        test    al, FLGH_DPT_SERIAL_FLOPPY           ; clears CF
-        jz      .notfloppy
-        stc     
-.notfloppy:     
+        mov     al, [es:si+SerialServer_ATA_wDriveFlags]
+        shl     al, 1
+        mov     byte [di+DPT.bFlagsHigh], al
         
         ret
 
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
+    %if FLGH_DPT_SERIAL_DEVICE != 0x4 || FLGH_DPT_SERIAL_FLOPPY != 0x10 || FLGH_DPT_SERIAL_FLOPPY_TYPE_MASK != 0xe0 || FLGH_DPT_SERIAL_FLOPPY_TYPE_FIELD_POSITION != 5
+        %error "The serial server passes FLGH values into SerialDPT_Finalize directly.  If the flag positions are changed, corresponding changes will need to be made in the serial server, and likely a version check put in to deal with servers talking to incompatible clients"
+    %endif
+%endif