Changeset 258 in xtideuniversalbios

Timestamp:

Feb 22, 2012, 7:01:53 PM (12 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

Files:

• Assembly_Library/Inc/Macros.inc (modified) (2 diffs)
• Serial_Server/library/Image.cpp (modified) (6 diffs)
• Serial_Server/library/Library.h (modified) (1 diff)
• Serial_Server/library/Process.cpp (modified) (1 diff)
• Serial_Server/win32/Win32.cpp (modified) (3 diffs)
• Serial_Server/win32/Win32Serial.h (modified) (4 diffs)
• XTIDE_Universal_BIOS/Inc/ATA_ID.inc (modified) (1 diff)
• XTIDE_Universal_BIOS/Inc/CustomDPT.inc (modified) (1 diff)
• XTIDE_Universal_BIOS/Inc/RamVars.inc (modified) (2 diffs)
• XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm (modified) (8 diffs)
• XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm (modified) (2 diffs)
• XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm (modified) (11 diffs)
• XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm (modified) (11 diffs)
• XTIDE_Universal_BIOS/Src/Device/Device.asm (modified) (1 diff)
• XTIDE_Universal_BIOS/Src/Device/IDE/IdeDPT.asm (modified) (3 diffs)
• XTIDE_Universal_BIOS/Src/Device/Serial/SerialCommand.asm (modified) (5 diffs)
• XTIDE_Universal_BIOS/Src/Device/Serial/SerialDPT.asm (modified) (1 diff)
• XTIDE_Universal_BIOS/Src/Handlers/Int13h.asm (modified) (5 diffs)
• XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm (modified) (7 diffs)
• XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH15h_HSize.asm (modified) (2 diffs)
• XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH1h_HStatus.asm (modified) (1 diff)
• XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH2h_HRead.asm (modified) (1 diff)
• XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH8h_HParams.asm (modified) (5 diffs)
• XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH9h_HInit.asm (modified) (1 diff)
• XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm (modified) (1 diff)
• XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm (modified) (2 diffs)
• XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm (modified) (3 diffs)
• XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm (modified) (3 diffs)
• XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm (modified) (8 diffs)
• XTIDE_Universal_BIOS/Src/Main.asm (modified) (1 diff)
• XTIDE_Universal_BIOS/Src/VariablesAndDPTs/CreateDPT.asm (modified) (3 diffs)
• XTIDE_Universal_BIOS/Src/VariablesAndDPTs/FindDPT.asm (modified) (6 diffs)
• XTIDE_Universal_BIOS/Src/VariablesAndDPTs/RamVars.asm (modified) (5 diffs)
• XTIDE_Universal_BIOS/makefile (modified) (1 diff)
• XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm (modified) (1 diff)
• XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm (modified) (1 diff)

trunk/Assembly_Library/Inc/Macros.inc

@@ -52 +52 @@
 ; when stack usage is undesirable (ie speed is critical).
 ;
+; The PRESERVE_FLAGS version will zero the register with a MOV instead
+; of an XOR, thus preserving the flags.  It is one byte larger on
+; non-186 or higher systems.
+;
 ; LOAD_BDA_SEGMENT_TO
+; LOAD_BDA_SEGMENT_PRESERVE_FLAGS_TO
 ;   Parameters:
 ;       %1:     Destination Segment Register
@@ -68 +73 @@
 %elifidn %3, !
     xor     %2, %2
+    mov     %1, %2
+%else
+    push    BYTE 0
+    pop     %1
+%endif
+%endmacro
+
+%macro LOAD_BDA_SEGMENT_PRESERVE_FLAGS_TO 2-3
+%ifndef USE_186
+    mov     %2, 0
+    mov     %1, %2
+%elifidn %3, !
+    mov     %2, 0
     mov     %1, %2
 %else

trunk/Serial_Server/library/Image.cpp

@@ -12 +12 @@
 #include <stdio.h>
 
+struct floppyInfo {
+    unsigned long size;
+    unsigned char type;
+    unsigned char cylinders;
+    unsigned char heads;
+    unsigned char sectors;
+} floppyInfos[] = 
+{
+{ 2949120 / 512, 6, 80, 2, 36 },   // 2.88MB 3.5"
+{ 1474560 / 512, 4, 80, 2, 18 },        // 1.44MB 3.5"
+{ 1228800 / 512, 2, 80, 2, 15 },     // 1.2MB 5.25"
+{ 737280 / 512, 3, 80, 1, 18 },    // 720KB 3.5"
+{ 368640 / 512, 1, 40, 2, 9 }, // 360KB 5.25"
+{ 327680 / 512, 0, 40, 2, 8 }, // 320KB 5.25"
+{ 184320 / 512, 0, 40, 1, 9 }, // 180KB 5.25" single sided
+{ 163840 / 512, 0, 40, 1, 8 }, // 160KB 5.25" single sided
+{ 0, 0, 0, 0, 0 }
+};
+
 Image::Image( char *name, int p_readOnly, int p_drive )
 {
@@ -27 +46 @@
 {
     double sizef;
+    char sizeChar;
+    struct floppyInfo *f;
 
     for( char *c = shortFileName = name; *c; c++ )
@@ -46 +67 @@
     if( totallba == 0 )
         log( -1, "'%s', Image size zero?" );
+
+    floppy = 0;
+    for( f = floppyInfos; f->size && f->size != totallba; f++ ) ;
+    if( f->size )
+    {
+        floppy = 1;
+        floppyType = f->type;
+        p_useCHS = 1;
+        p_cyl = f->cylinders;
+        p_head = f->heads;
+        p_sect = f->sectors;
+    }
 
     if( p_useCHS )
@@ -82 +115 @@
 
     sizef = totallba/2048.0;
+    sizeChar = 'M';
+    if( sizef < 1 ) 
+    {
+        sizef *= 1024;
+        sizeChar = 'K';
+    }
     if( useCHS )
-        log( 0, "Opening '%s', CHS geometry %u:%u:%u, total LBA %lu, total size %.1lf MB", name, cyl, sect, head, totallba, sizef );
-    else
-        log( 0, "Opening '%s', total LBA %lu, total size %.1lf MB", name, totallba, sizef );
+        log( 0, "%s: %s with CHS geometry %u:%u:%u, size %.2lf %cB",
+             name, (floppy ? "Floppy Disk" : "Hard Disk"), cyl, head, sect, sizef, sizeChar );
+    else
+        log( 0, "%s: %s with total sectors %lu, size %.2lf %cB", 
+             name, (floppy ? "Floppy Disk" : "Hard Disk"), totallba, sizef, sizeChar );
 }
 
@@ -137 +178 @@
 #define ATA_dwLBACnt 60
 
-#define ATA_wVendor 159
-
+// Words carved out of the vendor specific area for our use
+//
+#define ATA_wSerialFloppyFlagAndType 158
+#define ATA_wSerialPortAndBaud 159
+
+// Defines used in the words above
+//
 #define ATA_wCaps_LBA 0x200
 
 #define ATA_wGenCfg_FIXED 0x40
+
+#define ATA_wSerialFloppyFlagAndType_Flag 0x10
+#define ATA_wSerialFloppyFlagAndType_TypePosition 5
 
 struct comPorts {
@@ -207 +256 @@
     }
 
+    if( floppy )
+        buff[ ATA_wSerialFloppyFlagAndType ] = ATA_wSerialFloppyFlagAndType_Flag | (floppyType << ATA_wSerialFloppyFlagAndType_TypePosition);
+
+    // we always set this, so that the bulk of the BIOS will consider this disk as a hard disk
+    //
     buff[ ATA_wGenCfg ] = ATA_wGenCfg_FIXED;
-    //                  buff[ ATA_VendorSpecific_ReturnPortBaud ] = retWord;
-}
+}

trunk/Serial_Server/library/Library.h

@@ -32 +32 @@
 
     unsigned long cyl, sect, head;
+    unsigned char floppy, floppyType;
     int useCHS;
 

trunk/Serial_Server/library/Process.cpp

@@ -99 +99 @@
     lastScan = 0;
 
+    //
+    // Floppy disks must come after any hard disks
+    //
+    if( (image0 && image0->floppy) && (image1 && !image1->floppy) )
+    {
+        img = image0;
+        image0 = image1;
+        image1 = img;
+    }
+
     lasttick = GetTime();
 

trunk/Serial_Server/win32/Win32.cpp

@@ -30 +30 @@
         "  -n [megabytes]      Create new disk with given size or use -g geometry",
         "                      Maximum size is " USAGE_MAXSECTORS, 
-        "                      (default is a 32 MB disk, with CHS geometry 65:63:16)",
-        "",
-        "  -p                  Named Pipe mode for emulators (pipe is \"" PIPENAME "\")",
-        "",
-        "  -c COMPortNumber    COM Port to use (default is first found)",
+        "                      (default is a 32 MB disk, with CHS geometry 65:16:63)",
+        "",
+        "  -p [pipename]       Named Pipe mode for emulators",
+        "                      (must begin with \"\\\\\", default is \"" PIPENAME "\")",
+        "",
+        "  -c COMPortNumber    COM Port to use (default is first found)",
+        "                      Available COM ports on this system are:",
+     "COM                          ",
         "",
         "  -b BaudRate         Baud rate to use on the COM port, with client machine",
@@ -53 +56 @@
         "with xtidecfg.com.  Or one can hold down the ALT key at the end of the normal",
         "IDE hard disk scan and the XTIDE Universal BIOS will scan COM1-7, at each of",
-        "the four speeds given above for BaudRate.  Note that hardware rate multipliers",
+        "the six speeds given above for BaudRate.  Note that hardware rate multipliers",
         "must be taken into account on the server end, but are invisible on the client.",
+        "",
+        "Floppy images may also be used.  Image size must be exactly the same size",
+        "as a 2.88MB, 1.44MB, 1.2MB, 720KB, 360KB, 320KB, 180KB, or 160KB disk.",
+        "Floppy images must be the last disks discovered by the BIOS, and only",
+        "two floppy drives are supported by the BIOS at a time.",
         NULL };
 
     for( int t = 0; usageStrings[t]; t++ )
-        fprintf( stderr, "%s\n", usageStrings[t] );
+    {
+        if( !strncmp( usageStrings[t], "COM", 3 ) )
+        {
+            char logbuff[ 1024 ];
+
+            SerialAccess::EnumerateCOMPorts( logbuff, 1024 );
+            fprintf( stderr, "%s%s\n", usageStrings[t]+3, logbuff );
+        }
+        else
+            fprintf( stderr, "%s\n", usageStrings[t] );
+    }
 
     exit( 1 );
@@ -120 +138 @@
                 break;
             case 'p': case 'P':
