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 5845888a539af7ea01b200f815ffe8b23cc809c5..842cb81df48a8d6f60434dd6238f70cfac7d515c 100644 (file)
--- a/client/hid-flasher/proxusb.h
+++ b/client/hid-flasher/proxusb.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
 
 #include <stdint.h>
 #include <stdbool.h>

-#include <usb.h>
+//#include <usb.h>

 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;
 #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 be0cf9ced086ac4b79ded5f343971444db3880dc..b9f2fb7728260d239fef5f67abe7a06ea4cb5693 100644 (file)
--- 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 PACKED __attribute__((packed))
 #endif
 

-#define USB_CMD_DATA_SIZE 512
-

 typedef struct {
 typedef struct {

-       uint64_t        cmd;
-       uint64_t        arg[3];
+       uint32_t        cmd;
+       uint32_t        arg[3];

        union {
        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;
        } 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
 
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000