Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver-transport-cleanups', 'for-3.10/i2c-hid' and 'for-3.10/logitech' into for-linus
This commit is contained in:
@@ -34,6 +34,7 @@
|
||||
|
||||
#define DFGT_REV_MAJ 0x13
|
||||
#define DFGT_REV_MIN 0x22
|
||||
#define DFGT2_REV_MIN 0x26
|
||||
#define DFP_REV_MAJ 0x11
|
||||
#define DFP_REV_MIN 0x06
|
||||
#define FFEX_REV_MAJ 0x21
|
||||
@@ -125,6 +126,7 @@ static const struct lg4ff_native_cmd native_g27 = {
|
||||
|
||||
static const struct lg4ff_usb_revision lg4ff_revs[] = {
|
||||
{DFGT_REV_MAJ, DFGT_REV_MIN, &native_dfgt}, /* Driving Force GT */
|
||||
{DFGT_REV_MAJ, DFGT2_REV_MIN, &native_dfgt}, /* Driving Force GT v2 */
|
||||
{DFP_REV_MAJ, DFP_REV_MIN, &native_dfp}, /* Driving Force Pro */
|
||||
{G25_REV_MAJ, G25_REV_MIN, &native_g25}, /* G25 */
|
||||
{G27_REV_MAJ, G27_REV_MIN, &native_g27}, /* G27 */
|
||||
@@ -202,7 +204,7 @@ static int hid_lg4ff_play(struct input_dev *dev, void *data, struct ff_effect *e
|
||||
value[5] = 0x00;
|
||||
value[6] = 0x00;
|
||||
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
@@ -225,7 +227,7 @@ static void hid_lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitud
|
||||
value[5] = 0x00;
|
||||
value[6] = 0x00;
|
||||
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
}
|
||||
|
||||
/* Sends autocentering command compatible with Formula Force EX */
|
||||
@@ -245,7 +247,7 @@ static void hid_lg4ff_set_autocenter_ffex(struct input_dev *dev, u16 magnitude)
|
||||
value[5] = 0x00;
|
||||
value[6] = 0x00;
|
||||
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
}
|
||||
|
||||
/* Sends command to set range compatible with G25/G27/Driving Force GT */
|
||||
@@ -265,7 +267,7 @@ static void hid_lg4ff_set_range_g25(struct hid_device *hid, u16 range)
|
||||
value[5] = 0x00;
|
||||
value[6] = 0x00;
|
||||
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
}
|
||||
|
||||
/* Sends commands to set range compatible with Driving Force Pro wheel */
|
||||
@@ -294,7 +296,7 @@ static void hid_lg4ff_set_range_dfp(struct hid_device *hid, __u16 range)
|
||||
report->field[0]->value[1] = 0x02;
|
||||
full_range = 200;
|
||||
}
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
|
||||
/* Prepare "fine" limit command */
|
||||
value[0] = 0x81;
|
||||
@@ -306,7 +308,7 @@ static void hid_lg4ff_set_range_dfp(struct hid_device *hid, __u16 range)
|
||||
value[6] = 0x00;
|
||||
|
||||
if (range == 200 || range == 900) { /* Do not apply any fine limit */
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -320,7 +322,7 @@ static void hid_lg4ff_set_range_dfp(struct hid_device *hid, __u16 range)
|
||||
value[5] = (start_right & 0xe) << 4 | (start_left & 0xe);
|
||||
value[6] = 0xff;
|
||||
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
}
|
||||
|
||||
static void hid_lg4ff_switch_native(struct hid_device *hid, const struct lg4ff_native_cmd *cmd)
|
||||
@@ -334,7 +336,7 @@ static void hid_lg4ff_switch_native(struct hid_device *hid, const struct lg4ff_n
|
||||
for (i = 0; i < 7; i++)
|
||||
report->field[0]->value[i] = cmd->cmd[j++];
|
||||
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -410,7 +412,7 @@ static void lg4ff_set_leds(struct hid_device *hid, __u8 leds)
|
||||
value[4] = 0x00;
|
||||
value[5] = 0x00;
|
||||
value[6] = 0x00;
|
||||
usbhid_submit_report(hid, report, USB_DIR_OUT);
|
||||
hid_hw_request(hid, report, HID_REQ_SET_REPORT);
|
||||
}
|
||||
|
||||
static void lg4ff_led_set_brightness(struct led_classdev *led_cdev,
|
||||
|
Reference in New Issue
Block a user