lkml.org 
[lkml]   [2010]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v4 2/2] Bluetooth: hidp: Add support for hidraw HIDIOCGFEATURE and HIDIOCSFEATURE
    Hi Alan,

    One comment.

    On Mon, Aug 16, 2010 at 10:20:59PM +0200, ext Alan Ott wrote:
    > This patch adds support or getting and setting feature reports for bluetooth
    > HID devices from HIDRAW.
    >
    > Signed-off-by: Alan Ott <alan@signal11.us>
    > ---
    > net/bluetooth/hidp/core.c | 114 +++++++++++++++++++++++++++++++++++++++++++--
    > net/bluetooth/hidp/hidp.h | 8 +++
    > 2 files changed, 118 insertions(+), 4 deletions(-)
    >
    > diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
    > index bfe641b..0e4880e 100644
    > --- a/net/bluetooth/hidp/core.c
    > +++ b/net/bluetooth/hidp/core.c
    > @@ -36,6 +36,7 @@
    > #include <linux/file.h>
    > #include <linux/init.h>
    > #include <linux/wait.h>
    > +#include <linux/mutex.h>
    > #include <net/sock.h>
    >
    > #include <linux/input.h>
    > @@ -313,6 +314,86 @@ static int hidp_send_report(struct hidp_session *session, struct hid_report *rep
    > return hidp_queue_report(session, buf, rsize);
    > }
    >
    > +static int hidp_get_raw_report(struct hid_device *hid,
    > + unsigned char report_number,
    > + unsigned char *data, size_t count,
    > + unsigned char report_type)
    > +{
    > + struct hidp_session *session = hid->driver_data;
    > + struct sk_buff *skb;
    > + size_t len;
    > + int numbered_reports = hid->report_enum[report_type].numbered;
    > +
    > + switch (report_type) {
    > + case HID_FEATURE_REPORT:
    > + report_type = HIDP_TRANS_GET_REPORT | HIDP_DATA_RTYPE_FEATURE;
    > + break;
    > + case HID_INPUT_REPORT:
    > + report_type = HIDP_TRANS_GET_REPORT | HIDP_DATA_RTYPE_INPUT;
    > + break;
    > + case HID_OUTPUT_REPORT:
    > + report_type = HIDP_TRANS_GET_REPORT | HIDP_DATA_RTYPE_OUPUT;
    > + break;
    > + default:
    > + return -EINVAL;
    > + }
    > +
    > + if (mutex_lock_interruptible(&session->report_mutex))
    > + return -ERESTARTSYS;
    > +
    > + /* Set up our wait, and send the report request to the device. */
    > + session->waiting_report_type = report_type & HIDP_DATA_RTYPE_MASK;
    > + session->waiting_report_number = numbered_reports ? report_number : -1;
    > + set_bit(HIDP_WAITING_FOR_RETURN, &session->flags);
    > + data[0] = report_number;
    > + if (hidp_send_ctrl_message(hid->driver_data, report_type, data, 1))
    > + goto err_eio;
    > +
    > + /* Wait for the return of the report. The returned report
    > + gets put in session->report_return. */
    > + while (test_bit(HIDP_WAITING_FOR_RETURN, &session->flags)) {
    > + int res;
    > +
    > + res = wait_event_interruptible_timeout(session->report_queue,
    > + !test_bit(HIDP_WAITING_FOR_RETURN, &session->flags),
    > + 5*HZ);
    > + if (res == 0) {
    > + /* timeout */
    > + goto err_eio;
    > + }
    > + if (res < 0) {
    > + /* signal */
    > + goto err_restartsys;
    > + }
    > + }
    > +
    > + skb = session->report_return;
    > + if (skb) {
    > + len = skb->len < count ? skb->len : count;
    > + memcpy(data, skb->data, len);
    > +
    > + kfree_skb(skb);
    > + session->report_return = NULL;
    > + } else {
    > + /* Device returned a HANDSHAKE, indicating protocol error. */
    > + len = -EIO;
    > + }
    > +
    > + clear_bit(HIDP_WAITING_FOR_RETURN, &session->flags);
    > + mutex_unlock(&session->report_mutex);
    > +
    > + return len;
    > +
    > +err_restartsys:
    > + clear_bit(HIDP_WAITING_FOR_RETURN, &session->flags);
    > + mutex_unlock(&session->report_mutex);
    > + return -ERESTARTSYS;
    > +err_eio:
    > + clear_bit(HIDP_WAITING_FOR_RETURN, &session->flags);
    > + mutex_unlock(&session->report_mutex);
    > + return -EIO;
    > +}

    How about a variable called ret and using that to return len or errno? It
    would eliminate code dublication.

    --
    Ville


    \
     
     \ /
      Last update: 2010-09-27 20:09    [W:0.028 / U:0.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site