unifying: impl HID++ 2.0 DeviceName, adjust device info

Set K800 to use HID++ 1.0; add a device_name field to store long
device names for HID++ 2.0 devices. The device types constants
are slightly different between HID++ 1.0 and HID++ 2.0, two constants
are not implemented (and those will probably never be implemented).

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

1 files changed, 41 insertions, 0 deletions

diff --git a/hw/usb/hid-logitech-hidpp20.c b/hw/usb/hid-logitech-hidpp20.c
index eb15ab1c96..3c664cc089 100644
--- a/hw/usb/hid-logitech-hidpp20.c
+++ b/hw/usb/hid-logitech-hidpp20.c
@@ -146,10 +146,51 @@ static HIDPP20_FEATURE(feat_devicefwversion)
     }
 }
 
+/* returns the HID++ 2.0 Device Type constant for a device */
+static uint8_t hidpp20_get_device_type(LHidDevice *hd)
+{
+    static const uint8_t device_types_map[0x10] = {
+        [DEVTYPE_KEYBOARD]  = 0,
+        [DEVTYPE_MOUSE]     = 3,
+        [DEVTYPE_NUMPAD]    = 2,
+        [DEVTYPE_PRESENTER] = 6,
+        [DEVTYPE_TRACKBALL] = 5,
+        [DEVTYPE_TOUCHPAD]  = 4,
+        // Not handled: RemoteControl (1) Receiver (7)
+    };
+
+    assert(hd->info.device_type < ARRAY_SIZE(device_types_map));
+    return device_types_map[hd->info.device_type];
+}
+
+static HIDPP20_FEATURE(feat_devicename)
+{
+    switch (fn) {
+    case 0: /* nameLength = GetCount() */
+        params[0] = strlen(hd->info.device_name);
+        return 1;
+    case 1: /* DeviceName = GetDeviceName(CharIndex) */
+        if (params[0] > strlen(hd->info.device_name)) {
+            return -HIDPP20_ERR_CODE_OUTOFRANGE;
+        }
+        const char *name = hd->info.device_name + params[0];
+        /* always include trailing 0 such that the param len > 0 (non-void) */
+        unsigned len = MIN(sizeof(msg->params), strlen(name) + 1);
+        memcpy(params, name, len);
+        return len;
+    case 2: /* DeviceType, deviceInterface(s) = GetDeviceType() */
+        params[0] = hidpp20_get_device_type(hd);
+        return 1;
+    default:
+        return -HIDPP20_ERR_CODE_INVALID_FUNCTION_ID;
+    }
+}
+
 /* root feature not included! */
 static const HidppFeature features_m525[] = {
     { 0x0001, 0, feat_featureset            },
     { 0x0003, 0, feat_devicefwversion       },
+    { 0x0005, 0, feat_devicename            },
 };
 
 void hidpp20_init_features(LHidDevice *hd) {