unifying: move definitions to header

Prepare for adding DJ support, which I expect to be huge and unrelated
to the HID code.

Signed-off-by: Peter Wu <peter@lekensteyn.nl>

1 files changed, 2 insertions, 19 deletions

diff --git a/hw/usb/dev-unifying.c b/hw/usb/dev-unifying.c
index 8c3e7335fd..25f1fe920e 100644
--- a/hw/usb/dev-unifying.c
+++ b/hw/usb/dev-unifying.c
@@ -34,6 +34,7 @@
 #include "hw/usb/desc.h"
 #include "dump.h"
 #include "hw/input/hid.h"
+#include "hw/usb/hid-logitech-dj.h"
 
 /* HID requests ((bmRequestType << 8) | bRequest) */
 #define HID_GET_REPORT      0xa101
@@ -44,24 +45,6 @@
 #define HID_SET_IDLE        0x210a
 #define HID_SET_PROTOCOL    0x210b
 
-/* interface numbers (also used for array indices) */
-enum {
-    IFACE_KBD,  /* keyboard */
-    IFACE_MSE,  /* mouse; multimedia, power, media center buttons */
-    IFACE_DJ,   /* DJ mode */
-};
-
-typedef struct USBLtunifyState {
-    USBDevice dev;
-    USBEndpoint *intr[3]; /* interfaces (keyboard, mouse, DJ) */
-    UsbDumpState *usb_dump_state;
-    enum {
-        LTUNIFY_MODE_HID = 1,
-        LTUNIFY_MODE_DJ = 2
-    } mode;
-    HIDState hid[2]; /* HID devices (keyboard, mouse) */
-} USBLtunifyState;
-
 /* descriptors are retrieved with usbhid-dump (need to unbind interfaces from
  * usbhid) and prettified with hidrd 0.2 */
 
@@ -493,7 +476,7 @@ static void usb_ltunify_handle_control(USBDevice *dev, USBPacket *p,
         goto data_ready;
     }
 
-    if (index >= 0 && index <= 1) {
+    if (index == IFACE_KBD || index == IFACE_KBD) {
         /* HID interface for mouse and keyboard */
         usb_ltunify_handle_control_hid(dev, p, request, value, index, length, data);
     } else {