-                ComPort = "PIPE";
+                if( argv[t+1][0] == '\\' && argv[t+1][1] == '\\' )
+                    ComPort = argv[++t];
+                else
+                    ComPort = PIPENAME;
                 if( !baudRate )
                     baudRate = baudRateMatchString( "115200" );

trunk/Serial_Server/win32/Win32Serial.h

@@ -35 +35 @@
         }
 
-        if( !strcmp( name, "PIPE" ) )
+        if( name[0] == '\\' && name[1] == '\\' )
         {
-            log( 0, "Opening named pipe %s (simulating %s baud)", PIPENAME, baudRate->display );
+            log( 0, "Opening named pipe %s (simulating %s baud)", name, baudRate->display );
         
-            pipe = CreateNamedPipeA( PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );
+            pipe = CreateNamedPipeA( name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );
             if( pipe == INVALID_HANDLE_VALUE )
                 log( -1, "Could not CreateNamedPipe " PIPENAME );
@@ -59 +59 @@
                 DCB dcb;
 
-                log( 0, "Opening %s (%lu baud)", name, baudRate->rate );
+                log( 0, "Opening %s (%s baud)", name, baudRate->display );
             
                 pipe = CreateFileA( name, GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
@@ -74 +74 @@
                 dcb.Parity = NOPARITY;
                 if( !SetCommState( pipe, &dcb ) )
-                    log( -1, "Could not SetCommState" );
+                {
+                    char *msg = "";
+                    COMMPROP comProp;
+
+                    if( GetCommProperties( pipe, &comProp ) )
+                    {
+                        if( comProp.dwMaxBaud != BAUD_USER )
+                            msg = "\n    On this COM port, baud rate is limited to 115.2K";
+                    }
+                    log( -1, "Could not SetCommState: baud rate selected may not be availabele%s", msg );
+                }
 
                 if( !SetCommTimeouts( pipe, &timeouts ) )
@@ -82 +92 @@
             {
                 char logbuff[ 1024 ];
-                int found = 0;
 
-                sprintf( logbuff, "serial port '%s' not found, detected COM ports:", name );
-
-                for( int t = 1; t <= 40; t++ )
-                {
-                    sprintf( buff1, "COM%d", t );
-                    if( QueryDosDeviceA( buff1, buff2, sizeof(buff2) ) )
-                    {
-                        strcat( logbuff, "\n    " );
-                        strcat( logbuff, buff1 );
-                        found = 1;
-                    }
-                }
-                if( !found )
-                    strcat( logbuff, "\n    (none)" );
+                EnumerateCOMPorts( logbuff, 1024 );
                 
-                log( -1, logbuff );
+                log( -1, "Serial port '%s' not found, detected COM ports: %s", name, logbuff );
             }
         }
+    }
+
+    static void EnumerateCOMPorts( char *logbuff, int logbuffLen )
+    {
+        int found = 0;
+        char buff1[20], buff2[1024];
+
+        logbuff[0] = 0;
+
+        for( int t = 1; t <= 40 && strlen(logbuff) < (logbuffLen - 40); t++ )
+        {
+            sprintf( buff1, "COM%d", t );
+            if( QueryDosDeviceA( buff1, buff2, sizeof(buff2) ) )
+            {
+                if( found )
+                    strcat( logbuff, ", " );
+                strcat( logbuff, buff1 );
+                found = 1;
+            }
+        }
+
+        if( !found )
+            strcat( logbuff, "(none)" );
     }
 

trunk/XTIDE_Universal_BIOS/Inc/ATA_ID.inc

@@ -254 +254 @@
     .wRMSN      resw 1  ; 127F, Removable Media Status Notification feature set support
     .wSecurity  resw 1  ; 128FV, Security Status
-                resw 159-129    ; 129...158X, Vendor Specific
-    .wVendor    resw 1  ; 159X, Vendor Specific - picking one word for use by the Serial Port code
+                resw 158-129    ; 129...157X, Vendor Specific
+    .wSerialFloppyFlagAndType:
+    .wVendor1   resw 1  ; 158x, Vendor specific - word for use by the serial port code
+    .wSerialPortAndBaud:
+    .wVendor2   resw 1  ; 159X, Vendor Specific - word for use by the Serial Port code
     .wCFAPower  resw 1  ; 160FV, CFA Power Mode 1
                 resw 176-161    ; 161...175R, Reserved for assignment by the CompactFlash Association

trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc

@@ -68 +68 @@
 MASKH_DPT_RESET                 EQU 0F0h
 
+FLGH_DPT_SERIAL_FLOPPY                      EQU (1<<4)
+FLGH_DPT_SERIAL_FLOPPY_TYPE_MASK            EQU 0e0h
+FLGH_DPT_SERIAL_FLOPPY_TYPE_FIELD_POSITION  EQU 5
+
 ; Addressing modes for DPT.wFlags
 ADDRESSING_MODE_FIELD_POSITION  EQU     5

trunk/XTIDE_Universal_BIOS/Inc/RamVars.inc

@@ -11 +11 @@
 struc XLATEVARS
     .wFDandHDswap:
-    .bFDSwap        resb    1   ; Floppy Drive to swap to 00h and vice versa
-    .bHDSwap        resb    1   ; Hard Drive to swap to 80h and vice versa
-    .bXlatedDrv     resb    1   ; Drive number after translation
-                    resb    1   ; alignment
+    .bFDSwap            resb    1   ; Floppy Drive to swap to 00h and vice versa
+    .bHDSwap            resb    1   ; Hard Drive to swap to 80h and vice versa
+    .bXlatedDrv         resb    1   ; Drive number after translation
+%ifdef MODULE_SERIAL_FLOPPY
+    .bFlopCreateCnt:
+    .bFlopCntAndFirst   resb    1   ; Normally, packed starting floppy drive number (high order 7 bits)
+                                    ; and number of drives (low order bit, max 2 drives supported).
+                                    ; During initialization, until the end of DetectDrives_FromAllIDEControllers,
+                                    ; this byte contains the raw number of floppy drives seen (using .bFlopCreateCnt)
+%else
+                        resb    1   ; alignment
+%endif
 endstruc
 
@@ -27 +35 @@
 
     .wDrvCntAndFirst:
+    .bFirstDrv          resb    1   ; Number of first drive for this BIOS
     .bDrvCnt            resb    1   ; Number of drives handled by this BIOS
-    .bFirstDrv          resb    1   ; Number of first drive for this BIOS
 
     ; Variables for drive number translation

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm

@@ -37 +37 @@
 ;               Clear: There is no selected menu item, DL is not valid
 ;   Corrupts registers:
-;       CX, DI
+;       AX, DI
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
@@ -50 +50 @@
 
     mov     dl, cl                          ; Copy menuitem index to DX
-    call    FloppyDrive_GetCountToCX
-    cmp     dl, cl                          ; Floppy drive?
+    call    FloppyDrive_GetCountToAX
+    cmp     dl, al                          ; Floppy drive?
     jb      SHORT .ReturnFloppyDriveInDX    ; Set CF if branch taken
-    or      cl, 80h                         ; Or 80h into CL before the sub
+    or      al, 80h                         ; Or 80h into AL before the sub
                                             ; to cause CF to be set after
                                             ; and result has high order bit set
-    sub     dl, cl                          ; Remove floppy drives from index
+    sub     dl, al                          ; Remove floppy drives from index
 
 .ReturnFloppyDriveInDX:
@@ -94 +94 @@
 ALIGN JUMP_ALIGN
 BootMenu_GetMenuitemCountToAX:
-    call    RamVars_GetHardDiskCountFromBDAtoCX
+    call    RamVars_GetHardDiskCountFromBDAtoAX
     xchg    ax, cx
-    call    FloppyDrive_GetCountToCX
+    call    FloppyDrive_GetCountToAX
     add     ax, cx
     ret
@@ -136 +136 @@
 BootMenu_GetMenuitemToAXforAsciiHotkeyInAL:
     call    Char_ALtoUpperCaseLetter
-    call    BootMenu_GetLetterForFirstHardDiskToCL
     xor     ah, ah
-    cmp     al, cl                      ; Letter is for Hard Disk?
+    xchg    ax, cx
+    call    BootMenu_GetLetterForFirstHardDiskToAL
+    cmp     cl, al                      ; Letter is for Hard Disk?
     jae     SHORT .StartFromHardDiskLetter
+    xchg    ax, cx
     sub     al, 'A'                     ; Letter to Floppy Drive menuitem
     ret
 ALIGN JUMP_ALIGN
 .StartFromHardDiskLetter:
-    sub     al, cl                      ; Hard Disk index
-    call    FloppyDrive_GetCountToCX
+    sub     cl, al                      ; Hard Disk index
+    call    FloppyDrive_GetCountToAX
     add     ax, cx                      ; Menuitem index
+                                        ; Note: no need to xchg ax, cx as above, since adding with result to ax
     ret
 
@@ -160 +163 @@
 ;       CL:     Upper case letter for first hard disk
 ;   Corrupts registers:
-;       CH
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootMenu_GetLetterForFirstHardDiskToCL:
-    call    FloppyDrive_GetCountToCX
-    add     cl, 'A'
-    cmp     cl, 'C'
+;       AX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+BootMenu_GetLetterForFirstHardDiskToAL:
+    call    FloppyDrive_GetCountToAX
+    add     al, 'A'
+    cmp     al, 'C'
     ja      .Return
-    mov     cl, 'C'
+    mov     al, 'C'
 ALIGN JUMP_ALIGN, ret
 .Return:
@@ -181 +184 @@
 ;       DX:     Menuitem index (assuming drive is available)
 ;   Corrupts registers:
-;       Nothing
+;       AX
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
@@ -188 +191 @@
     test    dl, dl
     jns     SHORT .ReturnItemIndexInDX  ; Return if floppy drive (HD bit not set)
-    call    FloppyDrive_GetCountToCX
+    call    FloppyDrive_GetCountToAX
     and     dl, ~80h                    ; Clear HD bit
-    add     dx, cx
+    add     dx, ax
 .ReturnItemIndexInDX:
     ret
@@ -212 +215 @@
     test    dl, dl                              ; Floppy drive?
     jns     SHORT .IsFloppyDriveInSystem
-    call    RamVars_GetHardDiskCountFromBDAtoCX ; Hard Disk count to CX
-    or      cl, 80h                             ; Set Hard Disk bit to CX
+    call    RamVars_GetHardDiskCountFromBDAtoAX ; Hard Disk count to AX
+    or      al, 80h                             ; Set Hard Disk bit to AX
     jmp     SHORT .CompareDriveNumberToDriveCount
 .IsFloppyDriveInSystem:
-    call    FloppyDrive_GetCountToCX
+    call    FloppyDrive_GetCountToAX
 .CompareDriveNumberToDriveCount:
