usbclerk: better msg names

3 files changed, 24 insertions, 23 deletions

diff --git a/usbclerk.cpp b/usbclerk.cpp
index 22e383d..a14245e 100644
--- a/usbclerk.cpp
+++ b/usbclerk.cpp
@@ -253,9 +253,9 @@ bool USBClerk::execute()
 {
     SECURITY_ATTRIBUTES sec_attr;
     SECURITY_DESCRIPTOR* sec_desr;
-    USBClerkDevInfo dev;
-    USBClerkAck ack = {{USB_CLERK_MAGIC, USB_CLERK_VERSION,
-        USB_CLERK_ACK, sizeof(USBClerkAck)}};
+    USBClerkDriverInstall dev;
+    USBClerkReply reply = {{USB_CLERK_MAGIC, USB_CLERK_VERSION,
+        USB_CLERK_REPLY, sizeof(USBClerkReply)}};
     DWORD bytes;
 
 #if 0
@@ -287,19 +287,19 @@ bool USBClerk::execute()
             vd_printf("ReadFile() failed: %d\n", GetLastError());
             goto disconnect;
         }
-        if (dev.hdr.magic != USB_CLERK_MAGIC || dev.hdr.type != USB_CLERK_DEV_INFO ||
-                dev.hdr.size != sizeof(USBClerkDevInfo)) {
+        if (dev.hdr.magic != USB_CLERK_MAGIC || dev.hdr.type != USB_CLERK_DRIVER_INSTALL ||
+                dev.hdr.size != sizeof(USBClerkDriverInstall)) {
             vd_printf("Unknown message received, magic %u type %u size %u",
                       dev.hdr.magic, dev.hdr.type, dev.hdr.size);
             goto disconnect;
         }
         vd_printf("Installing winusb driver for %04x:%04x", dev.vid, dev.pid);
-        if (ack.ack = install_winusb_driver(dev.vid, dev.pid)) {
+        if (reply.status = install_winusb_driver(dev.vid, dev.pid)) {
             vd_printf("winusb driver install succeed");
         } else {
             vd_printf("winusb driver install failed");
         }
-        if (!WriteFile(_pipe, &ack, sizeof(ack), &bytes, NULL)) {
+        if (!WriteFile(_pipe, &reply, sizeof(reply), &bytes, NULL)) {
             vd_printf("WriteFile() failed: %d\n", GetLastError());
             goto disconnect;
         }
diff --git a/usbclerk.h b/usbclerk.h
index de6876b..2464d4e 100644
--- a/usbclerk.h
+++ b/usbclerk.h
@@ -5,7 +5,7 @@
 
 #define USB_CLERK_PIPE_NAME     TEXT("\\\\.\\pipe\\usbclerkpipe")
 #define USB_CLERK_MAGIC         0xDADA
-#define USB_CLERK_VERSION       0x0001
+#define USB_CLERK_VERSION       0x0002
 
 typedef struct USBClerkHeader {
     UINT16 magic;
@@ -15,20 +15,21 @@ typedef struct USBClerkHeader {
 } USBClerkHeader;
 
 enum {
-    USB_CLERK_DEV_INFO = 1,
-    USB_CLERK_ACK,
+    USB_CLERK_DRIVER_INSTALL = 1,
+    USB_CLERK_DRIVER_REMOVE,
+    USB_CLERK_REPLY,
     USB_CLERK_END_MESSAGE,
 };
 
-typedef struct USBClerkDevInfo {
+typedef struct USBClerkDriverOp {
     USBClerkHeader hdr;
     UINT16 vid;
     UINT16 pid;
-} USBClerkDevInfo;
+} USBClerkDriverInstall, USBClerkDriverRemove;
 
-typedef struct USBClerkAck {
+typedef struct USBClerkReply {
     USBClerkHeader hdr;
-    UINT16 ack;
-} USBClerkAck;
+    UINT32 status;
+} USBClerkReply;
 
 #endif
diff --git a/usbclerktest.cpp b/usbclerktest.cpp
index 7cd0f90..0c2189a 100644
--- a/usbclerktest.cpp
+++ b/usbclerktest.cpp
@@ -5,9 +5,9 @@
 int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 {
     HANDLE pipe;
-    USBClerkDevInfo dev = {{USB_CLERK_MAGIC, USB_CLERK_VERSION, 
-        USB_CLERK_DEV_INFO, sizeof(USBClerkDevInfo)}};
-    USBClerkAck ack;
+    USBClerkDriverInstall dev = {{USB_CLERK_MAGIC, USB_CLERK_VERSION, 
+        USB_CLERK_DRIVER_INSTALL, sizeof(USBClerkDriverInstall)}};
+    USBClerkReply reply;
     DWORD pipe_mode;
     DWORD bytes = 0;
 
@@ -28,19 +28,19 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
         return 1;
     }
     printf("Signing & installing %04x:%04x\n", dev.vid, dev.pid);
-    if (!TransactNamedPipe(pipe, &dev, sizeof(dev), &ack, sizeof(ack), &bytes, NULL)) {
+    if (!TransactNamedPipe(pipe, &dev, sizeof(dev), &reply, sizeof(reply), &bytes, NULL)) {
         printf("TransactNamedPipe() failed: %d\n", GetLastError());
         CloseHandle(pipe);
         return 1;
     }
     CloseHandle(pipe);
-    if (ack.hdr.magic != USB_CLERK_MAGIC || ack.hdr.type != USB_CLERK_ACK ||
-            ack.hdr.size != sizeof(USBClerkAck)) {
+    if (reply.hdr.magic != USB_CLERK_MAGIC || reply.hdr.type != USB_CLERK_REPLY ||
+            reply.hdr.size != sizeof(USBClerkReply)) {
         printf("Unknown message received, magic 0x%x type %u size %u",
-               ack.hdr.magic, ack.hdr.type, ack.hdr.size);
+               reply.hdr.magic, reply.hdr.type, reply.hdr.size);
         return 1;
     }
-    if (ack.ack) {
+    if (reply.status) {
         printf("winusb driver install succeed");
     } else {
         printf("winusb driver install failed");