Re: [PATCH 1/2] Bluetooth: hidp: implement hidinput_input_event callback
From: David Herrmann <hidden>
Date: 2013-07-11 14:02:11
Also in:
linux-bluetooth, lkml
Hi On Thu, Jul 11, 2013 at 3:41 PM, Benjamin Tissoires [off-list ref] wrote:
quoted hunk ↗ jump to hunk
We can re-enable hidinput_input_event to allow the leds of bluetooth keyboards to be set. Now the callbacks uses hid core to retrieve the right HID report to send, so this version is safer. Signed-off-by: Benjamin Tissoires <redacted> --- net/bluetooth/hidp/core.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index f13a8da..9c8b50d 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c@@ -238,6 +238,31 @@ static int hidp_send_report(struct hidp_session *session, struct hid_report *rep return hidp_send_intr_message(session, hdr, buf, rsize); } +static int hidp_hidinput_event(struct input_dev *dev, unsigned int type, + unsigned int code, int value) +{ + struct hid_device *hid = input_get_drvdata(dev);
I dislike that we have to deal with input_get_drvdata() in a transport driver. It is not obvious from the transport driver that this gives us an hid_device. But ok, that's how we do it in usbhid and hid-input so it's another issue..
+ struct hidp_session *session = hid->driver_data;
+ struct hid_field *field;
+ int offset;
+
+ BT_DBG("session %p type %d code %d value %d",
+ session, type, code, value);
+
+ if (type != EV_LED)
+ return -1;
+
+ offset = hidinput_find_field(hid, type, code, &field);
+ if (offset == -1) {
+ hid_warn(dev, "event field not found\n");
+ return -1;
+ }
+
+ hid_set_field(field, offset, value);
+
+ return hidp_send_report(session, field->report);
+}
+We had this discussion before (regarding uhid and hidpinput_event), it would be nice to have a helper in hid-input.c which does this. We copy the code into every transport driver, which bugs me. But no-one stepped up to do this, so I am fine. Reviewed-by: David Herrmann <redacted> Thanks! David
quoted hunk ↗ jump to hunk
static int hidp_get_raw_report(struct hid_device *hid, unsigned char report_number, unsigned char *data, size_t count,@@ -711,6 +736,7 @@ static struct hid_ll_driver hidp_hid_driver = { .stop = hidp_stop, .open = hidp_open, .close = hidp_close, + .hidinput_input_event = hidp_hidinput_event, }; /* This function sets up the hid device. It does not add it --1.8.3.1