Merge branch 'for-3.15/ll-driver-new-callbacks' into for-linus

2 files changed, 105 insertions, 0 deletions

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index cedc6da93c19..f5a2b1931143 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -244,12 +244,39 @@ static int uhid_hid_output_raw(struct hid_device *hid, __u8 *buf, size_t count,
         return count;
 }
 
+static int uhid_hid_output_report(struct hid_device *hid, __u8 *buf,
+                                  size_t count)
+{
+        struct uhid_device *uhid = hid->driver_data;
+        unsigned long flags;
+        struct uhid_event *ev;
+
+        if (count < 1 || count > UHID_DATA_MAX)
+                return -EINVAL;
+
+        ev = kzalloc(sizeof(*ev), GFP_KERNEL);
+        if (!ev)
+                return -ENOMEM;
+
+        ev->type = UHID_OUTPUT;
+        ev->u.output.size = count;
+        ev->u.output.rtype = UHID_OUTPUT_REPORT;
+        memcpy(ev->u.output.data, buf, count);
+
+        spin_lock_irqsave(&uhid->qlock, flags);
+        uhid_queue(uhid, ev);
+        spin_unlock_irqrestore(&uhid->qlock, flags);
+
+        return count;
+}
+
 static struct hid_ll_driver uhid_hid_driver = {
         .start = uhid_hid_start,
         .stop = uhid_hid_stop,
         .open = uhid_hid_open,
         .close = uhid_hid_close,
         .parse = uhid_hid_parse,
+        .output_report = uhid_hid_output_report,
 };
 
 #ifdef CONFIG_COMPAT
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 44df131d390a..f8ca312bae1b 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -884,6 +884,38 @@ static int usbhid_get_raw_report(struct hid_device *hid,
         return ret;
 }
 
+static int usbhid_set_raw_report(struct hid_device *hid, unsigned int reportnum,
+                                 __u8 *buf, size_t count, unsigned char rtype)
+{
+        struct usbhid_device *usbhid = hid->driver_data;
+        struct usb_device *dev = hid_to_usb_dev(hid);
+        struct usb_interface *intf = usbhid->intf;
+        struct usb_host_interface *interface = intf->cur_altsetting;
+        int ret, skipped_report_id = 0;
+
+        /* Byte 0 is the report number. Report data starts at byte 1.*/
+        buf[0] = reportnum;
+        if (buf[0] == 0x0) {
+                /* Don't send the Report ID */
+                buf++;
+                count--;
+                skipped_report_id = 1;
+        }
+
+        ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+                        HID_REQ_SET_REPORT,
+                        USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
+                        ((rtype + 1) << 8) | reportnum,
+                        interface->desc.bInterfaceNumber, buf, count,
+                        USB_CTRL_SET_TIMEOUT);
+        /* count also the report id, if this was a numbered report. */
+        if (ret > 0 && skipped_report_id)
+                ret++;
+
+        return ret;
+}
+
+
 static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count,
                 unsigned char report_type)
 {
@@ -936,6 +968,36 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
         return ret;
 }
 
+static int usbhid_output_report(struct hid_device *hid, __u8 *buf, size_t count)
+{
+        struct usbhid_device *usbhid = hid->driver_data;
+        struct usb_device *dev = hid_to_usb_dev(hid);
+        int actual_length, skipped_report_id = 0, ret;
+
+        if (!usbhid->urbout)
+                return -EIO;
+
+        if (buf[0] == 0x0) {
+                /* Don't send the Report ID */
+                buf++;
+                count--;
+                skipped_report_id = 1;
+        }
+
+        ret = usb_interrupt_msg(dev, usbhid->urbout->pipe,
+                                buf, count, &actual_length,
+                                USB_CTRL_SET_TIMEOUT);
+        /* return the number of bytes transferred */
+        if (ret == 0) {
+                ret = actual_length;
+                /* count also the report id */
+                if (skipped_report_id)
+                        ret++;
+        }
+
+        return ret;
+}
+
 static void usbhid_restart_queues(struct usbhid_device *usbhid)
 {
         if (usbhid->urbout && !test_bit(HID_OUT_RUNNING, &usbhid->iofl))
@@ -1200,6 +1262,20 @@ static void usbhid_request(struct hid_device *hid, struct hid_report *rep, int r
         }
 }
 
+static int usbhid_raw_request(struct hid_device *hid, unsigned char reportnum,
+                              __u8 *buf, size_t len, unsigned char rtype,
+                              int reqtype)
+{
+        switch (reqtype) {
+        case HID_REQ_GET_REPORT:
+                return usbhid_get_raw_report(hid, reportnum, buf, len, rtype);
+        case HID_REQ_SET_REPORT:
+                return usbhid_set_raw_report(hid, reportnum, buf, len, rtype);
+        default:
+                return -EIO;
+        }
+}
+
 static int usbhid_idle(struct hid_device *hid, int report, int idle,
                 int reqtype)
 {
@@ -1223,6 +1299,8 @@ static struct hid_ll_driver usb_hid_driver = {
         .power = usbhid_power,
         .request = usbhid_request,
         .wait = usbhid_wait_io,
+        .raw_request = usbhid_raw_request,
+        .output_report = usbhid_output_report,
         .idle = usbhid_idle,
 };