committing more developments.

svn path=/trunk/; revision=3737

rosapps/cmdutils/mode/mode.c

@@ -21,10 +21,12 @@
  */
 
 #include <windows.h>
+#include <string.h>
 #include <stdio.h>
 
 #define MAX_PORTNAME_LEN 20
 #define MAX_COMPORT_NUM  10
+#define MAX_COMPARAM_LEN 20
 
 #define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0]))
 #define ASSERT(a)
@@ -43,13 +45,15 @@ const char* usage_strings[] = {
 };
 
 const char* parity_strings[] = { 
-    _T("None"),
+    _T("None"),   // default
-    _T("Odd"),
+    _T("Odd"),    // only symbol in this set to have a 'd' in it
-    _T("Even"),
+    _T("Even"),   // ... 'v' in it
-    _T("Mark"),
+    _T("Mark"),   // ... 'm' in it
-    _T("Space")
+    _T("Space")   // ... 's' and/or a 'c' in it
 };
 
+const char* control_strings[] = { "OFF", "ON", "HANDSHAKE", "TOGGLE" };
+
 const char* stopbit_strings[] = { _T("1"), _T("1.5"), _T("2") };
 
 
@@ -58,34 +62,64 @@ int Usage()
 	int i;
 
     printf("\nConfigures system devices.\n\n");
-	for (i = 0; i < sizeof(usage_strings)/sizeof(usage_strings[0]); i++) {
+	for (i = 0; i < NUM_ELEMENTS(usage_strings); i++) {
         printf("%s\n", usage_strings[i]);
 	}
     printf("\n");
 	return 0;
 }
 
+int QueryDevices()
+{
+    char buffer[5000];
+    int len;
+    char* ptr = buffer;
+    
+    *ptr = '\0';
+    if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) {
+        while (*ptr != '\0') {
+            len = strlen(ptr);
+            if (strstr(ptr, "COM")) {
+                printf("    Found serial device - %s\n", ptr);
+            } else if (strstr(ptr, "PRN")) {
+                printf("    Found printer device - %s\n", ptr);
+            } else if (strstr(ptr, "LPT")) {
+                printf("    Found parallel device - %s\n", ptr);
+            } else {
+                printf("    Found other device - %s\n", ptr);
+            }
+            ptr += (len+1);
+        }
+    } else {
+        printf("    ERROR: QueryDosDevice(...) failed.\n");
+    }
+    return 1;
+}
+
 int ShowParrallelStatus(int nPortNum)
 {
-    TCHAR buffer[250];
+    char buffer[250];
+	char szPortName[MAX_PORTNAME_LEN];
 
+	sprintf(szPortName, "LPT%d", nPortNum);
     printf("\nStatus for device LPT%d:\n", nPortNum);
     printf("-----------------------\n");
-
+    if (QueryDosDevice(szPortName, buffer, NUM_ELEMENTS(buffer))) {
-    if (QueryDosDevice("LPT1", buffer, sizeof(buffer)/sizeof(TCHAR))) {
+        char* ptr = strrchr(buffer, '\\');
-        printf("    %s.\n", buffer);
+        if (ptr != NULL) {
+            if (0 == strcmp(szPortName, ++ptr)) {
+                printf("    Printer output is not being rerouted.\n");
+            } else {
+                printf("    Printer output is being rerouted to serial port %s\n", ptr);
+            }
+            return 0;
+        } else {
+            printf("    QueryDosDevice(%s) returned unrecogised form %s.\n", szPortName, buffer);
+        }
     } else {
-        //printf("    Printer output is not being rerouted.\n");
+        printf("    ERROR: QueryDosDevice(%s) failed.\n", szPortName);
     }
-    printf("    Printer output is not being rerouted.\n");
+    return 1;
-/*
-DWORD QueryDosDevice(
-  LPCTSTR lpDeviceName, // MS-DOS device name string
-  LPTSTR lpTargetPath,  // query results buffer
-  DWORD ucchMax         // maximum size of buffer
-);
- */
-	return 0;
 }
 
 int ShowConsoleStatus()
@@ -112,10 +146,11 @@ int ShowConsoleStatus()
 }
 
 static 
-BOOL GetComData(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts)
+BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite)
 {
+    BOOL result;
     HANDLE hPort;
-	TCHAR szPortName[MAX_PORTNAME_LEN];
+	char szPortName[MAX_PORTNAME_LEN];
 
     ASSERT(pDCB);
     ASSERT(pCommTimeouts);
@@ -133,15 +168,26 @@ BOOL GetComData(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts)
         printf("Illegal device name - %s\n", szPortName);
         return FALSE;
     }
