Skip to contentSkip to conversation

HID: magicmouse: Use hid-input parsing rather than bypassing it

PATCH Applied Michael Poole 3 participants 4 messages Sep 23, 2010 – Sep 24, 2010 HID

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 HID: magicmouse: Use hid-input parsing rather than bypassing it

Let the HID core handle input device setup and HID-compliant reports. This driver then only has to worry about the non-standard reports.

---
 drivers/hid/hid-magicmouse.c |   81
+++++++++--------------------------------
 1 files changed, 18 insertions(+), 63 deletions(-)

This is a rebased and slightly revised version of an RFC patch I sent out a few weeks ago (which Chase later acked):
http://www.spinics.net/lists/linux-input/msg10948.html

The changes in v2 are to clarify the commit summary line and comments, and remove one if() that would pass if the device had any HID input descriptors. If/when someone adds support for a device that has none of those, the if() could be restored.

drivers/hid/hid-magicmouse.c +0 -0
index 8791a08..5e1907a 100644
@@ -279,13 +279,6 @@ static int magicmouse_raw_event(struct hid_device

*hdev,
int x = 0, y = 0, ii, clicks = 0, npoints;

switch (data[0]) {
- case 0x10:
- if (size != 6)
- return 0;
- x = (__s16)(data[2] | data[3] << 8);
- y = (__s16)(data[4] | data[5] << 8);
- clicks = data[1];
- break;
case TRACKPAD_REPORT_ID:
/* Expect four bytes of prefix, and N*9 bytes of touch data. */ if (size < 4 || ((size - 4) % 9) != 0)
@@ -343,13 +336,6 @@ static int magicmouse_raw_event(struct hid_device *hdev,
magicmouse_raw_event(hdev, report, data + 2 + data[1],
size - 2 - data[1]);
break;
- case 0x20: /* Theoretically battery status (0-100), but I have
- * never seen it -- maybe it is only upon request.
- */
- case 0x60: /* Unknown, maybe laser on/off. */
- case 0x61: /* Laser reflection status change.
- * data[1]: 0 = spotted, 1 = lost
- */
default:
return 0;
}
@@ -377,36 +363,8 @@ static int magicmouse_raw_event(struct hid_device *hdev,
return 1;
}

-static int magicmouse_input_open(struct input_dev *dev) -{
- struct hid_device *hid = input_get_drvdata(dev);
-
- return hid->ll_driver->open(hid);
-}
-
-static void magicmouse_input_close(struct input_dev *dev) -{
- struct hid_device *hid = input_get_drvdata(dev);
-
- hid->ll_driver->close(hid);
-}
-
static void magicmouse_setup_input(struct input_dev *input, struct
hid_device *hdev)
{
- input_set_drvdata(input, hdev);
- input->event = hdev->ll_driver->hidinput_input_event;
- input->open = magicmouse_input_open;
- input->close = magicmouse_input_close;
-
- input->name = hdev->name;
- input->phys = hdev->phys;
- input->uniq = hdev->uniq;
- input->id.bustype = hdev->bus;
- input->id.vendor = hdev->vendor;
- input->id.product = hdev->product;
- input->id.version = hdev->version;
- input->dev.parent = hdev->dev.parent;
-
__set_bit(EV_KEY, input->evbit);

if (input->id.product == USB_DEVICE_ID_APPLE_MAGICMOUSE) {
@@ -466,11 +424,22 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
}
}

+static int magicmouse_input_mapping(struct hid_device *hdev,
+ struct hid_input *hi, struct hid_field *field,
+ struct hid_usage *usage, unsigned long **bit, int *max)
+{
+ struct magicmouse_sc *msc = hid_get_drvdata(hdev);
+
+ if (!msc->input)
+ msc->input = hi->input;
+
+ return 0;
+}
+
static int magicmouse_probe(struct hid_device *hdev,
const struct hid_device_id *id)
{
__u8 feature[] = { 0xd7, 0x01 };
- struct input_dev *input;
struct magicmouse_sc *msc;
struct hid_report *report;
int ret;
@@ -500,8 +469,11 @@ static int magicmouse_probe(struct hid_device *hdev,
goto err_free;
}

- /* we are handling the input ourselves */
- hidinput_disconnect(hdev);
+ /* We do this after hid-input is done parsing reports so that
+ * hid-input uses the most natural button and axis IDs.
+ */
+ if (msc->input)
+ magicmouse_setup_input(msc->input, hdev);

if (id->product == USB_DEVICE_ID_APPLE_MAGICMOUSE)
report = hid_register_report(hdev, HID_INPUT_REPORT,
@@ -528,24 +500,7 @@ static int magicmouse_probe(struct hid_device *hdev,
goto err_stop_hw;
}

- input = input_allocate_device();
- if (!input) {
- dev_err(&hdev->dev, "can't alloc input device\n");
- ret = -ENOMEM;
- goto err_stop_hw;
- }
- magicmouse_setup_input(input, hdev);
-
- ret = input_register_device(input);
- if (ret) {
- dev_err(&hdev->dev, "input device registration failed\n");
- goto err_input;
- }
- msc->input = input;
-
return 0;
-err_input:
- input_free_device(input);
err_stop_hw:
hid_hw_stop(hdev);
err_free:
@@ -558,7 +513,6 @@ static void magicmouse_remove(struct hid_device *hdev)
struct magicmouse_sc *msc = hid_get_drvdata(hdev);

hid_hw_stop(hdev);
- input_unregister_device(msc->input);
kfree(msc);
}

@@ -577,6 +531,7 @@ static struct hid_driver magicmouse_driver = {
.probe = magicmouse_probe,
.remove = magicmouse_remove,
.raw_event = magicmouse_raw_event,
+ .input_mapping = magicmouse_input_mapping,
};

static int __init magicmouse_init(void)

Signature · 1 line
1.7.2.2
#1 lore raw
Quoted 4 lines · Michael Poole

Let the HID core handle input device setup and HID-compliant reports. This driver then only has to worry about the non-standard reports.

Michael, do you need me to retest the patch? I haven't looked at this second version, but if it's pretty much as you describe below and you don't need me to test it again, then my ACK still stands.

Thanks,

-- Chase

Quoted 170 lines
---
 drivers/hid/hid-magicmouse.c |   81
+++++++++--------------------------------
 1 files changed, 18 insertions(+), 63 deletions(-)

This is a rebased and slightly revised version of an RFC patch I sent out a few weeks ago (which Chase later acked):
http://www.spinics.net/lists/linux-input/msg10948.html

The changes in v2 are to clarify the commit summary line and comments, and remove one if() that would pass if the device had any HID input descriptors. If/when someone adds support for a device that has none of those, the if() could be restored.

drivers/hid/hid-magicmouse.c +0 -7
index 8791a08..5e1907a 100644
@@ -279,13 +279,6 @@ static int magicmouse_raw_event(struct hid_device
 *hdev,
 	int x = 0, y = 0, ii, clicks = 0, npoints;
 
 	switch (data[0]) {
-	case 0x10:
-		if (size != 6)
-			return 0;
-		x = (__s16)(data[2] | data[3] << 8);
-		y = (__s16)(data[4] | data[5] << 8);
-		clicks = data[1];
-		break;
 	case TRACKPAD_REPORT_ID:
 		/* Expect four bytes of prefix, and N*9 bytes of touch data. */
drivers/hid/hid-magicmouse.c +0 -7
 		if (size < 4 || ((size - 4) % 9) != 0)
@@ -343,13 +336,6 @@ static int magicmouse_raw_event(struct hid_device
 *hdev,
 		magicmouse_raw_event(hdev, report, data + 2 + data[1],
 			size - 2 - data[1]);
 		break;
-	case 0x20: /* Theoretically battery status (0-100), but I have
-		    * never seen it -- maybe it is only upon request.
-		    */
-	case 0x60: /* Unknown, maybe laser on/off. */
-	case 0x61: /* Laser reflection status change.
-		    * data[1]: 0 = spotted, 1 = lost
-		    */
 	default:
 		return 0;
drivers/hid/hid-magicmouse.c +0 -28
 	}
@@ -377,36 +363,8 @@ static int magicmouse_raw_event(struct hid_device
 *hdev,
 	return 1;
 }
 
-static int magicmouse_input_open(struct input_dev *dev)
-{
-	struct hid_device *hid = input_get_drvdata(dev);
-
-	return hid->ll_driver->open(hid);
-}
-
-static void magicmouse_input_close(struct input_dev *dev)
-{
-	struct hid_device *hid = input_get_drvdata(dev);
-
-	hid->ll_driver->close(hid);
-}
-
 static void magicmouse_setup_input(struct input_dev *input, struct
 hid_device *hdev)
 {
-	input_set_drvdata(input, hdev);
-	input->event = hdev->ll_driver->hidinput_input_event;
-	input->open = magicmouse_input_open;
-	input->close = magicmouse_input_close;
-
-	input->name = hdev->name;
-	input->phys = hdev->phys;
-	input->uniq = hdev->uniq;
-	input->id.bustype = hdev->bus;
-	input->id.vendor = hdev->vendor;
-	input->id.product = hdev->product;
-	input->id.version = hdev->version;
-	input->dev.parent = hdev->dev.parent;
-
 	__set_bit(EV_KEY, input->evbit);
drivers/hid/hid-magicmouse.c +0 -0
 	if (input->id.product == USB_DEVICE_ID_APPLE_MAGICMOUSE) {
@@ -466,11 +424,22 @@ static void magicmouse_setup_input(struct

input_dev *input, struct hid_device *h

drivers/hid/hid-magicmouse.c +17 -3
 	}
 }
 
+static int magicmouse_input_mapping(struct hid_device *hdev,
+		struct hid_input *hi, struct hid_field *field,
+		struct hid_usage *usage, unsigned long **bit, int *max)
+{
+	struct magicmouse_sc *msc = hid_get_drvdata(hdev);
+
+	if (!msc->input)
+		msc->input = hi->input;
+
+	return 0;
+}
+
 static int magicmouse_probe(struct hid_device *hdev,
 	const struct hid_device_id *id)
 {
 	__u8 feature[] = { 0xd7, 0x01 };
-	struct input_dev *input;
 	struct magicmouse_sc *msc;
 	struct hid_report *report;
 	int ret;
@@ -500,8 +469,11 @@ static int magicmouse_probe(struct hid_device
 *hdev,
 		goto err_free;
 	}
 
-	/* we are handling the input ourselves */
-	hidinput_disconnect(hdev);
+	/* We do this after hid-input is done parsing reports so that
+	 * hid-input uses the most natural button and axis IDs.
+	 */
+	if (msc->input)
+		magicmouse_setup_input(msc->input, hdev);
 
 	if (id->product == USB_DEVICE_ID_APPLE_MAGICMOUSE)
drivers/hid/hid-magicmouse.c +0 -17
 		report = hid_register_report(hdev, HID_INPUT_REPORT,
@@ -528,24 +500,7 @@ static int magicmouse_probe(struct hid_device
 *hdev,
 		goto err_stop_hw;
 	}
 
-	input = input_allocate_device();
-	if (!input) {
-		dev_err(&hdev->dev, "can't alloc input device\n");
-		ret = -ENOMEM;
-		goto err_stop_hw;
-	}
-	magicmouse_setup_input(input, hdev);
-
-	ret = input_register_device(input);
-	if (ret) {
-		dev_err(&hdev->dev, "input device registration failed\n");
-		goto err_input;
-	}
-	msc->input = input;
-
 	return 0;
-err_input:
-	input_free_device(input);
 err_stop_hw:
 	hid_hw_stop(hdev);

err_free:

drivers/hid/hid-magicmouse.c +1 -1
@@ -558,7 +513,6 @@ static void magicmouse_remove(struct hid_device
 *hdev)
 	struct magicmouse_sc *msc = hid_get_drvdata(hdev);
 
 	hid_hw_stop(hdev);
-	input_unregister_device(msc->input);
 	kfree(msc);
 }
@@ -577,6 +531,7 @@ static struct hid_driver magicmouse_driver = {
 	.probe = magicmouse_probe,
 	.remove = magicmouse_remove,
 	.raw_event = magicmouse_raw_event,
+	.input_mapping = magicmouse_input_mapping,
 };
 
 static int __init magicmouse_init(void)
#2 lore raw
Quoted 6 lines · Chase Douglas
Quoted 4 lines · Michael Poole

Let the HID core handle input device setup and HID-compliant reports. This driver then only has to worry about the non-standard reports.

Quoted 7 lines

Michael, do you need me to retest the patch? I haven't looked at this second version, but if it's pretty much as you describe below and you don't need me to test it again, then my ACK still stands.

Thanks,

-- Chase

The behavior will be 100% identical for currently supported devices, so I don't see any real benefit in you re-testing it. I just didn't want to assume (without checking) that your ack was valid for the revised version.

Michael

Applied
#3 lore raw
In reply to Michael Poole
Quoted 2 lines · Michael Poole

Let the HID core handle input device setup and HID-compliant reports. This driver then only has to worry about the non-standard reports.

Applied, thanks.

BTW the patch has been line-wrapped. I have fixed it by hand, but please keep it in mind for future patch submissions. Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.