fixed USB GPIO bug reported by gregy, and fixed 'hf 14a reader' command

[proxmark3-svn] / armsrc / cmd.c

diff --git a/armsrc/cmd.c b/armsrc/cmd.c
index f64b4e409ece87b18f9242d74e31eb0dc29abc82..ff5c4f8169ad69b60338af25cbf1b4488d1041a5 100644 (file)
--- a/armsrc/cmd.c
+++ b/armsrc/cmd.c
@@ -1,7 +1,7 @@
 /*\r
  * Proxmark send and receive commands\r
  *\r
- * Copyright (c) 2010, Roel Verdult\r
+ * Copyright (c) 2012, Roel Verdult\r
  * All rights reserved.\r
  *\r
  * Redistribution and use in source and binary forms, with or without\r
@@ -52,19 +52,19 @@ bool cmd_receive(UsbCommand* cmd) {
   return true;\r
 }\r
 \r
-bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, byte_t* data, size_t len) {\r
+bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len) {\r
   UsbCommand txcmd;\r
 \r
   // Compose the outgoing command frame\r
   txcmd.cmd = cmd;\r
   txcmd.arg[0] = arg0;\r
-  txcmd.arg[1] = arg1;\r
+  txcmd.arg[1] = arg1; \r
   txcmd.arg[2] = arg2;\r
 \r
   // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE\r
   if (data && len) {\r
-    memcpy(txcmd.d.asBytes,data,MIN(len,USB_CMD_DATA_SIZE));\r
-  }\r
+    memcpy(txcmd.d.asBytes,(byte_t*)data,MIN(len,USB_CMD_DATA_SIZE));\r
+         }\r
   \r
   // Send frame and make sure all bytes are transmitted\r
   if (usb_write((byte_t*)&txcmd,sizeof(UsbCommand)) != 0) return false;\r