Changeset 35f0899 in mainline

Timestamp:

2011-03-06T09:21:46Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b330cb1f

Parents:

6bb456c

Message:

Added missing class-specific requests + fixed Set_Report request.

• Added: Get_Report, Get_Protocol, Get_Idle
• Fixed Set_Report: value is counted in the function

Not tested yet.

Location:

uspace/drv/usbhid

Files:

• hidreq.c (modified) (3 diffs)
• hidreq.h (modified) (1 diff)
• kbddev.c (modified) (1 diff)

uspace/drv/usbhid/hidreq.c

@@ -69 +69 @@
                 return sess_rc;
         }
+        
+        uint16_t value = 0;
+        value |= (type << 8);
 
         usb_log_debug("Sending Set_Report request to the device.\n");
@@ -74 +77 @@
         rc = usb_control_request_set(&hid_dev->ctrl_pipe, 
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 
-            USB_HIDREQ_SET_REPORT, type, hid_dev->iface, buffer, buf_size);
+            USB_HIDREQ_SET_REPORT, value, hid_dev->iface, buffer, buf_size);
 
         sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
@@ -187 +190 @@
                 return sess_rc;
         }
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+int usbhid_req_get_report(usbhid_dev_t *hid_dev, usb_hid_report_type_t type, 
+    uint8_t *buffer, size_t buf_size, size_t *actual_size)
+{
+        if (hid_dev == NULL) {
+                usb_log_error("usbhid_req_set_report(): no HID device structure"
+                    " given.\n");
+                return EINVAL;
+        }
+        
+        /*
+         * No need for checking other parameters, as they are checked in
+         * the called function (usb_control_request_set()).
+         */
+        
+        int rc, sess_rc;
+        
+        sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+        if (sess_rc != EOK) {
+                usb_log_warning("Failed to start a session: %s.\n",
+                    str_error(sess_rc));
+                return sess_rc;
+        }
+
+        uint16_t value = 0;
+        value |= (type << 8);
+        
+        usb_log_debug("Sending Get_Report request to the device.\n");
+        
+        rc = usb_control_request_get(&hid_dev->ctrl_pipe, 
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 
+            USB_HIDREQ_GET_REPORT, value, hid_dev->iface, buffer, buf_size,
+            actual_size);
+
+        sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+
+        if (rc != EOK) {
+                usb_log_warning("Error sending output report to the keyboard: "
+                    "%s.\n", str_error(rc));
+                return rc;
+        }
+
+        if (sess_rc != EOK) {
+                usb_log_warning("Error closing session: %s.\n",
+                    str_error(sess_rc));
+                return sess_rc;
+        }
+        
+        return EOK;
+}
+
+int usbhid_req_get_protocol(usbhid_dev_t *hid_dev, usb_hid_protocol_t *protocol)
+{
+        if (hid_dev == NULL) {
+                usb_log_error("usbhid_req_set_protocol(): no HID device "
+                    "structure given.\n");
+                return EINVAL;
+        }
+        
+        /*
+         * No need for checking other parameters, as they are checked in
+         * the called function (usb_control_request_set()).
+         */
+        
+        int rc, sess_rc;
+        
+        sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+        if (sess_rc != EOK) {
+                usb_log_warning("Failed to start a session: %s.\n",
+                    str_error(sess_rc));
+                return sess_rc;
+        }
+
+        usb_log_debug("Sending Get_Protocol request to the device ("
+            "protocol: %d, iface: %d).\n", protocol, hid_dev->iface);
+        
+        uint8_t buffer[1];
+        size_t actual_size = 0;
+        
+        rc = usb_control_request_get(&hid_dev->ctrl_pipe, 
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 
+            USB_HIDREQ_GET_PROTOCOL, 0, hid_dev->iface, buffer, 1, &actual_size);
+
+        sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+
+        if (rc != EOK) {
+                usb_log_warning("Error sending output report to the keyboard: "
+                    "%s.\n", str_error(rc));
+                return rc;
+        }
+
+        if (sess_rc != EOK) {
+                usb_log_warning("Error closing session: %s.\n",
+                    str_error(sess_rc));
+                return sess_rc;
+        }
+        
+        if (actual_size != 1) {
+                usb_log_warning("Wrong data size: %zu, expected: 1.\n",
+                        actual_size);
+                return ELIMIT;
+        }
+        
+        *protocol = buffer[0];
+        
+        return EOK;
+}
+
+int usbhid_req_get_idle(usbhid_dev_t *hid_dev, uint8_t *duration)
+{
+        if (hid_dev == NULL) {
+                usb_log_error("usbhid_req_set_idle(): no HID device "
+                    "structure given.\n");
+                return EINVAL;
+        }
+        
+        /*
+         * No need for checking other parameters, as they are checked in
+         * the called function (usb_control_request_set()).
+         */
+        
+        int rc, sess_rc;
+        
+        sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+        if (sess_rc != EOK) {
+                usb_log_warning("Failed to start a session: %s.\n",
+                    str_error(sess_rc));
+                return sess_rc;
+        }
+
+        usb_log_debug("Sending Get_Idle request to the device ("
+            "duration: %u, iface: %d).\n", duration, hid_dev->iface);
+        
+        uint16_t value = 0;
+        uint8_t buffer[1];
+        size_t actual_size = 0;
+        
+        rc = usb_control_request_get(&hid_dev->ctrl_pipe, 
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 
+            USB_HIDREQ_GET_IDLE, value, hid_dev->iface, buffer, 1, 
+            &actual_size);
+
+        sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+
+        if (rc != EOK) {
+                usb_log_warning("Error sending output report to the keyboard: "
+                    "%s.\n", str_error(rc));
+                return rc;
+        }
+
+        if (sess_rc != EOK) {
+                usb_log_warning("Error closing session: %s.\n",
+                    str_error(sess_rc));
+                return sess_rc;
+        }
+        
+        if (actual_size != 1) {
+                usb_log_warning("Wrong data size: %zu, expected: 1.\n",
+                        actual_size);
+                return ELIMIT;
+        }
+        
+        *duration = buffer[0];
         
         return EOK;

uspace/drv/usbhid/hidreq.h

@@ -52 +52 @@
 int usbhid_req_set_idle(usbhid_dev_t *hid_dev, uint8_t duration);
 
+int usbhid_req_get_report(usbhid_dev_t *hid_dev, usb_hid_report_type_t type, 
+    uint8_t *buffer, size_t buf_size, size_t *actual_size);
+
+int usbhid_req_get_protocol(usbhid_dev_t *hid_dev, usb_hid_protocol_t *protocol);
+
+int usbhid_req_get_idle(usbhid_dev_t *hid_dev, uint8_t *duration);
+
 /*----------------------------------------------------------------------------*/
 

uspace/drv/usbhid/kbddev.c

@@ -181 +181 @@
             usb_debug_str_buffer(buffer, BOOTP_BUFFER_OUT_SIZE, 0));
         
-        uint16_t value = 0;
-        value |= (USB_HID_REPORT_TYPE_OUTPUT << 8);
-
         assert(kbd_dev->hid_dev != NULL);
         assert(kbd_dev->hid_dev->initialized);
-        usbhid_req_set_report(kbd_dev->hid_dev, value, buffer, 
-            BOOTP_BUFFER_OUT_SIZE);
+        usbhid_req_set_report(kbd_dev->hid_dev, USB_HID_REPORT_TYPE_OUTPUT, 
+            buffer, BOOTP_BUFFER_OUT_SIZE);
 }