Changeset ad4562c2 in mainline

Timestamp:

2011-02-26T23:48:57Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

882f8b1

Parents:

3a1aa20

Message:

Changed API for getting descriptors.

• Changed usb_request_get_descriptor() and usb_request_get_descriptor_alloc().
• Added parameter recipient, specifying if the descriptor is associated with device, interface, endpoint or other.
• Modified all calls to it accordingly.

TODO: not done in usbhid driver yet, but should not be used now.

Location:

uspace

Files:

• drv/usbhub/usbhub.c (modified) (1 diff)
• lib/usb/include/usb/request.h (modified) (1 diff)
• lib/usb/src/hidparser.c (modified) (1 diff)
• lib/usb/src/request.c (modified) (11 diffs)

uspace/drv/usbhub/usbhub.c

@@ -253 +253 @@
         usb_endpoint_pipe_start_session(&result->endpoints.control);
         opResult = usb_request_get_descriptor(&result->endpoints.control,
-                        USB_REQUEST_TYPE_CLASS,
-                        USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
+                        USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
+                        USB_DESCTYPE_HUB,
+                        0, 0, serialized_descriptor,
                         USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
         usb_endpoint_pipe_end_session(&result->endpoints.control);

uspace/lib/usb/include/usb/request.h

@@ -96 +96 @@
 int usb_request_set_address(usb_endpoint_pipe_t *, usb_address_t);
 int usb_request_get_descriptor(usb_endpoint_pipe_t *, usb_request_type_t,
-    uint8_t, uint8_t, uint16_t, void *, size_t, size_t *);
+    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t, 
+    size_t *);
 int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t *, usb_request_type_t,
-    uint8_t, uint8_t, uint16_t, void **, size_t *);
+    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void **, size_t *);
 int usb_request_get_device_descriptor(usb_endpoint_pipe_t *,
     usb_standard_device_descriptor_t *);

uspace/lib/usb/src/hidparser.c

@@ -144 +144 @@
 int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size)
 {
-        if(size < 2){
+        if (size < 1){
                 return -1;
         }
 
-        data[1] = leds;
+        data[0] = leds;
         return EOK;
 }

uspace/lib/usb/src/request.c

@@ -36 +36 @@
 #include <errno.h>
 #include <assert.h>
+#include <usb/debug.h>
 
 #define MAX_DATA_LENGTH ((size_t)(0xFFFF))
@@ -209 +210 @@
  */
 int usb_request_get_descriptor(usb_endpoint_pipe_t *pipe,
-    usb_request_type_t request_type,
+    usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
     uint16_t language,
@@ -224 +225 @@
 
         return usb_control_request_get(pipe,
-            request_type, USB_REQUEST_RECIPIENT_DEVICE,
+            request_type, recipient,
             USB_DEVREQ_GET_DESCRIPTOR,
             wValue, language,
@@ -242 +243 @@
  */
 int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t * pipe,
-    usb_request_type_t request_type,
+    usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
     uint16_t language,
@@ -258 +259 @@
         uint8_t tmp_buffer[1];
         size_t bytes_transfered;
-        rc = usb_request_get_descriptor(pipe, request_type,
+        rc = usb_request_get_descriptor(pipe, request_type, recipient,
             descriptor_type, descriptor_index, language,
             &tmp_buffer, 1, &bytes_transfered);
@@ -283 +284 @@
         }
 
-        rc = usb_request_get_descriptor(pipe, request_type,
+        rc = usb_request_get_descriptor(pipe, request_type, recipient,
             descriptor_type, descriptor_index, language,
             buffer, size, &bytes_transfered);
@@ -320 +321 @@
         usb_standard_device_descriptor_t descriptor_tmp;
         int rc = usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_DEVICE,
-            0, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE, 
+            USB_DESCTYPE_DEVICE, 0, 0,
             &descriptor_tmp, sizeof(descriptor_tmp),
             &actually_transferred);
@@ -366 +367 @@
         usb_standard_configuration_descriptor_t descriptor_tmp;
         int rc = usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_CONFIGURATION,
-            index, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
+            USB_DESCTYPE_CONFIGURATION, index, 0,
             &descriptor_tmp, sizeof(descriptor_tmp),
             &actually_transferred);
@@ -406 +407 @@
 
         return usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_CONFIGURATION,
-            index, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
+            USB_DESCTYPE_CONFIGURATION, index, 0,
             descriptor, descriptor_size, actual_size);
 }
@@ -452 +453 @@
         size_t string_descriptor_size = 0;
         rc = usb_request_get_descriptor_alloc(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_STRING, 0, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
+            USB_DESCTYPE_STRING, 0, 0,
             (void **) &string_descriptor, &string_descriptor_size);
         if (rc != EOK) {
@@ -531 +533 @@
         size_t string_size;
         rc = usb_request_get_descriptor_alloc(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_STRING,
-            index, uint16_host2usb(lang),
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
+            USB_DESCTYPE_STRING, index, uint16_host2usb(lang),
             (void **) &string, &string_size);
         if (rc != EOK) {