VectorKappa/universal-pidff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12 from JacKeTUs/quirks-init

Browse Source 
Move quirks initialization to the hid_pidff_init function
This commit is contained in:
Makarenko Oleg
2024-07-16 12:37:11 +03:00
committed by GitHub
parent a0b20c7055 3db0eef19a
commit 5416f537bf
3 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hid-pidff-wrapper.c
View File

@@ -69,9 +69,9 @@ static int universal_pidff_probe(struct hid_device *hdev,
goto err; goto err;
} }
ret = hid_pidff_init_with_quirks(hdev, id); ret = hid_pidff_init_quirks(hdev, id);
if (ret) { if (ret) {
hid_warn(hdev, "Force feedback not supported\n"); hid_warn(hdev, "Force feedback is not supported\n");
goto err; goto err;
} }

32
hid-pidff.c
View File

@@ -1320,9 +1320,9 @@ 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, with quirks
*/ */
int hid_pidff_init(struct hid_device *hid) int hid_pidff_init_quirks(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,
@@ -1344,6 +1344,8 @@ int hid_pidff_init(struct hid_device *hid)
return -ENOMEM; return -ENOMEM;
pidff->hid = hid; pidff->hid = hid;
pidff->quirks |= id->driver_data;
hid_dbg(dev, "Device quirks: %d\n", pidff->quirks);
hid_device_io_start(hid); hid_device_io_start(hid);
@@ -1421,29 +1423,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, const struct hid_device_id *id)
{
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 |= id->driver_data;
hid_device_io_stop(hid);
hid_dbg(dev, "Device quirks: %d\n", pidff->quirks);
return 0;
}

3
hid-pidff.h
View File

@@ -20,7 +20,6 @@
#define PIDFF_QUIRK_NO_DELAY_EFFECT BIT(2) #define PIDFF_QUIRK_NO_DELAY_EFFECT BIT(2)
int hid_pidff_init(struct hid_device *hid); int hid_pidff_init_quirks(struct hid_device *hid, const struct hid_device_id *id);
int hid_pidff_init_with_quirks(struct hid_device *hid, const struct hid_device_id *id);
#endif #endif