Changeset 259 in xtideuniversalbios for trunk/Serial_Server

Timestamp:

Feb 23, 2012, 7:14:06 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

For function int13/0h, restored the code to only reset the floppy drives if a floppy drive was passed in for reset. Other minor optimizations. Better create new floppy support in Serial Server.

Location:

trunk/Serial_Server

Files:

• library/FlatImage.h (modified) (3 diffs)
• library/Image.cpp (modified) (3 diffs)
• library/Library.h (modified) (1 diff)
• win32/Win32.cpp (modified) (2 diffs)

trunk/Serial_Server/library/FlatImage.h

@@ -24 +24 @@
             double sizef;
             FileAccess cf;
+            char sizeChar;
 
             size = (unsigned long) p_cyl * (unsigned long) p_sect * (unsigned long) p_head;
@@ -29 +30 @@
                 log( -1, "'%s', can't create flat file with size greater than %lu 512-byte sectors", name, cf.MaxSectors );
             sizef = size / 2048.0;   // 512 byte sectors -> MB
+            sizeChar = 'M';
+            if( sizef < 1 ) 
+            {
+                sizef *= 1024;
+                sizeChar = 'K';
+            }
 
             if( cf.Create( name ) )
@@ -37 +44 @@
                 
                 if( p_cyl > 1024 )
-                    log( 0, "Created file '%s', size %.1lf MB", name, sizef );
+                    log( 0, "Created file '%s', size %.2lf %cB", name, sizef, sizeChar );
                 else
-                    log( 0, "Created file '%s', geometry %u:%u:%u, size %.1lf MB", name, p_cyl, p_sect, p_head, sizef );
+                    log( 0, "Created file '%s', geometry %u:%u:%u, size %.2lf %cB", name, p_cyl, p_head, p_sect, sizef, sizeChar );
                 cf.Close();
             }

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 }
+struct floppyInfo floppyInfos[] = 
+{
+    { 1, 2949120 / 512, 6, 80, 2, 36 },         // 2.88MB 3.5"
+    { 0, 2867200 / 512, 6, 80, 2, 36 },         // 2.88MB 3.5" (alternate spelling with 2.8)
+    { 0, 2969600 / 512, 6, 80, 2, 36 },         // 2.88MB 3.5" (alternate spelling with 2.9)
+    { 1, 1474560 / 512, 4, 80, 2, 18 },         // 1.44MB 3.5"
+    { 0, 1433600 / 512, 4, 80, 2, 18 },         // 1.44MB 3.5" (alternate spelling with 1.4)
+    { 1, 1228800 / 512, 2, 80, 2, 15 },         // 1.2MB 5.25"
+    { 1, 737280 / 512, 3, 80, 1, 18 },          // 720KB 3.5"
+    { 1, 368640 / 512, 1, 40, 2, 9 },           // 360KB 5.25"
+    { 1, 327680 / 512, 0, 40, 2, 8 },           // 320KB 5.25"
+    { 1, 184320 / 512, 0, 40, 1, 9 },           // 180KB 5.25" single sided
+    { 1, 163840 / 512, 0, 40, 1, 8 },           // 160KB 5.25" single sided
+    { 0, 0, 0, 0, 0, 0 }
 };
+
+struct floppyInfo *FindFloppyInfoBySize( double size )
+{
+    struct floppyInfo *fi;
+
+    for( fi = floppyInfos; fi->size != 0 && !(size+5 > fi->size && size-5 < fi->size); fi++ ) ;
+
+    if( fi->size == 0 )
+        fi = NULL;
+
+    return( fi );
+}
 
 Image::Image( char *name, int p_readOnly, int p_drive )
@@ -69 +78 @@
 
     floppy = 0;
-    for( f = floppyInfos; f->size && f->size != totallba; f++ ) ;
+    for( f = floppyInfos; f->size && !(f->size == totallba && f->real); f++ ) ;
     if( f->size )
     {
@@ -78 +87 @@
         p_head = f->heads;
         p_sect = f->sectors;
+        totallba = p_cyl * p_head * p_sect;
     }
 

trunk/Serial_Server/library/Library.h

@@ -15 +15 @@
 
 unsigned short checksum( unsigned short *wbuff, int wlen );
+
+struct floppyInfo {
+    unsigned char real;
+    unsigned long size;
+    unsigned char type;
+    unsigned char cylinders;
+    unsigned char heads;
+    unsigned char sectors;
+};
+
+struct floppyInfo *FindFloppyInfoBySize( double size );
 
 class Image

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, 
+        "                      Floppy images can also be created, such as \"360K\"",
         "                      (default is a 32 MB disk, with CHS geometry 65:16:63)",
         "",
@@ -160 +161 @@
                 if( atol(argv[t+1]) != 0 )
                 {
-                    unsigned long size = atol(argv[++t]);
-                    sect = 63;
-                    head = 16;
-                    cyl = (size*1024*2) / (16*63);
+                    double size = atof(argv[++t]);
+                    struct floppyInfo *fi;
+                    char *c;
+
+                    size *= 2;
+                    for( c = argv[t]; *c && *c != 'k' && *c != 'K'; c++ ) ;
+                    if( !(*c) )
+                        size *= 1000;
+
+                    if( (fi = FindFloppyInfoBySize( size )) )
+                    {
+                        sect = fi->sectors;
+                        head = fi->heads;
+                        cyl = fi->cylinders;
+                    }
+                    else
+                    {
+                        sect = 63;
+                        head = 16;
+                        cyl = size / (16*63);
+                    }
                 }
                 break;