Changeset 233 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

Timestamp:

Feb 4, 2012, 6:21:22 PM (13 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/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

@@ -135 +135 @@
 g_szNfoIdeSerialCOM:    db  "Select a COM port by number.",NULL
 g_szNfoIdeSerialBaud:   db  "Select the COM port's Baud Rate. The server must match this speed. Note that UART clock multipliers may impact the actual speed.",NULL
-g_szNfoIdeSerialPort:   db  "Select a COM port by custom I/O port address. Address must be in the range 248h to 430h and be on an 8-byte boundary.", NULL
+g_szNfoIdeSerialPort:   db  "Select a COM port by custom I/O port address. Any address is valud up to 3f8h, but must be on an 8-byte boundary.", NULL
 
 g_szHelpIdeCmdPort:     incbin  "IDE_CommandPort.txt"
@@ -161 +161 @@
 
 g_szSerialCOMChoice:
-                        db  "COM1 - Port 3f8h",LF
-                        db  "COM2 - Port 2f8h",LF
-                        db  "COM3 - Port 3e8h",LF
-                        db  "COM4 - Port 2e8h",LF
-                        db  "COM5 - Port 2f0h",LF
-                        db  "COM6 - Port 3e0h",LF
-                        db  "COM7 - Port 2e0h",LF
-                        db  "COM8 - Port 260h",LF
-                        db  "COM9 - Port 368h",LF
-                        db  "COMA - Port 268h",LF
-                        db  "COMB - Port 360h",LF
-                        db  "COMC - Port 270h",LF
-                        db  "COMx - Custom Port",NULL
+                        db  "COM1 - address 3f8h",LF
+                        db  "COM2 - address 2f8h",LF
+                        db  "COM3 - address 3e8h",LF
+                        db  "COM4 - address 2e8h",LF
+                        db  "COM5 - address 2f0h",LF
+                        db  "COM6 - address 3e0h",LF
+                        db  "COM7 - address 2e0h",LF
+                        db  "COM8 - address 260h",LF
+                        db  "COM9 - address 368h",LF
+                        db  "COMA - address 268h",LF
+                        db  "COMB - address 360h",LF
+                        db  "COMC - address 270h",LF
+                        db  "COMx - Custom address",NULL
 
 g_szValueCfgCOM1:       db      "COM1",NULL
@@ -190 +190 @@
         
 g_szSerialBaudChoice:
-                        db  "2400 baud",LF
+                        db  "115.2K baud",LF
+                        db  "57.6K baud",LF
+                        db  "38.4K baud",LF
+                        db  "28.8K baud",LF
+                        db  "19.2K baud",LF
                         db  "9600 baud",LF
-                        db  "38.4K baud",LF
-                        db  "115.2K baud",NULL
-
+                        db  "4800 baud",LF      
+                        db  "2400 baud",NULL
+
+g_szValueCfgBaud115_2:  db      "115.2K",NULL
+g_szValueCfgBaud57_6:   db      "57.6K",NULL
+g_szValueCfgBaud38_4:   db      "38.4K",NULL
+g_szValueCfgBaud28_8:   db      "28.8K",NULL
+g_szValueCfgBaud19_2:   db      "19.2K",NULL
+g_szValueCfgBaud9600:   db      "9600",NULL
+g_szValueCfgBaud4800:   db      "4800",NULL     
 g_szValueCfgBaud2400:   db      "2400",NULL
-g_szValueCfgBaud9600:   db      "9600",NULL
-g_szValueCfgBaud38_4:   db      "38.4K",NULL
-g_szValueCfgBaud115_2:  db      "115.2K",NULL
+
         
 g_szValueCfgDeviceDual8b:   db  "XTIDE",NULL
@@ -363 +372 @@
 
 g_szDashForZero:        db      "- ",NULL
+
+g_szValueUnknownError:  db  "Error!",NULL
+
+
+