Changeset 258 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device

Timestamp:

Feb 22, 2012, 7:01:53 PM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Added floppy drive emulation over the serial connection (MODULE_SERIAL_FLOPPY). Along the way, various optimizations were made to stay within the 8K ROM size target. Also, serial code now returns the number of sectors transferred.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device

Files:

• Device.asm (modified) (1 diff)
• IDE/IdeDPT.asm (modified) (3 diffs)
• Serial/SerialCommand.asm (modified) (5 diffs)
• Serial/SerialDPT.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Device/Device.asm

@@ -37 +37 @@
 %ifdef MODULE_SERIAL
 Device_FinalizeDPT:
-    TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE .FinalizeDptForSerialPortDevice
+    ; needs to check IDEVARS vs. checking the DPT as the serial bit in the DPT is set in the Finalize routine
+    CMP_USING_IDEVARS_IN_CSBP_AND_JUMP_IF DEVICE_SERIAL_PORT, .FinalizeDptForSerialPortDevice
     jmp     IdeDPT_Finalize
-.FinalizeDptForSerialPortDevice:
+.FinalizeDptForSerialPortDevice: 
     jmp     SerialDPT_Finalize
 

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

@@ -12 +12 @@
 ;       CS:BP:  Ptr to IDEVARS for the controller
 ;   Returns:
-;       Nothing
+;       CF:     Clear, IDE interface only supports hard disks
 ;   Corrupts registers:
 ;       AX
@@ -42 +42 @@
 ;       CS:BP:  Ptr to IDEVARS for the controller
 ;   Returns:
-;       Nothing
+;       CF:     Always clear, we don't support floppies on the IDE inteface
 ;   Corrupts registers:
 ;       Nothing
@@ -52 +52 @@
 
 .EndDPT:
+    clc
     ret

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

@@ -56 +56 @@
 ;   Returns:
 ;       AH:     INT 13h Error Code
+;       CX:     Number of successfully transferred sectors (for transfer commands)
 ;       CF:     Cleared if success, Set if error
 ;   Corrupts registers:
@@ -309 +310 @@
         dec     al              ; decrement sector count
         push    ax              ; save
-        jz      SerialCommand_OutputWithParameters_ReturnCodeInALCF    ; CF=0 from "cmp ax,bp" returning Zero above
+        jz      SerialCommand_OutputWithParameters_ReturnCodeInAL
 
         cli                     ; interrupts back off for ACK byte to host
@@ -409 +410 @@
 
 .clearBufferComplete:
-        stc
-        mov     al,1
-
-ALIGN JUMP_ALIGN
-SerialCommand_OutputWithParameters_ReturnCodeInALCF:
+        mov     al, 3           ;  error return code and CF (low order bit)
+
+ALIGN JUMP_ALIGN
+SerialCommand_OutputWithParameters_ReturnCodeInAL:
 %if 0
         sti                     ;  all paths here will already have interrupts turned back on
 %endif
-        mov     ah,al
-
-        pop     bp              ;  recover ax (command and count) from stack, throw away
+        mov     ah, al          ;  for success, AL will already be zero
+
+        pop     bx              ;  recover "ax" (command and count) from stack
 
         pop     bp
         pop     di
         pop     si
+
+        mov     ch, 0
+        mov     cl,[bp+IDEPACK.bSectorCount]
+        sub     cl, bl          ; subtract off the number of sectors that remained
+        
+        shr     ah, 1           ; shift down return code and CF
 
         ret
@@ -632 +638 @@
         call    FindDPT_ToDSDIforSerialDevice
         pop     si
+%ifdef MODULE_SERIAL_FLOPPY
+        jc      .founddpt
+;
+; If not found above with FindDPT_ToDSDIforSerialDevice, DI will point to the DPT after the last hard disk DPT
+;
+        cmp     byte [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst], 0
+        jz      .notfounddpt
+.founddpt:
+%else
         jnc     .notfounddpt
+%endif
         mov     ax, [di+DPT_SERIAL.wSerialPortAndBaud]
 .notfounddpt:
@@ -678 +694 @@
 ; which is read by FinalizeDPT and DetectDrives
 ;
-        mov     [es:si+ATA6.wVendor],dx
+        mov     [es:si+ATA6.wSerialPortAndBaud],dx
 
 .notFound:

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

@@ -11 +11 @@
 ;       ES:SI:  Ptr to 512-byte ATA information read from the drive
 ;   Returns:
-;       Nothing
+;       CF:     Set, indicates that this is a floppy disk
+;               Clear, indicates that this is a hard disk
 ;   Corrupts registers:
 ;       AX
 ;--------------------------------------------------------------------
 SerialDPT_Finalize:
-        or      byte [di+DPT.bFlagsHigh], FLGH_DPT_SERIAL_DEVICE
-        mov     ax, [es:si+ATA6.wVendor]
+        mov     ax, [es:si+ATA6.wSerialPortAndBaud]
         mov     [di+DPT_SERIAL.wSerialPortAndBaud], ax
+
+;
+; Note that this section is not under %ifdef MODULE_SERIAL_FLOPPY.  It is important to 
+; detect floppy disks presented by the server and not treat them like hard disks, even
+; if the floppy support is disabled.
+;
+        mov     al, [es:si+ATA6.wSerialFloppyFlagAndType]
+        or      al, FLGH_DPT_SERIAL_DEVICE
+        or      byte [di+DPT.bFlagsHigh], al
+
+        test    al, FLGH_DPT_SERIAL_FLOPPY           ; clears CF
+        jz      .notfloppy
+        stc     
+.notfloppy:     
+        
         ret