-    cmp     dl, cl                              ; Set CF when DL is smaller
-    ret
+    cmp     dl, al                              ; Set CF when DL is smaller
+    ret

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm

@@ -21 +21 @@
 %ifdef MENUEVENT_INLINE_OFFSETS
 
-    add     bx, BootMenuEvent_Handler
+    add     bx, BootMenuEvent_Handler.FirstEvent
     jmp     bx
 
-MENUEVENT_InitializeMenuinitFromDSSI equ  (BootMenuEvent_Handler.InitializeMenuinitFromDSSI - BootMenuEvent_Handler)
-MENUEVENT_ExitMenu equ  (BootMenuEvent_EventCompleted - BootMenuEvent_Handler)
-MENUEVENT_ItemHighlightedFromCX equ (BootMenuEvent_Handler.ItemHighlightedFromCX - BootMenuEvent_Handler)
-MENUEVENT_ItemSelectedFromCX equ (BootMenuEvent_Handler.ItemSelectedFromCX - BootMenuEvent_Handler)
-MENUEVENT_KeyStrokeInAX equ (BootMenuEvent_Handler.KeyStrokeInAX - BootMenuEvent_Handler)
-MENUEVENT_RefreshTitle equ (BootMenuPrint_TitleStrings - BootMenuEvent_Handler)
-MENUEVENT_RefreshInformation equ (BootMenuPrint_RefreshInformation - BootMenuEvent_Handler)
-MENUEVENT_RefreshItemFromCX equ (BootMenuPrint_RefreshItem - BootMenuEvent_Handler)
+MENUEVENT_InitializeMenuinitFromDSSI equ  (BootMenuEvent_Handler.InitializeMenuinitFromDSSI - BootMenuEvent_Handler.FirstEvent)
+MENUEVENT_ExitMenu equ  (BootMenuEvent_EventCompleted - BootMenuEvent_Handler.FirstEvent)
+MENUEVENT_ItemHighlightedFromCX equ (BootMenuEvent_Handler.ItemHighlightedFromCX - BootMenuEvent_Handler.FirstEvent)
+MENUEVENT_ItemSelectedFromCX equ (BootMenuEvent_Handler.ItemSelectedFromCX - BootMenuEvent_Handler.FirstEvent)
+MENUEVENT_KeyStrokeInAX equ (BootMenuEvent_Handler.KeyStrokeInAX - BootMenuEvent_Handler.FirstEvent)
+MENUEVENT_RefreshTitle equ (BootMenuPrint_TitleStrings - BootMenuEvent_Handler.FirstEvent)
+MENUEVENT_RefreshInformation equ (BootMenuPrint_RefreshInformation - BootMenuEvent_Handler.FirstEvent)
+MENUEVENT_RefreshItemFromCX equ (BootMenuPrint_RefreshItem - BootMenuEvent_Handler.FirstEvent)
 ;
 ; Note that there is no entry for MENUEVENT_IdleProcessing.  If MENUEVENT_IDLEPROCESSING_ENABLE is not %defined,
@@ -67 +67 @@
 ;   DS:SI:      Ptr to initialized MENUINIT struct
 ALIGN JUMP_ALIGN
+.FirstEvent:    
 .InitializeMenuinitFromDSSI:
     push    ds

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -24 +24 @@
 
     call    RamVars_IsDriveHandledByThisBIOS                
-    jnc     .notOurs
+    jc      .notOurs
 
     call    FindDPT_ForDriveNumber                  ; if it is one of ours, print the string in bootnfo
@@ -47 +47 @@
     push    ax                                      ; the hard disks don't ever use it, but it does no harm)
         
-    jmp     short BootMenuPrint_FormatCSSIfromParamsInSSBP
+    jmp     short BootMenuPrint_RefreshInformation.FormatRelay
 
 ;--------------------------------------------------------------------
@@ -87 +87 @@
     push    bp
     mov     bp,sp
-    jmp     short BootMenuPrint_FormatCSSIfromParamsInSSBP
+    jmp     short BootMenuPrint_RefreshInformation.FormatRelay
 
         
@@ -110 +110 @@
     mov     bp, sp
 
+    mov     si, g_szCapacity                            ; Setup print string now, carries through to print call
+
+    xor     di, di
+    call    RamVars_IsDriveHandledByThisBIOS
+    jc      SHORT .notours
+    call    FindDPT_ForDriveNumber                      ; DS:DI to point DPT
+.notours:       
+        
     test    dl, dl                                      ; are we a hard disk?
     js      BootMenuPrint_HardDiskRefreshInformation        
-        
+
+    test    di,di
+    jnz     .ours
     call    FloppyDrive_GetType                         ; Get Floppy Drive type to BX
+    jmp     .around
+.ours:
+    call    AH8h_GetDriveParameters
+.around:                
 
     mov     ax, g_szFddSizeOr                           ; .PrintXTFloppyType
-    test    bx, bx                                      ; Two possibilities? (FLOPPY_TYPE_525_OR_35_DD)     
+    test    bl, bl                                      ; Two possibilities? (FLOPPY_TYPE_525_OR_35_DD)     
     jz      SHORT .PushAXAndOutput
 
@@ -158 +172 @@
 
     mov     al,FloppyTypes.rgbCapacityMultiplier
+    mov     bh, 0
     mul     byte [cs:bx+FloppyTypes.rgbCapacity - 1]    ; -1 since 0 is handled above and not in the table
 
@@ -163 +178 @@
     push    ax
 
-    jmp     short BootMenuPrint_HardDiskRefreshInformation.output
+.FormatRelay:
+    jmp     short BootMenuPrint_FormatCSSIfromParamsInSSBP
 
 
@@ -180 +196 @@
 ALIGN JUMP_ALIGN
 BootMenuPrint_HardDiskRefreshInformation:       
-    call    RamVars_IsDriveHandledByThisBIOS
-    jnc     SHORT .HardDiskMenuitemInfoForForeignDrive
-    call    FindDPT_ForDriveNumber                      ; DS:DI to point DPT
-    ; Fall to .HardDiskMenuitemInfoForOurDrive
-
-;--------------------------------------------------------------------
-; .HardDiskMenuitemInfoForOurDrive
-;   Parameters:
-;       DL:     Untranslated Hard Disk number
-;       DS:DI:  Ptr to DPT
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, BX, CX, DX, SI, DI, ES
-;--------------------------------------------------------------------
+    test    di,di
+    jz      .HardDiskMenuitemInfoForForeignDrive        
+
 .HardDiskMenuitemInfoForOurDrive:
     ePUSH_T ax, g_szInformation
@@ -200 +204 @@
     ; Get and push total LBA size
     call    BootMenuInfo_GetTotalSectorCount
-    call    ConvertSectorCountInBXDXAXtoSizeAndPushForFormat        
-    jmp     BootMenuPrintCfg_ForOurDrive
-
-;--------------------------------------------------------------------
-; .HardDiskMenuitemInfoForForeignDrive
-;   Parameters:
-;       DL:     Untranslated Hard Disk number
-;       DS:     RAMVARS segment
-;   Returns:
-;       CF:     Set since menu event was handled successfully
-;   Corrupts registers:
-;       AX, BX, CX, DX, SI, DI
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+    jmp     .ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
+        
 .HardDiskMenuitemInfoForForeignDrive:
     call    DriveXlate_ToOrBack
     call    AH15h_GetSectorCountFromForeignDriveToDXAX
-    call    ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
-
-ALIGN JUMP_ALIGN        
-.output:
-    mov     si, g_szCapacity
-;;; fall-through
+
+.ConvertSectorCountInBXDXAXtoSizeAndPushForFormat:
+    ePUSH_T cx, g_szCapacityNum     ; Push format substring
+    call    Size_ConvertSectorCountInBXDXAXtoKiB
+    mov     cx, BYTE_MULTIPLES.kiB
+    call    Size_GetSizeToAXAndCharToDLfromBXDXAXwithMagnitudeInCX
+    push    ax                      ; Size in magnitude
+    push    cx                      ; Tenths
+    push    dx                      ; Magnitude character       
+                
+    test    di,di
+    jz      short BootMenuPrint_FormatCSSIfromParamsInSSBP
+
+%include "BootMenuPrintCfg.asm"         ; inline of code to fill out remainder of information string
+
+;;; fall-through to BootMenuPrint_FormatCSSIfromParamsInSSBP
+
 
 ;--------------------------------------------------------------------
@@ -273 +276 @@
 ALIGN JUMP_ALIGN
 BootMenuPrint_TheBottomOfScreen:
-    call    FloppyDrive_GetCountToCX
-    mov     bl, cl                  ; Floppy Drive count to BL
-    call    RamVars_GetHardDiskCountFromBDAtoCX
-    mov     bh, cl                  ; Hard Disk count to BH
+    call    FloppyDrive_GetCountToAX
+    xchg    bx, ax                  ; Floppy Drive count to BL
+    call    RamVars_GetHardDiskCountFromBDAtoAX
+    mov     bh, al                  ; Hard Disk count to BH
     ; Fall to .MoveCursorToHotkeyStrings
 
@@ -321 +324 @@
     test    bh, bh      ; Any Hard Drives?
     jz      SHORT .SkipHardDriveHotkeys
-    xchg    ax, cx      ; Store Key Attribute
-    call    BootMenu_GetLetterForFirstHardDiskToCL
-    mov     ch, ANGLE_QUOTE_RIGHT
-    xchg    ax, cx
+    call    BootMenu_GetLetterForFirstHardDiskToAL
+    mov     ah, ANGLE_QUOTE_RIGHT
     mov     si, g_szHDD
     call    PushHotkeyParamsAndFormat
@@ -390 +391 @@
     CALL_DISPLAY_LIBRARY InitializeDisplayContext
     ret
-
-
-;--------------------------------------------------------------------
-; ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
-;   Parameters:
-;       BX:DX:AX:   Sector count
-;   Returns:
-;       Size in stack
-;   Corrupts registers:
-;       AX, BX, CX, DX, SI
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-ConvertSectorCountInBXDXAXtoSizeAndPushForFormat:
-    pop     si                      ; Pop return address
-    ePUSH_T cx, g_szCapacityNum     ; Push format substring
-    call    Size_ConvertSectorCountInBXDXAXtoKiB
-    mov     cx, BYTE_MULTIPLES.kiB
-    call    Size_GetSizeToAXAndCharToDLfromBXDXAXwithMagnitudeInCX
-    push    ax                      ; Size in magnitude
-    push    cx                      ; Tenths
-    push    dx                      ; Magnitude character
-    jmp     si
 
 

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm

@@ -2 +2 @@
 ; Description   :   Functions for printing drive configuration
 ;                   information on Boot Menu.
