Changeset 233 in xtideuniversalbios for trunk/Serial_Server/library/Process.cpp

Timestamp:

Feb 4, 2012, 6:21:22 PM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Port: split single byte port and baud into two bytes, taking advantage of the two bytes in DPT_SERIAL, which supports more serial baud rates and in particular fixed a bug where a 4x client machine couldn't talk to a 115.2K server machine. This is a wide change, touching lots of files, but most are shallow changes. DetectPrint.asm took the most significant changes, now it calculates the baud rate to display instead of using characters provided by the Configurator. The Configurator now has a new menu flag, FLG_MENUITEM_CHOICESTRINGS, for specifying that values are not linear and they should be lookedup rather than indexed. Finally, another important bug fixed here is that in some error cases, the serial port code could get into an infinite loop waiting ont the hardware; now it has a timeout.

File:

• trunk/Serial_Server/library/Process.cpp (modified) (8 diffs)

trunk/Serial_Server/library/Process.cpp

@@ -31 +31 @@
         unsigned char driveAndHead;
         unsigned char count;
-        unsigned char undefined1;
-        unsigned char portAndBaud;
-        unsigned char undefined2;
+        unsigned char scan;
+        unsigned char port;
+        unsigned char baud;
     } inquire;
     unsigned char b[514];
@@ -48 +48 @@
 #define SERIAL_COMMAND_MASK 0xe3
 #define SERIAL_COMMAND_HEADERMASK 0xe0
-
-#define SERIAL_INQUIRE_PORTANDBAUD_BAUDMASK 3
-#define SERIAL_INQUIRE_PORTANDBAUD_PORTMASK 0xfc
-#define SERIAL_INQUIRE_PORTANDBAUD_STARTINGPORT 0x240
-
-#define SERIAL_INQUIRE_PORTANDBAUD_PORTTRANSLATE( a ) ( ((a) & SERIAL_INQUIRE_PORTANDBAUD_PORT) << 1 | SERIAL_INQUIRE_PORTANDBAUD_STARTINGPORT )
 
 #define ATA_COMMAND_LBA 0x40
@@ -96 +90 @@
     unsigned long cyl, sect, head;
     unsigned long perfTimer;
+    unsigned char lastScan;
 
     GetTime_Timeout_Local = GetTime_Timeout();
@@ -102 +97 @@
     readto = 0;
     workCount = workOffset = workCommand = 0;
+    lastScan = 0;
 
     lasttick = GetTime();
@@ -282 +278 @@
                     if( workCommand == SERIAL_COMMAND_INQUIRE )
                         log( 1, "Inquire %d: Client Port=0x%x, Client Baud=%s", img == image0 ? 0 : 1,
-                             ((buff.inquire.portAndBaud & SERIAL_INQUIRE_PORTANDBAUD_PORTMASK) << 1) 
-                             + SERIAL_INQUIRE_PORTANDBAUD_STARTINGPORT,
-                             baudRateMatchDivisor( buff.inquire.portAndBaud & SERIAL_INQUIRE_PORTANDBAUD_BAUDMASK )->display );
+                             ((unsigned short) buff.inquire.port) << 2,
+                             baudRateMatchDivisor( buff.inquire.baud )->display );
                     else if( buff.chs.driveAndHead & ATA_COMMAND_LBA )
                         log( 1, "%s %d: LBA=%u, Count=%u", comStr, img == image0 ? 0 : 1,
@@ -325 +320 @@
                 if( workCommand == SERIAL_COMMAND_INQUIRE )
                 {
+                    unsigned char localScan;
+
                     if( serial->speedEmulation && 
-                        (buff.inquire.portAndBaud & SERIAL_INQUIRE_PORTANDBAUD_BAUDMASK) != serial->baudRate->divisor )
+                        buff.inquire.baud != serial->baudRate->divisor )
                     {
                         log( 1, "    Ignoring Inquire with wrong baud rate" );
@@ -333 +330 @@
                     }
 
-                    img->respondInquire( &buff.w[0], serial->baudRate, buff.inquire.portAndBaud );
+                    localScan = buff.inquire.scan;         // need to do this before the call to 
+                                                           // img->respondInquire, as it will clear the buff
+                    img->respondInquire( &buff.w[0], serial->baudRate, 
+                                         ((unsigned short) buff.inquire.port) << 2, 
+                                         (img == image1 && lastScan) || buff.inquire.scan );
+                    lastScan = localScan;
                 }
                 //
@@ -342 +344 @@
                     img->seekSector( mylba + workOffset );
                     img->readSector( &buff.w[0] );
+                    lastScan = 0;
                 }