1 files changed, 13 insertions, 86 deletions

diff --git a/drivers/hid/hid-roccat-koneplus.h b/drivers/hid/hid-roccat-koneplus.h
index 7074b2a4b94b..563b9d3fe5fb 100644
--- a/drivers/hid/hid-roccat-koneplus.h
+++ b/drivers/hid/hid-roccat-koneplus.h
@@ -14,11 +14,18 @@
 
 #include <linux/types.h>
 
-struct koneplus_talk {
-        uint8_t command; /* KONEPLUS_COMMAND_TALK */
-        uint8_t size; /* always 0x10 */
-        uint8_t data[14];
-} __packed;
+enum {
+        KONEPLUS_SIZE_ACTUAL_PROFILE = 0x03,
+        KONEPLUS_SIZE_FIRMWARE_WRITE = 0x0402,
+        KONEPLUS_SIZE_INFO = 0x06,
+        KONEPLUS_SIZE_MACRO = 0x0822,
+        KONEPLUS_SIZE_PROFILE_SETTINGS = 0x2b,
+        KONEPLUS_SIZE_PROFILE_BUTTONS = 0x4d,
+        KONEPLUS_SIZE_SENSOR = 0x06,
+        KONEPLUS_SIZE_TALK = 0x10,
+        KONEPLUS_SIZE_TCU = 0x03,
+        KONEPLUS_SIZE_TCU_IMAGE = 0x0404,
+};
 
 enum koneplus_control_requests {
         KONEPLUS_CONTROL_REQUEST_PROFILE_SETTINGS = 0x80,
@@ -31,45 +38,6 @@ struct koneplus_actual_profile {
         uint8_t actual_profile; /* Range 0-4! */
 } __attribute__ ((__packed__));
 
-struct koneplus_profile_settings {
-        uint8_t command; /* KONEPLUS_COMMAND_PROFILE_SETTINGS */
-        uint8_t size; /* always 43 */
-        uint8_t number; /* range 0-4 */
-        uint8_t advanced_sensitivity;
-        uint8_t sensitivity_x;
-        uint8_t sensitivity_y;
-        uint8_t cpi_levels_enabled;
-        uint8_t cpi_levels_x[5];
-        uint8_t cpi_startup_level; /* range 0-4 */
-        uint8_t cpi_levels_y[5]; /* range 1-60 means 100-6000 cpi */
-        uint8_t unknown1;
-        uint8_t polling_rate;
-        uint8_t lights_enabled;
-        uint8_t light_effect_mode;
-        uint8_t color_flow_effect;
-        uint8_t light_effect_type;
-        uint8_t light_effect_speed;
-        uint8_t lights[16];
-        uint16_t checksum;
-} __attribute__ ((__packed__));
-
-struct koneplus_profile_buttons {
-        uint8_t command; /* KONEPLUS_COMMAND_PROFILE_BUTTONS */
-        uint8_t size; /* always 77 */
-        uint8_t number; /* range 0-4 */
-        uint8_t data[72];
-        uint16_t checksum;
-} __attribute__ ((__packed__));
-
-struct koneplus_macro {
-        uint8_t command; /* KONEPLUS_COMMAND_MACRO */
-        uint16_t size; /* always 0x822 little endian */
-        uint8_t profile; /* range 0-4 */
-        uint8_t button; /* range 0-23 */
-        uint8_t data[2075];
-        uint16_t checksum;
-} __attribute__ ((__packed__));
-
 struct koneplus_info {
         uint8_t command; /* KONEPLUS_COMMAND_INFO */
         uint8_t size; /* always 6 */
@@ -77,44 +45,6 @@ struct koneplus_info {
         uint8_t unknown[3];
 } __attribute__ ((__packed__));
 
-struct koneplus_e {
-        uint8_t command; /* KONEPLUS_COMMAND_E */
-        uint8_t size; /* always 3 */
-        uint8_t unknown; /* TODO 1; 0 before firmware update */
-} __attribute__ ((__packed__));
-
-struct koneplus_sensor {
-        uint8_t command;  /* KONEPLUS_COMMAND_SENSOR */
-        uint8_t size; /* always 6 */
-        uint8_t data[4];
-} __attribute__ ((__packed__));
-
-struct koneplus_firmware_write {
-        uint8_t command; /* KONEPLUS_COMMAND_FIRMWARE_WRITE */
-        uint8_t unknown[1025];
-} __attribute__ ((__packed__));
-
-struct koneplus_firmware_write_control {
-        uint8_t command; /* KONEPLUS_COMMAND_FIRMWARE_WRITE_CONTROL */
-        /*
-         * value is 1 on success
-         * 3 means "not finished yet"
-         */
-        uint8_t value;
-        uint8_t unknown; /* always 0x75 */
-} __attribute__ ((__packed__));
-
-struct koneplus_tcu {
-        uint16_t usb_command; /* KONEPLUS_USB_COMMAND_TCU */
-        uint8_t data[2];
-} __attribute__ ((__packed__));
-
-struct koneplus_tcu_image {
-        uint16_t usb_command; /* KONEPLUS_USB_COMMAND_TCU */
-        uint8_t data[1024];
-        uint16_t checksum;
-} __attribute__ ((__packed__));
-
 enum koneplus_commands {
         KONEPLUS_COMMAND_ACTUAL_PROFILE = 0x5,
         KONEPLUS_COMMAND_PROFILE_SETTINGS = 0x6,
@@ -122,6 +52,7 @@ enum koneplus_commands {
         KONEPLUS_COMMAND_MACRO = 0x8,
         KONEPLUS_COMMAND_INFO = 0x9,
         KONEPLUS_COMMAND_TCU = 0xc,
+        KONEPLUS_COMMAND_TCU_IMAGE = 0xc,
         KONEPLUS_COMMAND_E = 0xe,
         KONEPLUS_COMMAND_SENSOR = 0xf,
         KONEPLUS_COMMAND_TALK = 0x10,
@@ -187,10 +118,6 @@ struct koneplus_device {
         int chrdev_minor;
 
         struct mutex koneplus_lock;
-
-        struct koneplus_info info;
-        struct koneplus_profile_settings profile_settings[5];
-        struct koneplus_profile_buttons profile_buttons[5];
 };
 
 #endif