-
+;
+; Included by BootMenuPrint.asm, this routine is to be inserted into
+; BootMenuPrint_HardDiskRefreshInformation.
+;
 ; Section containing code
 SECTION .text
+
+;;; fall-into from BootMenuPrint_HardDiskRefreshInformation.
 
 ;--------------------------------------------------------------------
@@ -16 +21 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AX, BX, CX, DX, SI, DI
+;       AX, BX, CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootMenuPrintCfg_ForOurDrive:
+.BootMenuPrintCfg_ForOurDrive:
     eMOVZX  ax, BYTE [di+DPT.bIdevarsOffset]
-    xchg    si, ax                      ; CS:SI now points to IDEVARS
+    xchg    bx, ax                      ; CS:BX now points to IDEVARS
     ; Fall to .PushAndFormatCfgString
 
@@ -28 +32 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:SI:  Ptr to IDEVARS
+;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (jumps to next push below)
 ;   Corrupts registers:
-;       AX, BX
+;       AX, CX
 ;--------------------------------------------------------------------
 .PushAddressingMode:
@@ -41 +45 @@
     ;; with AL clear, and so we exchange AL and AH after the multiply for the final result.
     ;; 
-    mov     bl,(1<<(8-ADDRESSING_MODE_FIELD_POSITION)) * g_szAddressingModes_Displacement
-    mul     bl
+    mov     cl,(1<<(8-ADDRESSING_MODE_FIELD_POSITION)) * g_szAddressingModes_Displacement
+    mul     cl
     xchg    al,ah
     add     ax,g_szAddressingModes
@@ -51 +55 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:SI:  Ptr to IDEVARS
+;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (falls to next push below)
@@ -69 +73 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:SI:  Ptr to IDEVARS
+;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (jumps to next push below)
@@ -77 +81 @@
 .PushBusType:
     mov     al,g_szBusTypeValues_Displacement
-    mul     BYTE [cs:si+IDEVARS.bDevice]
+    mul     BYTE [cs:bx+IDEVARS.bDevice]
         
     shr     ax,1            ; divide by 2 since IDEVARS.bDevice is multiplied by 2
@@ -88 +92 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:SI:  Ptr to IDEVARS
+;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (falls to next push below)
@@ -95 +99 @@
 ;--------------------------------------------------------------------
 .PushIRQ:
-    mov     al, BYTE [cs:si+IDEVARS.bIRQ]
+    mov     al, BYTE [cs:bx+IDEVARS.bIRQ]
     cbw
     push    ax
@@ -103 +107 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:SI:  Ptr to IDEVARS
+;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (falls to next push below)
@@ -114 +118 @@
     push    ax
 
-;--------------------------------------------------------------------
-; PrintValuesFromStack
-;   Parameters:
-;       Stack:  All formatting parameters
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, SI, DI
-;--------------------------------------------------------------------
-.PrintValuesFromStack:
-    jmp     BootMenuPrint_HardDiskRefreshInformation.output
-
+;;; fall-out to BootMenuPrint_HardDiskRefreshInformation.

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
 

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h.asm

@@ -29 +29 @@
     mov     [RAMVARS.xlateVars+XLATEVARS.bXlatedDrv], dl
     call    RamVars_IsFunctionHandledByThisBIOS
-    jnc     SHORT Int13h_DirectCallToAnotherBios
+    jc      SHORT Int13h_DirectCallToAnotherBios
+
     call    FindDPT_ForDriveNumber      ; DS:DI now points to DPT
 
@@ -139 +140 @@
 ALIGN JUMP_ALIGN
 Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH:
+%ifdef MODULE_SERIAL_FLOPPY
+    mov     al, [bp+IDEPACK.intpack+INTPACK.dl]
+Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH_ALHasDriveNumber:   
+    call    Int13h_SetErrorCodeToBdaAndToIntpackInSSBPfromAH_ALHasDriveNumber
+%else
     call    Int13h_SetErrorCodeToBdaAndToIntpackInSSBPfromAH
+%endif
 Int13h_ReturnFromHandlerWithoutStoringErrorCode:
     or      WORD [bp+IDEPACK.intpack+INTPACK.flags], FLG_FLAGS_IF   ; Return with interrupts enabled
@@ -154 +161 @@
 ;   Returns:
 ;       Depends on function
+;       NOTE: ES:DI needs to be returned from the previous interrupt 
+;             handler, for floppy DPT in function 08h
 ;   Corrupts registers:
-;       BX, DI, ES
+;       None
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
 Int13h_CallPreviousInt13hHandler:
-    push    di
     call    ExchangeCurrentInt13hHandlerWithOldInt13hHandler
     int     BIOS_DISK_INTERRUPT_13h
-    call    ExchangeCurrentInt13hHandlerWithOldInt13hHandler
-    pop     di
-    ret
-
+;;;  fall-through to ExchangeCurrentInt13hHandlerWithOldInt13hHandler
 
 ;--------------------------------------------------------------------
@@ -174 +179 @@
 ;       Nothing
 ;   Corrupts registers:
-;       DI
+;       Nothing
+;       Note: Flags are preserved
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
 ExchangeCurrentInt13hHandlerWithOldInt13hHandler:
     push    es
-    LOAD_BDA_SEGMENT_TO es, di
-    mov     di, [RAMVARS.fpOldI13h]
+    push    si
+    LOAD_BDA_SEGMENT_PRESERVE_FLAGS_TO  es, si
+    mov     si, [RAMVARS.fpOldI13h]
     cli
-    xchg    di, [es:BIOS_DISK_INTERRUPT_13h*4]
-    mov     [RAMVARS.fpOldI13h], di
-    mov     di, [RAMVARS.fpOldI13h+2]
-    xchg    di, [es:BIOS_DISK_INTERRUPT_13h*4+2]
+    xchg    si, [es:BIOS_DISK_INTERRUPT_13h*4]
+    mov     [RAMVARS.fpOldI13h], si
+    mov     si, [RAMVARS.fpOldI13h+2]
+    xchg    si, [es:BIOS_DISK_INTERRUPT_13h*4+2]
     sti
-    mov     [RAMVARS.fpOldI13h+2], di
+    mov     [RAMVARS.fpOldI13h+2], si
+    pop     si
     pop     es
     ret
@@ -204 +212 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
+%ifdef MODULE_SERIAL_FLOPPY
+Int13h_SetErrorCodeToBdaAndToIntpackInSSBPfromAH_ALHasDriveNumber:
+    ; Store error code to BDA
+    mov     bx, BDA.bHDLastSt
+    test    al, al
+    js      .HardDisk
+    mov     bl, BDA.bFDRetST & 0xff
+.HardDisk:
+    LOAD_BDA_SEGMENT_TO ds, di
+    mov     [bx], ah        
+%else
 Int13h_SetErrorCodeToBdaAndToIntpackInSSBPfromAH:
     ; Store error code to BDA
-    LOAD_BDA_SEGMENT_TO ds, di
+    LOAD_BDA_SEGMENT_TO ds, di      
     mov     [BDA.bHDLastSt], ah
+%endif
 
     ; Store error code to INTPACK

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm

@@ -22 +22 @@
     eMOVZX  bx, dl                      ; Copy requested drive to BL, zero BH to assume no errors
     call    ResetFloppyDrivesWithInt40h
-    test    bl, bl
-    jns     SHORT .SkipHardDiskReset
     call    ResetForeignHardDisks
     call    AH0h_ResetHardDisksHandledByOurBIOS
@@ -64 +62 @@
     xor     ah, ah                      ; Disk Controller Reset
     call    Int13h_CallPreviousInt13hHandler
-    jmp     SHORT BackupErrorCodeFromTheRequestedDriveToBH
-
+;;; fall-through to BackupErrorCodeFromTheRequestedDriveToBH
+
+
+;--------------------------------------------------------------------
+; BackupErrorCodeFromTheRequestedDriveToBH
+;   Parameters:
+;       AH:     Error code from the last resetted drive
+;       DL:     Drive last resetted
+;       BL:     Requested drive (DL when entering AH=00h)
+;   Returns:
+;       BH:     Backuped error code
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+BackupErrorCodeFromTheRequestedDriveToBH:
+    cmp     dl, bl              ; Requested drive?
+    eCMOVE  bh, ah
+    ret
+        
 
 ;--------------------------------------------------------------------
@@ -82 +98 @@
     mov     dl, bl
     call    RamVars_IsDriveHandledByThisBIOS
-    jnc     SHORT .Return               ; Return what was in BL unmodified
+    jc      SHORT .Return               ; Return what was in BL unmodified
     mov     dl, 80h
 .Return:
@@ -101 +117 @@
 ALIGN JUMP_ALIGN
 AH0h_ResetHardDisksHandledByOurBIOS:
-    mov     dh, [RAMVARS.bDrvCnt]       ; Load drive count to DH
+    mov     dx, [RAMVARS.wDrvCntAndFirst]   ; DL = drive number, DH = drive count
     test    dh, dh
     jz      SHORT .AllDrivesReset       ; Return if no drives
-    mov     dl, [RAMVARS.bFirstDrv]     ; Load number of our first drive
     add     dh, dl                      ; DH = one past last drive to reset
 ALIGN JUMP_ALIGN
@@ -114 +129 @@
     jb      SHORT .DriveResetLoop       ;  If not, reset next drive
 .AllDrivesReset:
-    ret
-
+%ifdef MODULE_SERIAL_FLOPPY
+;
+; "Reset" emulatd serial floppy drives, if any.  There is nothing to actually do for this reset,
+; but record the proper error return code if one of these floppy drives is the drive requested.
+;
+    call    RamVars_UnpackFlopCntAndFirstToAL
+
+    cbw                                                 ; Clears AH (there are flop drives) or ffh (there are not)
+                                                        ; Either AH has success code (flop drives are present)
+                                                        ; or it doesn't matter because we won't match drive ffh
+
+    cwd                                                 ; clears DX (there are flop drives) or ffffh (there are not)
+
+    adc     dl, al                                      ; second drive (CF set) if present
+                                                        ; If no drive is present, this will result in ffh which 
+                                                        ; won't match a drive
+    call    BackupErrorCodeFromTheRequestedDriveToBH
+    mov     dl, al                                      ; We may end up doing the first drive twice (if there is
+    jmp     BackupErrorCodeFromTheRequestedDriveToBH    ; only one drive), but doing it again is not harmful.
+%else
+    ret
+%endif
+        
 ;--------------------------------------------------------------------
 ; .BackupErrorCodeFromMasterOrSlaveToBH
@@ -144 +180 @@
     ret
 
+        
 ;--------------------------------------------------------------------
 ; GetBasePortToCX
