X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5bcc76c427b680e28c001783c29c695e3a8d0c17..79a73ab2d1a63fdf75d42774e160a9335d893416:/armsrc/cmd.c?ds=inline

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