Changeset 259 in xtideuniversalbios for trunk/Serial_Server/win32/Win32.cpp

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.

File:

• trunk/Serial_Server/win32/Win32.cpp (modified) (2 diffs)

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;