diff mbox

[2/3] HID: rmi: Support touchpads with external buttons

Message ID 1419029143-20484-2-git-send-email-aduggan@synaptics.com (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Andrew Duggan Dec. 19, 2014, 10:45 p.m. UTC
The external buttons on HID touchpads are connected as pass through devices and
button events are not reported in the rmi registers. As a result on these
devices we need to allow the HID generic desktop button events to be processed
by hid-input.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
---
 drivers/hid/hid-rmi.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Benjamin Tissoires Dec. 20, 2014, 1:53 a.m. UTC | #1
On Dec 19 2014 or thereabouts, Andrew Duggan wrote:
> The external buttons on HID touchpads are connected as pass through devices and
> button events are not reported in the rmi registers. As a result on these
> devices we need to allow the HID generic desktop button events to be processed
> by hid-input.
> 
> Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
> ---

Just to be sure, could you also add in the commit message that the flag
RMI_DEVICE_HAS_PHYS_BUTTONS is not auto-detected by the driver and that
it has to be added manually when adding a device to rmi_id[].

BTW, you can use .driver_data in in struct hid_device_id to pass the
flags directly. So here, it would be nice to add such retrieval in
probe:
data->device_flags = id->driver_data;
and then check for RMI_DEVICE.

>  drivers/hid/hid-rmi.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
> index 018f80f..cdfe165 100644
> --- a/drivers/hid/hid-rmi.c
> +++ b/drivers/hid/hid-rmi.c
> @@ -35,6 +35,7 @@
>  
>  /* device flags */
>  #define RMI_DEVICE			BIT(0)
> +#define RMI_DEVICE_HAS_PHYS_BUTTONS	BIT(1)
>  
>  enum rmi_mode_type {
>  	RMI_MODE_OFF			= 0,
> @@ -472,6 +473,9 @@ static int rmi_event(struct hid_device *hdev, struct hid_field *field,
>  	if ((data->device_flags & RMI_DEVICE) &&
>  	    (field->application == HID_GD_POINTER ||
>  	    field->application == HID_GD_MOUSE)) {
> +		if ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON)
> +			return 0;
> +
>  		rmi_schedule_reset(hdev);

I think here you will get a reset for each button press. I believe the
mouse collection is pretty generic and you should also get the relX|Y
events with the button press.

>  		return 1;
>  	}
> @@ -942,6 +946,10 @@ static int rmi_input_mapping(struct hid_device *hdev,
>  	 * we want to make HID ignore the advertised HID collection
>  	 * for RMI deivces
>  	 */
> +	if ((data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS) &&
> +	    ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON))
> +		return 0;
> +
>  	if (data->device_flags & RMI_DEVICE)
>  		return -1;
>  
> -- 
> 2.1.0
> 

Cheers,
Benjamin

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 018f80f..cdfe165 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -35,6 +35,7 @@ 
 
 /* device flags */
 #define RMI_DEVICE			BIT(0)
+#define RMI_DEVICE_HAS_PHYS_BUTTONS	BIT(1)
 
 enum rmi_mode_type {
 	RMI_MODE_OFF			= 0,
@@ -472,6 +473,9 @@  static int rmi_event(struct hid_device *hdev, struct hid_field *field,
 	if ((data->device_flags & RMI_DEVICE) &&
 	    (field->application == HID_GD_POINTER ||
 	    field->application == HID_GD_MOUSE)) {
+		if ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON)
+			return 0;
+
 		rmi_schedule_reset(hdev);
 		return 1;
 	}
@@ -942,6 +946,10 @@  static int rmi_input_mapping(struct hid_device *hdev,
 	 * we want to make HID ignore the advertised HID collection
 	 * for RMI deivces
 	 */
+	if ((data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS) &&
+	    ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON))
+		return 0;
+
 	if (data->device_flags & RMI_DEVICE)
 		return -1;