@@ -167 +204 @@
 
 
-;--------------------------------------------------------------------
-; BackupErrorCodeFromTheRequestedDriveToBH
-;   Parameters:
-;       AH:     Error code from the last resetted drive
-;       DL:     Drive last resetted
-;       BL:     Requested drive (DL when entering AH=00h)
-;   Returns:
-;       BH:     Backuped error code
-;   Corrupts registers:
-;       Nothing
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BackupErrorCodeFromTheRequestedDriveToBH:
-    cmp     dl, bl              ; Requested drive?
-    eCMOVE  bh, ah
-    ret

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH15h_HSize.asm

@@ -15 +15 @@
 ;   Returns with INTPACK:
 ;       If succesfull:
-;           AH:     3 (Hard disk accessible)
+;           AH:     Hard Disk: 3 (Hard disk accessible)
+;                   Floppy:    1 (Floppy disk, without change detection)
 ;           CX:DX:  Total number of sectors
 ;           CF:     0
@@ -25 +26 @@
 ALIGN JUMP_ALIGN
 AH15h_HandlerForReadDiskDriveSize:
+%ifdef MODULE_SERIAL_FLOPPY
+    mov     cl, 1                                       ; 1 = floppy disk, no change detection
+                
+    test    dl,dl                                       ; DO NOT store the sector count if this is a 
+    jns     .FloppyDrive                                ; floppy disk, some OS's depend on this not 
+                                                        ; happening for floppies in order to boot.
+%endif
+        
     call    AH15h_GetSectorCountToBXDXAX
-    mov     [bp+IDEPACK.intpack+INTPACK.cx], dx ; HIWORD to CX
-    mov     [bp+IDEPACK.intpack+INTPACK.dx], ax ; LOWORD to DX
+    mov     [bp+IDEPACK.intpack+INTPACK.cx], dx         ; HIWORD to CX
+    xchg    [bp+IDEPACK.intpack+INTPACK.dx], ax         ; LOWORD to DX, AL gets drive number
 
-    xor     ah, ah
-    call    Int13h_SetErrorCodeToBdaAndToIntpackInSSBPfromAH    ; Store success to BDA and CF
-    mov     BYTE [bp+IDEPACK.intpack+INTPACK.ah], 3             ; Type code = Hard disk
+    xor     ah, ah      
+%ifdef MODULE_SERIAL_FLOPPY             
+    mov     cl, 3                                       ; 3 = Hard Disk Accessible
+.FloppyDrive:
+        
+    call    Int13h_SetErrorCodeToBdaAndToIntpackInSSBPfromAH_ALHasDriveNumber   ; Store success to BDA and CF       
+    mov     BYTE [bp+IDEPACK.intpack+INTPACK.ah], cl
+%else
+    call    Int13h_SetErrorCodeToBdaAndToIntpackInSSBPfromAH    ; Store success to BDA and CF       
+    mov     BYTE [bp+IDEPACK.intpack+INTPACK.ah], 3
+%endif      
+        
     jmp     Int13h_ReturnFromHandlerWithoutStoringErrorCode
 

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH1h_HStatus.asm

@@ -20 +20 @@
 AH1h_HandlerForReadDiskStatus:
     LOAD_BDA_SEGMENT_TO ds, ax, !
+
+%ifdef MODULE_SERIAL_FLOPPY
+    test    dl, dl
+    jns     .HardDisk
+    mov     ah, [BDA.bFDRetST]      ; Unlike for hard disks below, floppy version does not clear the status
+    jmp     .done
+.HardDisk:  
+%endif
+        
     xchg    ah, [BDA.bHDLastSt]     ; Load and clear last error
+                                    ; Note that AH is cleared with the LOAD_BDA_SEGMENT above
+                
+.done:
     call    Int13h_SetErrorCodeToIntpackInSSBPfromAH
     jmp     Int13h_ReturnFromHandlerWithoutStoringErrorCode

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH2h_HRead.asm

@@ -40 +40 @@
     jmp     Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAHandTransferredSectorsFromCL
 %endif
+

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH8h_HParams.asm

@@ -14 +14 @@
 ;       SS:BP:  Ptr to IDEPACK
 ;   Returns with INTPACK:
+;       BL:     Drive Type (for floppies only)
 ;       CH:     Maximum cylinder number, bits 7...0
 ;       CL:     Bits 7...6: Cylinder number bits 9...8
@@ -19 +20 @@
 ;       DH:     Maximum head number (0...255)
 ;       DL:     Number of drives
+;       ES:DI:  Floppy DPT (for floppies only)
 ;       AH:     Int 13h/40h floppy return status
 ;       CF:     0 if successfull, 1 if error
 ;--------------------------------------------------------------------
 AH8h_HandlerForReadDiskDriveParameters:
+
     call    RamVars_IsDriveHandledByThisBIOS
-    jnc     SHORT .GetDriveParametersForForeignHardDiskInDL
+    jnc     SHORT .OurDrive
+
+    call    Int13h_CallPreviousInt13hHandler
+    jnc     SHORT .MidGame
+    jmp     Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
+        
+.OurDrive:      
     call    AH8h_GetDriveParameters
-    jmp     SHORT .ReturnAfterStoringValuesToIntpack
 
-.GetDriveParametersForForeignHardDiskInDL:
-    call    Int13h_CallPreviousInt13hHandler
-    jc      SHORT .ReturnErrorFromPreviousInt13hHandler
-    call    RamVars_GetCountOfKnownDrivesToDL
-.ReturnAfterStoringValuesToIntpack:
+%ifdef MODULE_SERIAL_FLOPPY
+    push    cs                          ; setup registers if we are a floppy drive, in all cases
+    pop     es                          ; if it is not a floppy drive, these values will not be put in INTPACK
+    mov     di, AH8h_FloppyDPT
+%endif
+    ;; fall-through
+        
+.MidGame:       
+    call    RamVars_GetCountOfKnownDrivesToAX       ; assume hard disk for now, will discard if for floppies
+
+    test    byte [bp+IDEPACK.intpack+INTPACK.dl], 080h
+    jnz     .Done
+        
+    mov     [bp+IDEPACK.intpack+INTPACK.bl], bl
+
+    mov     [bp+IDEPACK.intpack+INTPACK.es], es
+    mov     [bp+IDEPACK.intpack+INTPACK.di], di     
+
+    call    FloppyDrive_GetCountToAX
+
+.Done:  
+    mov     ah, dh
+        
     mov     [bp+IDEPACK.intpack+INTPACK.cx], cx
-    mov     [bp+IDEPACK.intpack+INTPACK.dx], dx
+    xchg    [bp+IDEPACK.intpack+INTPACK.dx], ax     ; recover DL for BDA last status byte determination
+
     xor     ah, ah
-.ReturnErrorFromPreviousInt13hHandler:
+%ifdef MODULE_SERIAL_FLOPPY
+    jmp     Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH_ALHasDriveNumber            
+%else
     jmp     Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
+%endif
 
 
@@ -51 +81 @@
 ;               Bits 5...0: Maximum sector number (1...63)
 ;       DH:     Maximum head number (0...255)
-;       DL:     Number of drives
 ;   Corrupts registers:
 ;       AX, BX
@@ -73 +102 @@
 ;               Bits 5...0: Maximum sector number (1...63)
 ;       DH:     Maximum head number (0...255)
-;       DL:     Number of drives
 ;   Corrupts registers:
 ;       AX, BX
@@ -85 +113 @@
     or      cl, bh                  ; CL bits 0...5 = Sectors per track
     mov     dh, bl                  ; DH = Maximum head number
-    jmp     RamVars_GetCountOfKnownDrivesToDL
+        
+%ifdef MODULE_SERIAL_FLOPPY
+    mov     bl,[di+DPT.bFlagsHigh]
+    eSHR_IM bl,FLGH_DPT_SERIAL_FLOPPY_TYPE_FIELD_POSITION
+%endif      
+    ret
+
+%ifdef MODULE_SERIAL_FLOPPY
+;
+; Floppy Disk Parameter Table.  There is no way to specify more than one of these
+; for any given system, so no way to make this drive or media specific.
+; So we return fixed values out of the ROM for callers might be expecting this information.
+;
+; On AT systems, we return the information for a 1.44 MB disk, 
+; and on XT systems, we return the information for a 360 KB disk.
+;
+AH8h_FloppyDPT:
+%ifdef USE_AT
+    db      0ah << 4 | 0fh          ; Offset 0: Drive timings, 1.44MB values
+%else
+    db      0dh << 4 | 0fh          ; Offset 0: Drive timings, 360KB values
+%endif
+
+    db      1h << 1 | 0             ; Offset 1: Typical values of 1 for head load time
+                                    ;           DMA used (although it actually is not, but is more restrctive)
+    db      25h                     ; Offset 2: Inactiviy motor turn-off delay, 
+                                    ;           Typical value of 25h for 2 second delay
+    db      02h                     ; Offset 3: Sector size, always 512
+
+%ifdef USE_AT
+    db      12h                     ; Offset 4: Sectors per track, 1.44MB value
+    db      1bh                     ; Offset 5: Sector gap, 1.44MB value
+%else
+    db      09h                     ; Offset 4: Sectors per track, 360KB value
+    db      2ah                     ; Offset 5: Sector gap, 360KB value
+%endif
+
+    db      0ffh                    ; Offset 6: Data length
+
+%ifdef USE_AT
+    db      6ch                     ; Offset 7: Format gap length, 1.44MB value
+%else
+    db      50h                     ; Offset 7: Format gap length, 360KB value
+%endif
+
+    db      0f6h                    ; Offset 8: Fill byte for format
+    db      0fh                     ; Offset 9: Head setting time
+    db      08h                     ; Offset A: Wait for motor startpu time
+
+%ifdef USE_AT
+    db      79                      ; Offset B: Maximum track number, 1.44MB value
+    db      0                       ; Offset C: Data transfer rate, 1.44MB value
+    db      4                       ; Offset D: Diskette CMOS drive type, 1.44MB value
+%else
+    db      39                      ; Offset B: Maximum track number, 360KB value
+    db      80h                     ; Offset C: Data transfer rate, 360KB value
+    db      1                       ; Offset D: Diskette CMOS drive type, 360KB value
+%endif
+%endif

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH9h_HInit.asm

@@ -43 +43 @@
     push    cx
 
+%ifdef MODULE_SERIAL
+    ; 
+    ; no need to do this for serial deveices, and we use the DPT_RESET flag bits
+    ; to store the drive type for serial floppy drives (MODULE_SERIAL_FLOPPY)
+    ;
+    xor     ah, ah
+    test    byte [di+DPT.bFlagsHigh], FLGH_DPT_SERIAL_DEVICE    ; Clears CF
+    jnz     .ReturnNotSuccessfull
+%endif
+        
     ; Try to select drive and wait until ready
     or      BYTE [di+DPT.bFlagsHigh], MASKH_DPT_RESET       ; Everything uninitialized

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

