Return-Path: Date: Wed, 3 Feb 2010 15:37:06 +0100 (CET) From: Jiri Kosina To: Marcel Holtmann Cc: Bastien Nocera , Michael Poole , "Gunn, Brian" , Ping , linux-kernel@vger.kernel.org, BlueZ development Subject: Re: [PATCH 1/3] HID: make raw reports possible for both feature and output reports In-Reply-To: <1265206478.31341.111.camel@localhost.localdomain> Message-ID: References: <1264783166.29532.5302.camel@localhost.localdomain> <87iqakifm8.fsf@troilus.org> <1264860663.29532.7887.camel@localhost.localdomain> <87bpg7glf7.fsf@troilus.org> <1265190440.32444.8417.camel@localhost.localdomain> <1265206478.31341.111.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII List-ID: 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 > > Signed-off-by: Jiri Kosina > > --- > > 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 > > > -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.