HID: logitech: add report descriptor for Driving Force wheel
This is the original report descriptor as reported by lsusb -vd 046d:c294. Signed-off-by: Paul Sbarra <sbarra.paul@gmail.com> Signed-off-by: Simon Wood <simon@mungewell.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Paul Sbarra
Jiri Kosina
parent
cf5425bfcd
commit
54bfe3f0da
1 changed files with 96 additions and 5 deletions
|
|
@ -21,8 +21,10 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/random.h>
|
#include <linux/random.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
|
#include <linux/usb.h>
|
||||||
#include <linux/wait.h>
|
#include <linux/wait.h>
|
||||||
|
|
||||||
|
#include "usbhid/usbhid.h"
|
||||||
#include "hid-ids.h"
|
#include "hid-ids.h"
|
||||||
#include "hid-lg.h"
|
#include "hid-lg.h"
|
||||||
|
|
||||||
|
|
@ -40,17 +42,83 @@
|
||||||
#define LG_FF3 0x1000
|
#define LG_FF3 0x1000
|
||||||
#define LG_FF4 0x2000
|
#define LG_FF4 0x2000
|
||||||
|
|
||||||
/* Size of the original descriptor of the Driving Force Pro wheel */
|
/* Size of the original descriptors of the Driving Force (and Pro) wheels */
|
||||||
|
#define DF_RDESC_ORIG_SIZE 130
|
||||||
#define DFP_RDESC_ORIG_SIZE 97
|
#define DFP_RDESC_ORIG_SIZE 97
|
||||||
|
|
||||||
/* Fixed report descriptor for Logitech Driving Force Pro wheel controller
|
/* Fixed report descriptors for Logitech Driving Force (and Pro)
|
||||||
|
* wheel controllers
|
||||||
*
|
*
|
||||||
* The original descriptor hides the separate throttle and brake axes in
|
* The original descriptors hide the separate throttle and brake axes in
|
||||||
* a custom vendor usage page, providing only a combined value as
|
* a custom vendor usage page, providing only a combined value as
|
||||||
* GenericDesktop.Y.
|
* GenericDesktop.Y.
|
||||||
* This descriptor removes the combined Y axis and instead reports
|
* These descriptors remove the combined Y axis and instead report
|
||||||
* separate throttle (Y) and brake (RZ).
|
* separate throttle (Y) and brake (RZ).
|
||||||
*/
|
*/
|
||||||
|
static __u8 df_rdesc_fixed[] = {
|
||||||
|
0x05, 0x01, /* Usage Page (Desktop), */
|
||||||
|
0x09, 0x04, /* Usage (Joystik), */
|
||||||
|
0xA1, 0x01, /* Collection (Application), */
|
||||||
|
0xA1, 0x02, /* Collection (Logical), */
|
||||||
|
0x95, 0x01, /* Report Count (1), */
|
||||||
|
0x75, 0x0A, /* Report Size (10), */
|
||||||
|
0x14, /* Logical Minimum (0), */
|
||||||
|
0x26, 0xFF, 0x03, /* Logical Maximum (1023), */
|
||||||
|
0x34, /* Physical Minimum (0), */
|
||||||
|
0x46, 0xFF, 0x03, /* Physical Maximum (1023), */
|
||||||
|
0x09, 0x30, /* Usage (X), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x95, 0x0C, /* Report Count (12), */
|
||||||
|
0x75, 0x01, /* Report Size (1), */
|
||||||
|
0x25, 0x01, /* Logical Maximum (1), */
|
||||||
|
0x45, 0x01, /* Physical Maximum (1), */
|
||||||
|
0x05, 0x09, /* Usage (Buttons), */
|
||||||
|
0x19, 0x01, /* Usage Minimum (1), */
|
||||||
|
0x29, 0x0c, /* Usage Maximum (12), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x95, 0x02, /* Report Count (2), */
|
||||||
|
0x06, 0x00, 0xFF, /* Usage Page (Vendor: 65280), */
|
||||||
|
0x09, 0x01, /* Usage (?: 1), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x05, 0x01, /* Usage Page (Desktop), */
|
||||||
|
0x09, 0x31, /* Usage (Y), */
|
||||||
|
0x26, 0xFF, 0x00, /* Logical Maximum (255), */
|
||||||
|
0x46, 0xFF, 0x00, /* Physical Maximum (255), */
|
||||||
|
0x95, 0x01, /* Report Count (1), */
|
||||||
|
0x75, 0x08, /* Report Size (8), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x25, 0x07, /* Logical Maximum (7), */
|
||||||
|
0x46, 0x3B, 0x01, /* Physical Maximum (315), */
|
||||||
|
0x75, 0x04, /* Report Size (4), */
|
||||||
|
0x65, 0x14, /* Unit (Degrees), */
|
||||||
|
0x09, 0x39, /* Usage (Hat Switch), */
|
||||||
|
0x81, 0x42, /* Input (Variable, Null State), */
|
||||||
|
0x75, 0x01, /* Report Size (1), */
|
||||||
|
0x95, 0x04, /* Report Count (4), */
|
||||||
|
0x65, 0x00, /* Unit (none), */
|
||||||
|
0x06, 0x00, 0xFF, /* Usage Page (Vendor: 65280), */
|
||||||
|
0x09, 0x01, /* Usage (?: 1), */
|
||||||
|
0x25, 0x01, /* Logical Maximum (1), */
|
||||||
|
0x45, 0x01, /* Physical Maximum (1), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x95, 0x02, /* Report Count (2), */
|
||||||
|
0x75, 0x08, /* Report Size (8), */
|
||||||
|
0x26, 0xFF, 0x00, /* Logical Maximum (255), */
|
||||||
|
0x46, 0xFF, 0x00, /* Physical Maximum (255), */
|
||||||
|
0x09, 0x02, /* Usage (?: 2), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0xC0, /* End Collection, */
|
||||||
|
0xA1, 0x02, /* Collection (Logical), */
|
||||||
|
0x26, 0xFF, 0x00, /* Logical Maximum (255), */
|
||||||
|
0x46, 0xFF, 0x00, /* Physical Maximum (255), */
|
||||||
|
0x95, 0x07, /* Report Count (7), */
|
||||||
|
0x75, 0x08, /* Report Size (8), */
|
||||||
|
0x09, 0x03, /* Usage (?: 3), */
|
||||||
|
0x91, 0x02, /* Output (Variable), */
|
||||||
|
0xC0, /* End Collection, */
|
||||||
|
0xC0 /* End Collection */
|
||||||
|
};
|
||||||
|
|
||||||
static __u8 dfp_rdesc_fixed[] = {
|
static __u8 dfp_rdesc_fixed[] = {
|
||||||
0x05, 0x01, /* Usage Page (Desktop), */
|
0x05, 0x01, /* Usage Page (Desktop), */
|
||||||
0x09, 0x04, /* Usage (Joystik), */
|
0x09, 0x04, /* Usage (Joystik), */
|
||||||
|
|
@ -99,7 +167,6 @@ static __u8 dfp_rdesc_fixed[] = {
|
||||||
0xC0 /* End Collection */
|
0xC0 /* End Collection */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Certain Logitech keyboards send in report #3 keys which are far
|
* Certain Logitech keyboards send in report #3 keys which are far
|
||||||
* above the logical maximum described in descriptor. This extends
|
* above the logical maximum described in descriptor. This extends
|
||||||
|
|
@ -109,6 +176,8 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||||
unsigned int *rsize)
|
unsigned int *rsize)
|
||||||
{
|
{
|
||||||
struct lg_drv_data *drv_data = hid_get_drvdata(hdev);
|
struct lg_drv_data *drv_data = hid_get_drvdata(hdev);
|
||||||
|
struct usb_device_descriptor *udesc;
|
||||||
|
__u16 bcdDevice, rev_maj, rev_min;
|
||||||
|
|
||||||
if ((drv_data->quirks & LG_RDESC) && *rsize >= 90 && rdesc[83] == 0x26 &&
|
if ((drv_data->quirks & LG_RDESC) && *rsize >= 90 && rdesc[83] == 0x26 &&
|
||||||
rdesc[84] == 0x8c && rdesc[85] == 0x02) {
|
rdesc[84] == 0x8c && rdesc[85] == 0x02) {
|
||||||
|
|
@ -135,6 +204,28 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (hdev->product) {
|
switch (hdev->product) {
|
||||||
|
|
||||||
|
/* Several wheels report as this id when operating in emulation mode. */
|
||||||
|
case USB_DEVICE_ID_LOGITECH_WHEEL:
|
||||||
|
udesc = &(hid_to_usb_dev(hdev)->descriptor);
|
||||||
|
if (!udesc) {
|
||||||
|
hid_err(hdev, "NULL USB device descriptor\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
bcdDevice = le16_to_cpu(udesc->bcdDevice);
|
||||||
|
rev_maj = bcdDevice >> 8;
|
||||||
|
rev_min = bcdDevice & 0xff;
|
||||||
|
|
||||||
|
/* Update the report descriptor for only the Driving Force wheel */
|
||||||
|
if (rev_maj == 1 && rev_min == 2 &&
|
||||||
|
*rsize == DF_RDESC_ORIG_SIZE) {
|
||||||
|
hid_info(hdev,
|
||||||
|
"fixing up Logitech Driving Force report descriptor\n");
|
||||||
|
rdesc = df_rdesc_fixed;
|
||||||
|
*rsize = sizeof(df_rdesc_fixed);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case USB_DEVICE_ID_LOGITECH_DFP_WHEEL:
|
case USB_DEVICE_ID_LOGITECH_DFP_WHEEL:
|
||||||
if (*rsize == DFP_RDESC_ORIG_SIZE) {
|
if (*rsize == DFP_RDESC_ORIG_SIZE) {
|
||||||
hid_info(hdev,
|
hid_info(hdev,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue