On Wed, 3 Feb 2010, Marcel Holtmann wrote:
> > In commit 2da31939a42 ("Bluetooth: Implement raw output support for HIDP
> > layer"), support for Bluetooth hid_output_raw_report was added, but it
> > pushes the data to the intr socket instead of the ctrl one. This has been
> > fixed by 6bf8268f9a91f1 ("Bluetooth: Use the control channel for raw HID reports")
> >
> > Still, it is necessary to distinguish whether the report in question should be
> > either FEATURE or OUTPUT. For this, we have to extend the generic HID API,
> > so that hid_output_raw_report() callback provides means to specify this
> > value so that it can be passed down to lower level hardware drivers (currently
> > Bluetooth and USB).
> >
> > Based on original patch by Bastien Nocera <hadess@xxxxxxxxxx>
> > Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
> > ---
> > drivers/hid/hidraw.c | 2 +-
> > drivers/hid/usbhid/hid-core.c | 5 +++--
> > include/linux/hid.h | 2 +-
> > net/bluetooth/hidp/core.c | 13 ++++++++++---
> > 4 files changed, 15 insertions(+), 7 deletions(-)
>
> Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
>
> > -static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count)
> > +static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
> > + unsigned char report_type)
> > {
> > - if (hidp_send_ctrl_message(hid->driver_data,
> > - HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE,
> > + if (report_type == HID_FEATURE_REPORT)
> > + report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE;
> > + else if (report_type == HID_OUTPUT_REPORT)
> > + report_type = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT;
> > + else
> > + return -EINVAL;
>
> If you wanna be a little bit more readable, then using a switch
> statement helps instead of else if. Just my 2 cents.
I have converted this to switch, added your Acked-by and queued in my
tree.
Thanks Marcel.
--
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