@@ -31 +31 @@
     ; Install INT 19h handler for proper reboot
     LOAD_BDA_SEGMENT_TO es, ax
-    mov     bx, BIOS_BOOT_LOADER_INTERRUPT_19h  ; INT 19h interrupt vector offset
+    mov     al, BIOS_BOOT_LOADER_INTERRUPT_19h  ; INT 19h interrupt vector offset
     mov     si, Int19h_ResetHandler             ; INT 19h handler to reboot the system
-    call    Interrupts_InstallHandlerToVectorInBXFromCSSI
+    call    Interrupts_InstallHandlerToVectorInALFromCSSI
     call    Initialize_AndDetectDrives          ; Installs new boot menu loader
     ; Fall to .PrepareStackAndSelectDriveFromBootMenu

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -43 +43 @@
 
 %ifdef MODULE_SERIAL
+;----------------------------------------------------------------------
 ;
 ; if serial drive detected, do not scan (avoids duplicate drives and isn't needed - we already have a connection)
@@ -57 +58 @@
 %endif
 
-.done:
+.done:  
+%ifdef MODULE_SERIAL_FLOPPY
+;----------------------------------------------------------------------
+;
+; Add in any emulated serial floppy drives.
+;
+    mov     al, [RAMVARS.xlateVars+XLATEVARS.bFlopCreateCnt]
+    dec     al
+    mov     cl, al
+    js      .NoFloppies                     ; if no drives are present, we store 0ffh
+
+    call    FloppyDrive_GetCountFromBIOS_or_BDA
+
+    push    ax
+
+    add     al, cl                          ; Add our drives to existing drive count
+    cmp     al, 3                           ; For BDA, max out at 4 drives (ours is zero based)
+    jl      .MaxBDAFloppiesExceeded
+    mov     al, 3                           
+.MaxBDAFloppiesExceeded:
+    eROR_IM al, 2                           ; move to bits 6-7
+    inc     ax                              ; low order bit, indicating floppy drive exists
+
+    mov     ah, [es:BDA.wEquipment]         ; Load Equipment WORD low byte  
+    and     ah, 03eh                        ; Mask off drive number and drives present bit
+    or      al, ah                          ; Or in new values
+    mov     [es:BDA.wEquipment], al         ; and store
+
+    mov     al, 1eh                         ; BDA pointer to Floppy DPT
+    mov     si, AH8h_FloppyDPT
+    call    Interrupts_InstallHandlerToVectorInALFromCSSI
+
+    pop     ax
+
+    shr     cl, 1                           ; number of drives, 1 or 2 only, to CF flag (clear=1, set=2)
+    rcl     al, 1                           ; starting drive number in upper 7 bits, number of drives in low bit
+.NoFloppies:    
+    mov     [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst], al
+%endif
+        
     ret
 

trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm

@@ -120 +120 @@
 ; Returns number of Floppy Drives in system.
 ;
-; FloppyDrive_GetCountToCX
-;   Parameters:
-;       Nothing
-;   Returns:
-;       CX:     Number of Floppy Drives
-;   Corrupts registers:
-;       Nothing
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-FloppyDrive_GetCountToCX:
+; FloppyDrive_GetCountToAX
+;   Parameters:
+;       DS:     RAMVARS Segment
+;   Returns:
+;       AX:     Number of Floppy Drives
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+FloppyDrive_GetCountToAX:       
+%ifdef MODULE_SERIAL_FLOPPY
+    call    RamVars_UnpackFlopCntAndFirstToAL
+    adc     al,1                        ; adds in the drive count bit, and adds 1 for count vs. 0-index, 
+                                        ; but still won't impact SF
+    jns     .UseInternalNumber          ; need to clear CH on the way out, and add in additional drive numbers
+
+%endif
+    call    FloppyDrive_GetCountFromBIOS_or_BDA
+        
+.UseInternalNumber: 
+    mov     ah, [cs:ROMVARS.bMinFddCnt]
+    MAX_U   al, ah
+    cbw
+        
+    ret
+
+ALIGN JUMP_ALIGN        
+FloppyDrive_GetCountFromBIOS_or_BDA:
     push    es
-%ifdef USE_AT
-    call    GetCountFromBIOS
-%else
-    call    GetCountFromBDA
-%endif
-    mov     ch, [cs:ROMVARS.bMinFddCnt]
-    MAX_U   cl, ch
-    pop     es
-    xor     ch, ch
-    ret
-
 
 ;--------------------------------------------------------------------
@@ -160 +165 @@
 %ifdef USE_AT
 ALIGN JUMP_ALIGN
-GetCountFromBIOS:
+.GetCountFromBIOS:
     push    di
     push    dx
     push    bx
-    push    ax
 
     mov     ah, 08h                 ; Get Drive Parameters
     cwd                             ; Floppy Drive 00h
     int     BIOS_DISKETTE_INTERRUPT_40h
-    mov     cl, dl                  ; Number of Floppy Drives to CL
-
-    pop     ax
+    mov     al, dl                  ; Number of Floppy Drives to AL
+
     pop     bx
     pop     dx
     pop     di
-    ret
-%endif
-
+%endif
 
 ;--------------------------------------------------------------------
@@ -193 +194 @@
 %ifndef USE_AT
 ALIGN JUMP_ALIGN
-GetCountFromBDA:
-    LOAD_BDA_SEGMENT_TO es, cx
-    mov     cl, [es:BDA.wEquipment]         ; Load Equipment WORD low byte
-    mov     ch, cl                          ; Copy it to CH
-    and     cx, 0C001h                      ; Leave bits 15..14 and 0
-    eROL_IM ch, 2                           ; EW low byte bits 7..6 to 1..0
-    add     cl, ch                          ; CL = Floppy Drive count
-    ret
-%endif
+.GetCountFromBDA:
+    LOAD_BDA_SEGMENT_TO es, ax
+    mov     al, [es:BDA.wEquipment]         ; Load Equipment WORD low byte
+    mov     ah, al                          ; Copy it to CH
+    and     ax, 0C001h                      ; Leave bits 15..14 and 0
+    eROL_IM ah, 2                           ; EW low byte bits 7..6 to 1..0
+    add     al, ah                          ; CL = Floppy Drive count
+%endif
+
+    pop     es
+    ret
+        

trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm

@@ -29 +29 @@
 
     ; Install INT 19h handler (boot loader) where drives are detected
-    mov     bx, BIOS_BOOT_LOADER_INTERRUPT_19h
+    mov     al, BIOS_BOOT_LOADER_INTERRUPT_19h
     mov     si, Int19h_BootLoaderHandler
-    call    Interrupts_InstallHandlerToVectorInBXFromCSSI
+    call    Interrupts_InstallHandlerToVectorInALFromCSSI
 
 .SkipRomInitialization:
@@ -73 +73 @@
     mov     dl, 80h
     call    RamVars_IsDriveHandledByThisBIOS
-    jnc     SHORT .FindForDrive81h  ; Store nothing if not our drive
+    jc      SHORT .FindForDrive81h  ; Store nothing if not our drive
     call    FindDPT_ForDriveNumber  ; DPT to DS:DI
     mov     [es:HD0_DPT_POINTER_41h*4], di
@@ -80 +80 @@
     inc     dx
     call    RamVars_IsDriveHandledByThisBIOS
-    jnc     SHORT .ResetDetectedDrives
+    jc      SHORT .ResetDetectedDrives
     call    FindDPT_ForDriveNumber
     mov     [es:HD1_DPT_POINTER_46h*4], di

trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm

@@ -34 +34 @@
     mov     ax, [es:BIOS_DISK_INTERRUPT_13h*4]  ; Load old INT 13h offset
     mov     [RAMVARS.fpOldI13h], ax             ; Store old INT 13h offset
-
-    mov     bx, BIOS_DISK_INTERRUPT_13h         ; INT 13h interrupt vector offset
-    mov     si, Int13h_DiskFunctionsHandler     ; Interrupt handler offset
-    call    Interrupts_InstallHandlerToVectorInBXFromCSSI
 
     ; Only store INT 13h handler to 40h if 40h is not already installed.
@@ -47 +43 @@
     mov     [es:BIOS_DISKETTE_INTERRUPT_40h*4+2], dx    ; Store old INT 13h segment
 .Int40hAlreadyInstalled:
+
+    mov     al, BIOS_DISK_INTERRUPT_13h         ; INT 13h interrupt vector offset
+    mov     si, Int13h_DiskFunctionsHandler     ; Interrupt handler offset
+    call    Interrupts_InstallHandlerToVectorInALFromCSSI
     ; Fall to .InitializeHardwareIrqHandlers
 
@@ -56 +56 @@
 ;       Nothing
 ;   Corrupts registers:
-;       BX, CX, DX, SI, DI
+;       BX, CX, DX, SI, DI, AX
 ;--------------------------------------------------------------------
 .InitializeHardwareIrqHandlers:
@@ -62 +62 @@
     mov     di, ROMVARS.ideVars0            ; CS:SI points to first IDEVARS
 .IdeControllerLoop:
-    eMOVZX  bx, BYTE [cs:di+IDEVARS.bIRQ]
+    mov     al, BYTE [cs:di+IDEVARS.bIRQ]
     add     di, BYTE IDEVARS_size           ; Increment to next controller
     call    .InstallLowOrHighIrqHandler
@@ -72 +72 @@
 ; .InstallLowOrHighIrqHandler
 ;   Parameters:
-;       BX:     IRQ number, 0 if IRQ disabled
+;       AL:     IRQ number, 0 if IRQ disabled
 ;       ES:     BDA and Interrupt Vector segment (zero)
 ;   Returns:
@@ -80 +80 @@
 ;--------------------------------------------------------------------
 .InstallLowOrHighIrqHandler:
-    test    bl, bl
+    test    al, al
     jz      SHORT .Return   ; IRQ not used
-    cmp     bl, 8
+    cmp     al, 8
     jb      SHORT .InstallLowIrqHandler
     ; Fall to .InstallHighIrqHandler
@@ -94 +94 @@
 ;       Nothing
 ;   Corrupts registers:
-;       BX, SI
+;       AL, BX, SI
 ;--------------------------------------------------------------------
 .InstallHighIrqHandler:
-    add     bx, BYTE HARDWARE_IRQ_8_INTERRUPT_70h - 8   ; Interrupt vector number
+    add     al, BYTE HARDWARE_IRQ_8_INTERRUPT_70h - 8   ; Interrupt vector number
     mov     si, IdeIrq_InterruptServiceRoutineForIrqs8to15
-    jmp     SHORT Interrupts_InstallHandlerToVectorInBXFromCSSI
+    jmp     SHORT Interrupts_InstallHandlerToVectorInALFromCSSI
 
 ;--------------------------------------------------------------------
 ; .InstallLowIrqHandler
 ;   Parameters:
-;       BX:     IRQ number (0...7)
-;       ES:     BDA and Interrupt Vector segment (zero)
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       BX, SI
+;       AL:     IRQ number (0...7)
+;       ES:     BDA and Interrupt Vector segment (zero)
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AL, BX, SI
 ;--------------------------------------------------------------------
 .InstallLowIrqHandler:
-    add     bx, BYTE HARDWARE_IRQ_0_INTERRUPT_08h       ; Interrupt vector number
+    add     al, BYTE HARDWARE_IRQ_0_INTERRUPT_08h       ; Interrupt vector number
     mov     si, IdeIrq_InterruptServiceRoutineForIrqs2to7
-    ; Fall to Interrupts_InstallHandlerToVectorInBXFromCSSI
-
-
-;--------------------------------------------------------------------
-; Interrupts_InstallHandlerToVectorInBXFromCSSI
-;   Parameters:
-;       BX:     Interrupt vector number (for example 13h)
+    ; Fall to Interrupts_InstallHandlerToVectorInALFromCSSI
+
+
+;--------------------------------------------------------------------
+; Interrupts_InstallHandlerToVectorInALFromCSSI
+;   Parameters:
+;       AL:     Interrupt vector number (for example 13h)
 ;       ES:     BDA and Interrupt Vector segment (zero)
 ;       CS:SI:  Ptr to interrupt handler
@@ -126 +126 @@
 ;       Nothing
 ;   Corrupts registers:
-;       BX
-;--------------------------------------------------------------------
-Interrupts_InstallHandlerToVectorInBXFromCSSI:
-    eSHL_IM bx, 2                   ; Shift for DWORD offset
+;       AX, BX
+;--------------------------------------------------------------------
+Interrupts_InstallHandlerToVectorInALFromCSSI:
+    mov     bl, 4                   ; Shift for DWORD offset, MUL smaller than other alternatives
+    mul     bl
+    xchg    ax, bx
     mov     [es:bx], si             ; Store offset
     mov     [es:bx+2], cs           ; Store segment

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -176 +176 @@
     %include "BootMenuEvent.asm"    ; For menu library event handling
                                     ; NOTE: BootMenuPrint needs to come immediately after BootMenuEvent
-    %include "BootMenuPrint.asm"    ; For printing Boot Menu strings 
+                                    ;       so that jump table entries in BootMenuEvent stay within 8-bits
+    %include "BootMenuPrint.asm"    ; For printing Boot Menu strings, also includes "BootMenuPrintCfg.asm"
     %include "BootPrint.asm"        ; For printing boot information
-    %include "BootMenuPrintCfg.asm" ; For printing hard disk configuration
     %include "FloppyDrive.asm"      ; Floppy Drive related functions
     %include "BootSector.asm"       ; For loading boot sector

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/CreateDPT.asm

@@ -63 +63 @@
 .StoreFlags:
     mov     [di+DPT.wFlags], ax
-
-%ifdef MODULE_SERIAL
-    cmp     byte [cs:bp+IDEVARS.bDevice], DEVICE_SERIAL_PORT
-    jnz     .StoreAddressing
-    or      byte [di+DPT.bFlagsHigh], FLGH_DPT_SERIAL_DEVICE
-%endif
     ; Fall to .StoreAddressing
 
@@ -205 +199 @@
 .StoreDeviceSpecificParameters:
     call    Device_FinalizeDPT
+
+%ifdef MODULE_SERIAL_FLOPPY
+;
+; These two instructions serve two purposes:
+; 1. If the drive is a floppy drive (CF set), then we effectively increment the counter.
+; 2. If this is a hard disk, and there have been any floppy drives previously added, then the hard disk is 
+;    effectively discarded.  This is more of a safety check then code that should ever normally be hit (see below).
+;    Since the floppy DPT's come after the hard disk DPT's, without expensive (code size) code to relocate a DPT, 
+;    this was necessary.  Now, this situation shouldn't happen in normal operation, for a couple of reasons:
+;       A. xtidecfg always puts configured serial ports at the end fo the IDEVARS list
+;       B. the auto serial code is always executed last
+;       C. the serial server always returns floppy drives last
+;
+    adc     byte [RAMVARS.xlateVars+XLATEVARS.bFlopCreateCnt], 0
+    jnz     .AllDone    
+%else
+;
+; Even without floppy support enabled, we shouldn't try to mount a floppy image as a hard disk, which
+; could lead to unpredictable results since no MBR will be present, etc.  The server doesn't know that 
+; floppies are supported, so it is important to still fail here if a floppy is seen during the drive scan.
+;
+    jc      .AllDone
+%endif
+
     ; Fall to .StoreDriveNumberAndUpdateDriveCount
 
@@ -230 +248 @@
     ja      SHORT .AllDone              ;  If so, return
     mov     [RAMVARS.bFirstDrv], dl     ; Store first drive number
+
+.AllDone:
     clc
-.AllDone:
     ret
+

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/FindDPT.asm

@@ -14 +14 @@
 ;       DS:DI:  Ptr to first unused DPT
 ;   Corrupts registers:
-;       DL
+;       DX
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
 FindDPT_ForNewDriveToDSDI:
-    mov     dl, [RAMVARS.bFirstDrv]
-    add     dl, [RAMVARS.bDrvCnt]
+    mov     ax, [RAMVARS.wDrvCntAndFirst]
+    add     al, ah
+%ifdef MODULE_SERIAL_FLOPPY
+    add     al, [RAMVARS.xlateVars+XLATEVARS.bFlopCreateCnt]
+%endif
+    xchg    ax, dx      
     ; Fall to FindDPT_ForDriveNumber
 
@@ -41 +45 @@
     xchg    di, ax  ; Save the contents of AX in DI
 
+%ifdef MODULE_SERIAL_FLOPPY
+    mov     ax, [RAMVARS.wDrvCntAndFirst]
+        
+    test    dl, dl
+    js      .harddisk
+
+    call    RamVars_UnpackFlopCntAndFirstToAL
+    add     dl, ah                      ; add in end of hard disk DPT list, floppies start immediately after
+.harddisk:
+    sub     dl, al                      ; subtract off beginning of either hard disk or floppy list (as appropriate)
+%else
+    sub     dl, [RAMVARS.bFirstDrv]     ; subtract off beginning of hard disk list
+%endif
+        
     mov     al, LARGEST_DPT_SIZE
-    sub     dl, [RAMVARS.bFirstDrv]
+        
     mul     dl
     add     ax, BYTE RAMVARS_size
 
-    xchg    di, ax  ; Restore AX and put result in DI
+    xchg    di, ax                      ; Restore AX and put result in DI
     pop     dx
     ret
@@ -89 +107 @@
 ; IterateToMasterAtPortCallback
 ;   Parameters:
-;       CH:     Drive number
 ;       DX:     IDE Base Port address
 ;       DS:DI:  Ptr to DPT to examine
 ;   Returns:
-;       DL:     Drive number if correct DPT
 ;       CF:     Set if wanted DPT found
 ;               Cleared if wrong DPT
@@ -116 +132 @@
     pop     bx
     jne     SHORT ReturnWrongDPT
-    mov     dl, ch                              ; Return drive number in DL
 
 ReturnRightDPT:
@@ -187 +202 @@
 ;   Returns:
 ;       DS:DI:      Ptr to wanted DPT (if found)
+;                   If not found, points to first empty DPT
 ;       CF:         Set if wanted DPT found
 ;                   Cleared if DPT not found, or no DPTs present
@@ -195 +211 @@
 IterateAllDPTs:
     push    cx
-    mov     cx, [RAMVARS.wDrvCntAndFirst]
+
+    mov     cl, [RAMVARS.bDrvCnt]       
+    mov     ch, 0
+        
+    mov     di, RAMVARS_size            ; Point DS:DI to first DPT
+        
     jcxz    .NotFound                   ; Return if no drives
-    mov     di, RAMVARS_size            ; Point DS:DI to first DPT
+        
 ALIGN JUMP_ALIGN
 .LoopWhileDPTsLeft:
     call    si                          ; Is wanted DPT?
     jc      SHORT .AllDptsIterated      ;  If so, return
-    inc     ch                          ; Increment drive number
     add     di, BYTE LARGEST_DPT_SIZE   ; Point to next DPT
-    dec     cl                          ; Decrement drives left
-    jnz     SHORT .LoopWhileDPTsLeft
+    loop    .LoopWhileDPTsLeft
+        
 .NotFound:      
     clc                                 ; Clear CF since DPT not found
+        
 ALIGN JUMP_ALIGN
 .AllDptsIterated:

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/RamVars.asm

@@ -123 +123 @@
 ;       DS:     RAMVARS segment
 ;   Returns:
-;       CF:     Set if function is handled by this BIOS
-;               Cleared if function belongs to some other BIOS
+;       CF:     Cleared if function is handled by this BIOS
+;               Set if function belongs to some other BIOS
 ;   Corrupts registers:
 ;       Nothing
@@ -131 +131 @@
 RamVars_IsFunctionHandledByThisBIOS:
     test    ah, ah          ; Reset for all floppy and hard disk drives?
-    jz      SHORT .FunctionIsHandledByOurBIOS
-    cmp     ah, 08h         ; Read Disk Drive Parameters?
-    jne     SHORT RamVars_IsDriveHandledByThisBIOS
-    test    dl, dl          ; We do not handle floppy drives
-    jns     SHORT .FunctionIsNotHandledByOurBIOS
-ALIGN JUMP_ALIGN
-.FunctionIsHandledByOurBIOS:
-    stc
-.FunctionIsNotHandledByOurBIOS:
-    ret
-
+    jz      SHORT RamVars_IsDriveHandledByThisBIOS.CFAlreadyClear_IsHandledByOurBIOS
+    cmp     ah, 08h
+%ifdef MODULE_SERIAL_FLOPPY
+; we handle all traffic for function 08h, as we need to wrap both hard disk and floppy drive counts
+    je      SHORT RamVars_IsDriveHandledByThisBIOS.CFAlreadyClear_IsHandledByOurBIOS
+%else
+; we handle all *hard disk* traffic for function 08h, as we need to wrap the hard disk drive count
+    je      SHORT RamVars_IsDriveHandledByThisBIOS.IsDriveAHardDisk
+%endif
+;;; fall-through            
+        
 ;--------------------------------------------------------------------
 ; Checks if drive is handled by this BIOS.
@@ -150 +150 @@
 ;       DS:     RAMVARS segment
 ;   Returns:
-;       CF:     Set if drive is handled by this BIOS
-;               Cleared if drive belongs to some other BIOS
+;       CF:     Cleared if drive is handled by this BIOS
+;               Set if drive belongs to some other BIOS
 ;   Corrupts registers:
 ;       Nothing
@@ -158 +158 @@
 RamVars_IsDriveHandledByThisBIOS:
     push    ax
-    mov     ax, [RAMVARS.wDrvCntAndFirst]       ; Drive count to AL, First number to AH
-    add     al, ah                              ; One past last drive to AL
-    cmp     dl, al                              ; Above last supported?
-    jae     SHORT .DriveNotHandledByThisBIOS
-    cmp     ah, dl                              ; Below first supported?
-    ja      SHORT .DriveNotHandledByThisBIOS
-    stc
-.DriveNotHandledByThisBIOS:
+
+    mov     ax, [RAMVARS.wDrvCntAndFirst]       ; Drive count to AH, First number to AL
+    add     ah, al                              ; One past last drive to AH
+    cmp     dl, ah                              ; Above last supported?
+    jae     SHORT .HardDiskIsNotHandledByThisBIOS
+.TestLowLimit:
+    cmp     dl, al                              ; Below first supported?
+    jae     SHORT .CFAlreadyClear_IsHandledByOurBIOS_PopAX  ; note that CF is clear if the branch is taken
+
+.HardDiskIsNotHandledByThisBIOS:
+%ifdef MODULE_SERIAL_FLOPPY
+    call    RamVars_UnpackFlopCntAndFirstToAL
+    cbw                                         ; normally 0h, could be ffh if no drives present
+    adc     ah, al                              ; if no drives present, still ffh (ffh + ffh + 1 = ffh)
+    js      SHORT .DiskIsNotHandledByThisBIOS
+    cmp     ah, dl
+    jz      SHORT .CFAlreadyClear_IsHandledByOurBIOS_PopAX
+    cmp     al, dl
+    jz      SHORT .CFAlreadyClear_IsHandledByOurBIOS_PopAX
+.DiskIsNotHandledByThisBIOS:            
+%endif
+
+    stc                                         ; Is not supported by our BIOS
+        
+.CFAlreadyClear_IsHandledByOurBIOS_PopAX:               
     pop     ax
-    ret
-
-
-;--------------------------------------------------------------------
-; RamVars_GetHardDiskCountFromBDAtoCX
-;   Parameters:
-;       DS:     RAMVARS segment
-;   Returns:
-;       CX:     Total hard disk count
-;   Corrupts registers:
-;       Nothing
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-RamVars_GetHardDiskCountFromBDAtoCX:
+.CFAlreadyClear_IsHandledByOurBIOS: 
+    ret
+
+%ifndef MODULE_SERIAL_FLOPPY        
+;
+; Note that we could have just checked for the high order bit in dl, but with the needed STC and jumps, 
+; leveraging the code above resulted in space savings.
+;
+.IsDriveAHardDisk:      
+    push    ax                                  ; match stack at the top of routine
+    mov     al, 80h                             ; to catch all hard disks, lower limit is 80h vs. bFirstDrv
+    jmp     .TestLowLimit                       ; and there is no need to test a high limit
+%endif
+
+;--------------------------------------------------------------------
+; RamVars_GetHardDiskCountFromBDAtoAX
+;   Parameters:
+;       DS:     RAMVARS segment
+;   Returns:
+;       AX:     Total hard disk count
+;   Corrupts registers:
+;       CX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+RamVars_GetHardDiskCountFromBDAtoAX:
     push    es
-    push    dx
-
-    LOAD_BDA_SEGMENT_TO es, cx, !       ; Zero CX
-    call    RamVars_GetCountOfKnownDrivesToDL
+
+    LOAD_BDA_SEGMENT_TO es, ax
+    call    RamVars_GetCountOfKnownDrivesToAX
     mov     cl, [es:BDA.bHDCount]
-    MAX_U   cl, dl
-
-    pop     dx
+    MAX_U   al, cl
+        
     pop     es
     ret
 
 ;--------------------------------------------------------------------
-; RamVars_GetCountOfKnownDrivesToDL
-;   Parameters:
-;       DS:     RAMVARS segment
-;   Returns:
-;       DL:     Total hard disk count
-;   Corrupts registers:
-;       Nothing
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-RamVars_GetCountOfKnownDrivesToDL:
-    mov     dl, [RAMVARS.bFirstDrv]     ; Number for our first drive
-    add     dl, [RAMVARS.bDrvCnt]       ; Our drives
-    and     dl, 7Fh                     ; Clear HD bit for drive count
-    ret
-
-
+; RamVars_GetCountOfKnownDrivesToAX
+;   Parameters:
+;       DS:     RAMVARS segment
+;   Returns:
+;       AX:     Total hard disk count
+;   Corrupts registers:
+;       None
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+RamVars_GetCountOfKnownDrivesToAX:
+    mov     ax, [RAMVARS.wDrvCntAndFirst]
+    add     al, ah
+    and     al, 7fh
+    cbw
+    ret
+    
 ;--------------------------------------------------------------------
 ; RamVars_GetIdeControllerCountToCX
@@ -219 +245 @@
 ;       Nothing
 ;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
 RamVars_GetIdeControllerCountToCX:
     eMOVZX  cx, BYTE [cs:ROMVARS.bIdeCnt]
     ret
+
+%ifdef MODULE_SERIAL_FLOPPY
+;--------------------------------------------------------------------
+; RamVars_UnpackFlopCntAndFirstToAL
+;   Parameters:
+;       Nothing
+;   Returns:
+;       AL:     First floppy drive number supported
+;       CF:     Number of floppy drives supported (clear = 1, set = 2)
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------       
+ALIGN JUMP_ALIGN
+RamVars_UnpackFlopCntAndFirstToAL:
+    mov     al, [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst]
+    sar     al, 1       
+    ret
+%endif

trunk/XTIDE_Universal_BIOS/makefile

@@ -66 +66 @@
 # Assembler preprocessor defines.                               #
 #################################################################
-DEFINES = INCLUDE_MENU_LIBRARY EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS MODULE_EBIOS MODULE_SERIAL MODULE_STRINGS_COMPRESSED
+DEFINES = INCLUDE_MENU_LIBRARY EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS MODULE_EBIOS MODULE_SERIAL MODULE_STRINGS_COMPRESSED MODULE_SERIAL_FLOPPY
 DEFINES_XT = ELIMINATE_CGA_SNOW
 DEFINES_XTPLUS = ELIMINATE_CGA_SNOW USE_186

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm

@@ -276 +276 @@
     CALL_MENU_LIBRARY RefreshItemFromAX
     pop     es
-    ret
+    ; Fall to ConfigurationMenu_CheckAndMoveSerialDrivesToBottom
+
+;----------------------------------------------------------------------
+; ConfigurationMenu_CheckAndMoveSerialDrivesToBottom
+;
+; Checks to ensure that serial adapters are at the end of the 
+; IDEVARS structures list, as serial floppies (if present) need to be 
+; the last drives detected by the BIOS.  If there are other controllers
+; after a serial controller, the other controllers are moved up on the list
+; and the serial controller is placed at the end of the list.
+;
+;   Parameters:
+;       SS:BP:  Menu handle
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       All
+;----------------------------------------------------------------------     
+ConfigurationMenu_CheckAndMoveSerialDrivesToBottom:     
+    push    es
+    push    ds
+    push    di
+    push    si
+
+    call    Buffers_GetIdeControllerCountToCX   ; will also set ES:DI to point to file buffer
+    push    es
+    pop     ds
+    mov     ch, 0                       ; clearing high order of CX and notification flag 
+    mov     dx, cx                      ; (probably unncessary, CX should be less than 127, but just to be sure)
+    jcxz    .done                       ; probably unnecessary, but make sure there is at least one controller      
+
+    add     di, ROMVARS.ideVars0        ; add in offset of first idevars
+    mov     bx, di
+
+.outerLoop:
+    mov     di, bx                      ; start of idevars
+    xor     si, si                      ; first serial found
+    xor     ax, ax                      ; first non-serial found
+    mov     cl, dl                      ; idevars count
+    mov     ch, 0
+
+.loop:
+    cmp     byte [di+IDEVARS.bDevice], DEVICE_SERIAL_PORT
+    jnz     .notSerial
+
+    test    si, si                      ; record the first serial controllert that we find
+    jnz     .next   
+    mov     si, di
+    jmp     .next
+
+.notSerial:
+    mov     ax, di                      ; record the *last* non-serial controller that we find
+
+.next:  
+    add     di, IDEVARS_size
+    loop    .loop
+
+    test    si,si                       ; no serial drives, nothing to do
+    jz      .done
+    cmp     si,ax                       ; serial port is already later on the list than any other controllers
+    ja      .done                       ; (also takes care of the case where ther are no other controllers)
+
+;
+; move serial to end of list, others up
+;
+    cld
+
+    mov     ax, di                      ; save end pointer of list after scan
+
+    sub     sp, IDEVARS_size            ; copy serial to temporary space on stack
+
+    mov     di, sp
+
+    mov     cx, IDEVARS_size
+    push    ss
+    pop     es
+
+    rep movsb
+
+    mov     di, si                      ; move up all the idevars below the serial, by one slot
+    sub     di, IDEVARS_size
+
+    mov     cx, ax                      ; restore end pointer of list, subtract off end of serial idevars
+    sub     cx, si
+
+    push    ds
+    pop     es
+
+    rep movsb
+
+    mov     si, sp                      ; place serial (currently on the stack) at bottom of list
+    push    ss
+    pop     ds
+    mov     cx, IDEVARS_size
+    ; di is already at last IDEVARS position
+    
+    rep movsb
+
+    add     sp, IDEVARS_size            
+
+    push    es
+    pop     ds
+
+    mov     dh, 1                       ; set flag that we have done a relocation
+    
+    jmp     .outerLoop
+
+.done:
+    pop     si
+    pop     di
+    pop     ds
+    pop     es
+
+    test    dh, dh
+    jz      .noWorkDone
+        
+    mov     dx, g_szSerialMoved
+    call    Dialogs_DisplayNotificationFromCSDX
+
+.noWorkDone:        
+    ret

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

@@ -97 +97 @@
 g_szNfoCfgIdeCnt:       db  "Number of IDE controllers to manage.",NULL
 
+g_szSerialMoved:        db  "A Serial Controller has been moved to the end of the Controller list. No further action is required. Serial Controllers must be placed at the end of the list.",NULL
+
 g_szHelpCfgFullMode:    incbin  "Configuration_FullMode.txt"
                         db  NULL
 g_szHelpCfgStealSize:   incbin  "Configuration_StealSize.txt"
                         db  NULL
-
 
 ; Strings for IDE Controller menu