From: iceman1001 <iceman@iuse.se>
Date: Fri, 19 Feb 2016 21:32:38 +0000 (+0100)
Subject: CHG: revert old fiddeling, I should not touch the HIDflasher.
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/e66ff99cc96a2b63c693b3872d934f05e8473cf8

CHG: revert old fiddeling, I should not touch the HIDflasher.
---

diff --git a/client/hid-flasher/proxusb.h b/client/hid-flasher/proxusb.h
index 5845888a..842cb81d 100644
--- a/client/hid-flasher/proxusb.h
+++ b/client/hid-flasher/proxusb.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <usb.h>
+//#include <usb.h>
 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index be0cf9ce..b9f2fb77 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -23,24 +23,14 @@ typedef BYTE uint8_t;
 #define PACKED __attribute__((packed))
 #endif
 
-#define USB_CMD_DATA_SIZE 512
-
 typedef struct {
-	uint64_t	cmd;
-	uint64_t	arg[3];
+	uint32_t	cmd;
+	uint32_t	arg[3];
 	union {
-    uint8_t  asBytes[USB_CMD_DATA_SIZE];
-    uint32_t asDwords[USB_CMD_DATA_SIZE/4];
+		uint8_t		asBytes[48];
+		uint32_t	asDwords[12];
 	} d;
 } PACKED UsbCommand;
-// A struct used to send sample-configs over USB
-typedef struct{
-	uint8_t decimation;
-	uint8_t bits_per_sample;
-	bool averaging;
-	int divisor;
-	int trigger_threshold;
-} sample_config;
 
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000