-    if (!GetCommState(hPort, pDCB)) {
+    if (bWrite) {
-        printf("Failed to get the status for device COM%d:\n", nPortNum);
+        result = SetCommState(hPort, pDCB);
+    } else {
+        result = GetCommState(hPort, pDCB);
+    }
+    if (!result) {
+        printf("Failed to %s the status for device COM%d:\n", bWrite ? "set" : "get", nPortNum);
         CloseHandle(hPort);
         return FALSE;
     }
-    if (!GetCommTimeouts(hPort, pCommTimeouts)) {
+    if (bWrite) {
-        printf("Failed to get Timeout status for device COM%d:\n", nPortNum);
+        result = SetCommTimeouts(hPort, pCommTimeouts);
+    } else {
+        result = GetCommTimeouts(hPort, pCommTimeouts);
+    }
+    if (!result) {
+        printf("Failed to %s Timeout status for device COM%d:\n", bWrite ? "set" : "get", nPortNum);
         CloseHandle(hPort);
         return FALSE;
+
     }
     CloseHandle(hPort);
     return TRUE;
@@ -152,34 +198,11 @@ int ShowSerialStatus(int nPortNum)
     HANDLE hPort;
     DCB dcb;
     COMMTIMEOUTS CommTimeouts;
-	TCHAR szPortName[MAX_PORTNAME_LEN];
+	char szPortName[MAX_PORTNAME_LEN];
 
-	sprintf(szPortName, _T("COM%d"), nPortNum);
+    if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) {
-    hPort = CreateFile(szPortName,
-                       GENERIC_READ|GENERIC_WRITE,
-                       0,     // exclusive
-                       NULL,  // sec attr
-                       OPEN_EXISTING,
-                       0,     // no attributes
-                       NULL); // no template
-
-    if (hPort == (HANDLE)-1) {
-        //printf("Illegal device name - %s\n", szPortName);
         return 1;
     }
-    dcb.DCBlength = sizeof(dcb);
-    if (!GetCommState(hPort, &dcb)) {
-        printf("Failed to get the status for device COM%d:\n", nPortNum);
-        CloseHandle(hPort);
-        return 1;
-    }
-    if (!GetCommTimeouts(hPort, &CommTimeouts)) {
-        printf("Failed to get Timeout status for device COM%d:\n", nPortNum);
-        CloseHandle(hPort);
-        return 1;
-    }
-    CloseHandle(hPort);
-
     if (dcb.Parity > NUM_ELEMENTS(parity_strings)) {
         printf("ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity);
         dcb.Parity = 0;
@@ -199,31 +222,62 @@ int ShowSerialStatus(int nPortNum)
     printf("    CTS handshaking: %s\n", dcb.fOutxCtsFlow ? "ON" : "OFF");
     printf("    DSR handshaking: %s\n", dcb.fOutxDsrFlow ? "ON" : "OFF");
     printf("    DSR sensitivity: %s\n", dcb.fDsrSensitivity ? "ON" : "OFF");
-    printf("    DTR circuit:     %s\n", dcb.fDtrControl ? "ON" : "OFF");
+    printf("    DTR circuit:     %s\n", control_strings[dcb.fDtrControl]);
-    printf("    RTS circuit:     %s\n", dcb.fRtsControl ? "ON" : "OFF");
+    printf("    RTS circuit:     %s\n", control_strings[dcb.fRtsControl]);
 	return 0;
 }
 
 int SetParrallelState(int nPortNum)
 {
+	char szPortName[MAX_PORTNAME_LEN];
+    char szTargetPath[MAX_PORTNAME_LEN];
+
+	sprintf(szPortName, _T("LPT%d"), nPortNum);
+	sprintf(szTargetPath, _T("COM%d"), nPortNum);
+    if (!DefineDosDevice(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) {
+        DWORD error = GetLastError();
+
+        printf("SetParrallelState(%d) - DefineDosDevice(%s) failed: %x\n", nPortNum, error);
+    }
 	return 0;
 }
 
+/*
+    \??\COM1
+    \Device\NamedPipe\Spooler\LPT1
+BOOL DefineDosDevice(
+  DWORD dwFlags,         // options
+  LPCTSTR lpDeviceName,  // device name
+  LPCTSTR lpTargetPath   // path string
+);
+DWORD QueryDosDevice(
+  LPCTSTR lpDeviceName, // MS-DOS device name string
+  LPTSTR lpTargetPath,  // query results buffer
+  DWORD ucchMax         // maximum size of buffer
+);
+ */
+
 int SetConsoleState()
 {
+/*
+	"Select code page:  MODE CON[:] CP SELECT=yyy",
+	"Code page status:  MODE CON[:] CP [/STATUS]",
+	"Display mode:      MODE CON[:] [COLS=c] [LINES=n]",
+	"Typematic rate:    MODE CON[:] [RATE=r DELAY=d]",
+ */
 	return 0;
 }
 
 static 
-int GetComParameterData(const char* param)
+int ExtractModeSerialParams(const char* param)
 {
-    if (strstr(param, "off")) {
+    if (       strstr(param, "OFF")) {
         return 0;
-    } else if (strstr(param, "on")) {
+    } else if (strstr(param, "ON")) {
         return 1;
-    } else if (strstr(param, "hs")) {
+    } else if (strstr(param, "HS")) {
         return 2;
-    } else if (strstr(param, "tg")) {
+    } else if (strstr(param, "TG")) {
         return 3;
     }
     return -1;
@@ -231,59 +285,101 @@ int GetComParameterData(const char* param)
 
 int SetSerialState(int nPortNum, int args, char *argv[])
 {
-    int Baud =             1200;
-//    int Parity =           None;
-    int DataBits =         7;
-    int StopBits =         1;
-    BOOL bTimeout =        FALSE;
-    BOOL bXonXoff =        FALSE;
-    BOOL bCTShandshaking = FALSE;
-    BOOL bDSRhandshaking = FALSE;
-    BOOL bDSRsensitivity = FALSE;
-    BOOL bDTRcircuit =     TRUE;
-    BOOL bRTScircuit =     TRUE;
-
     int arg;
-
+    int value;
     DCB dcb;
     COMMTIMEOUTS CommTimeouts;
-    int value;
+    char buf[MAX_COMPARAM_LEN+1];
-    char* ptr;
 
-    if (GetComData(nPortNum, &dcb, &CommTimeouts)) {
+    if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) {
-        for (arg = 0; arg < args; arg++) {
+        for (arg = 2; arg < args; arg++) {
-            ptr = argv[arg];
+            if (strlen(argv[arg]) > MAX_COMPARAM_LEN) {
-            printf("Parsing arg %d - %s\n", arg, ptr);
+                printf("Invalid parameter (too long) - %s\n", argv[arg]);
-
+                return 1;
-            if (strstr(ptr, "BAUD=")) {
+            }
-            } else if (strstr(ptr, "PARITY=")) {
+            strcpy(buf, argv[arg]);
-            } else if (strstr(ptr, "DATA=")) {
+            strupr(buf);
-            } else if (strstr(ptr, "STOP=")) {
+            if (strstr(buf, "BAUD=")) {
-            } else if (strstr(ptr, "to=")) {
+                dcb.BaudRate = atol(buf+5);
-                value = GetComParameterData(ptr);
+            } else if (strstr(buf, "PARITY=")) {
-            } else if (strstr(ptr, "xon=")) {
+                if (strchr(buf, 'D')) {
-                value = GetComParameterData(ptr);
+                    dcb.Parity = 1;
-            } else if (strstr(ptr, "odsr=")) {
+                } else if (strchr(buf, 'V')) {
-                value = GetComParameterData(ptr);
+                    dcb.Parity = 2;
-            } else if (strstr(ptr, "octs=")) {
+                } else if (strchr(buf, 'M')) {
-                value = GetComParameterData(ptr);
+                    dcb.Parity = 3;
-            } else if (strstr(ptr, "dtr=")) {
+                } else if (strchr(buf, 'S')) {
-                value = GetComParameterData(ptr);
+                    dcb.Parity = 4;
-            } else if (strstr(ptr, "rts=")) {
+                } else {
-                value = GetComParameterData(ptr);
+                    dcb.Parity = 0;
-            } else if (strstr(ptr, "idsr=")) {
+                }
-                value = GetComParameterData(ptr);
+            } else if (strstr(buf, "DATA=")) {
+                dcb.ByteSize = atol(buf+5);
+            } else if (strstr(buf, "STOP=")) {
+                if (strchr(buf, '5')) {
+                    dcb.StopBits = 1;
+                } else if (strchr(buf, '2')) {
+                    dcb.StopBits = 2;
+                } else {
+                    dcb.StopBits = 0;
+                }
+            } else if (strstr(buf, "TO=")) { // to=on|off
+                value = ExtractModeSerialParams(buf);
+                if (value != -1) {
+                } else {
+                    goto invalid_serial_parameter;
+                }
+            } else if (strstr(buf, "XON=")) { // xon=on|off
+                value = ExtractModeSerialParams(buf);
+                if (value != -1) {
+                    dcb.fOutX = value;
+                    dcb.fInX = value;
+                } else {
+                    goto invalid_serial_parameter;
+                }
+            } else if (strstr(buf, "ODSR=")) { // odsr=on|off
+                value = ExtractModeSerialParams(buf);
+                if (value != -1) {
+                    dcb.fOutxDsrFlow = value;
+                } else {
+                    goto invalid_serial_parameter;
+                }
+            } else if (strstr(buf, "OCTS=")) { // octs=on|off
+                value = ExtractModeSerialParams(buf);
+                if (value != -1) {
+                    dcb.fOutxCtsFlow = value;
+                } else {
+                    goto invalid_serial_parameter;
+                }
+            } else if (strstr(buf, "DTR=")) { // dtr=on|off|hs
+                value = ExtractModeSerialParams(buf);
+                if (value != -1) {
+                    dcb.fDtrControl = value;
+                } else {
+                    goto invalid_serial_parameter;
+                }
+            } else if (strstr(buf, "RTS=")) { // rts=on|off|hs|tg
+                value = ExtractModeSerialParams(buf);
+                if (value != -1) {
+                    dcb.fRtsControl = value;
+                } else {
+                    goto invalid_serial_parameter;
+                }
+            } else if (strstr(buf, "IDSR=")) { // idsr=on|off
+                value = ExtractModeSerialParams(buf);
+                if (value != -1) {
+                    dcb.fDsrSensitivity = value;
+                } else {
+                    goto invalid_serial_parameter;
+                }
             } else {
+invalid_serial_parameter:;
+                printf("Invalid parameter - %s\n", buf);
+                return 1;
             }
         }
+        SerialPortQuery(nPortNum, &dcb, &CommTimeouts, TRUE);
     }
-/*
-	"Serial port:       MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n" \
-    "                            [to=on|off] [xon=on|off] [odsr=on|off]\n" \
-    "                            [octs=on|off] [dtr=on|off|hs]\n" \
-    "                            [rts=on|off|hs|tg] [idsr=on|off]",
-
- */
 	return 0;
 }
 
@@ -304,29 +400,59 @@ int find_portnum(const char* cmdverb)
 int main(int argc, char *argv[])
 {
 	int nPortNum;
+    char param1[MAX_COMPARAM_LEN+1];
+    char param2[MAX_COMPARAM_LEN+1];
 
     if (argc > 1) {
-		if (strstr(argv[1], "/?")) {
+        if (strlen(argv[1]) > MAX_COMPARAM_LEN) {
+            printf("Invalid parameter (too long) - %s\n", argv[1]);
+            return 1;
+        }
+        strcpy(param1, argv[1]);
+        strupr(param1);
+        if (argc > 2) {
+            if (strlen(argv[2]) > MAX_COMPARAM_LEN) {
+                printf("Invalid parameter (too long) - %s\n", argv[2]);
+                return 1;
+            }
+            strcpy(param2, argv[2]);
+            strupr(param2);
+        } else {
+            param2[0] = '\0';
+        }
+		if (strstr(param1, "/?") || strstr(param1, "-?")) {
             return Usage();
-		} else if (strstr(argv[1], "LPT")) {
+        } else if (strstr(param1, "/STA")) {
-			nPortNum = find_portnum(argv[1]);
+            goto show_status;
+		} else if (strstr(param1, "LPT")) {
+			nPortNum = find_portnum(param1);
 			if (nPortNum != -1) 
 				return ShowParrallelStatus(nPortNum);
-		} else if (strstr(argv[1], "CON")) {
+		} else if (strstr(param1, "CON")) {
             return ShowConsoleStatus();
-		} else if (strstr(argv[1], "COM")) {
+		} else if (strstr(param1, "COM")) {
-			nPortNum = find_portnum(argv[1]);
+			nPortNum = find_portnum(param1);
-			if (nPortNum != -1) 
+            if (nPortNum != -1) {
-                return ShowSerialStatus(nPortNum);
+                if (param2[0] == '\0' || strstr(param2, "/STA")) {
+                    return ShowSerialStatus(nPortNum);
+                } else {
+                    return SetSerialState(nPortNum, argc, argv);
+                }
+            }
 		}
-        printf("Invalid parameter - %s\n", argv[1]);
+        printf("Invalid parameter - %s\n", param1);
 		return 1;
     } else {
-	    ShowParrallelStatus(1);
+show_status:;
+
+        QueryDevices();
+/*
+        ShowParrallelStatus(1);
         for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) {
     	   ShowSerialStatus(nPortNum + 1);
         }
 	    ShowConsoleStatus();
+ */
 	}
     return 0;
 }