Small changes to initialization of quirks

This commit is contained in:
Oleg
2024-05-29 23:38:38 +03:00
parent 377eb942bf
commit 23255595f7
2 changed files with 11 additions and 32 deletions

View File

@@ -1250,7 +1250,7 @@ static int pidff_check_autocenter(struct pidff_device *pidff,
/* /*
* Check if the device is PID and initialize it * Check if the device is PID and initialize it
*/ */
int hid_pidff_init(struct hid_device *hid) int hid_pidff_init(struct hid_device *hid, const struct hid_device_id *id)
{ {
struct pidff_device *pidff; struct pidff_device *pidff;
struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input *hidinput = list_entry(hid->inputs.next,
@@ -1272,7 +1272,7 @@ int hid_pidff_init(struct hid_device *hid)
return -ENOMEM; return -ENOMEM;
pidff->hid = hid; pidff->hid = hid;
pidff->quirks = 0; pidff->quirks |= id->device_data;
hid_device_io_start(hid); hid_device_io_start(hid);
@@ -1350,29 +1350,3 @@ int hid_pidff_init(struct hid_device *hid)
kfree(pidff); kfree(pidff);
return error; return error;
} }
/*
* Check if the device is PID and initialize it
* Add quirks after initialisation
*/
int hid_pidff_init_with_quirks(struct hid_device *hid, unsigned quirks)
{
int error = hid_pidff_init(hid);
if (error)
return error;
struct hid_input *hidinput = list_entry(hid->inputs.next,
struct hid_input, list);
struct input_dev *dev = hidinput->input;
struct pidff_device *pidff = dev->ff->private;
/* set quirks on the pidff device */
hid_device_io_start(hid);
pidff->quirks |= quirks;
hid_device_io_stop(hid);
hid_dbg(dev, "Device quirks: %d\n", pidff->quirks);
return 0;
}

View File

@@ -16,7 +16,12 @@
*/ */
#define PIDFF_QUIRK_FIX_WHEEL_DIRECTION BIT(1) #define PIDFF_QUIRK_FIX_WHEEL_DIRECTION BIT(1)
int hid_pidff_init(struct hid_device *hid); /*
int hid_pidff_init_with_quirks(struct hid_device *hid, unsigned quirks); * Skip initialization of 0xA7 descriptor (Delay effect)
*/
#define PIDFF_QUIRK_NO_DELAY_EFFECT BIT(2)
int hid_pidff_init(struct hid_device *hid, const struct hid_device_id *id);
#endif #endif