Changeset 258 in xtideuniversalbios for trunk/Serial_Server/library

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/Serial_Server/library

Files:

• Image.cpp (modified) (6 diffs)
• Library.h (modified) (1 diff)
• Process.cpp (modified) (1 diff)

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();