Changeset 49f2f29 in mainline

Timestamp:

2013-02-08T20:47:19Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

86a01cc

Parents:

c5f4e6a

Message:

libusbvirt: Drop port_count param.

Use library provided macro to compute additional space.

Location:

uspace

Files:

• drv/bus/usb/uhci/uhci_rh.c (modified) (3 diffs)
• lib/usbvirt/include/usbvirt/virthub_base.h (modified) (1 diff)
• lib/usbvirt/src/virthub_base.c (modified) (3 diffs)

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -30 +30 @@
 #include <macros.h>
 #include <usb/debug.h>
+#include <usb/classes/hub.h>
 #include <ddi.h>
 
@@ -36 +37 @@
 enum {
         UHCI_RH_PORT_COUNT = 2,
-        /* 1 byte for hub status bit and 2 port status bits */
-        UHCI_PORT_BYTES = (1 + UHCI_RH_PORT_COUNT + 7) / 8,
+        UHCI_PORT_BYTES = STATUS_BYTES(UHCI_RH_PORT_COUNT),
 };
 
@@ -78 +78 @@
         instance->reset_changed[1] = false;
         return virthub_base_init(&instance->base, name, &ops, instance,
-            NULL, &hub_descriptor.header, HUB_STATUS_CHANGE_PIPE, 2);
+            NULL, &hub_descriptor.header, HUB_STATUS_CHANGE_PIPE);
 }
 

uspace/lib/usbvirt/include/usbvirt/virthub_base.h

@@ -59 +59 @@
     const char *name, usbvirt_device_ops_t *ops, void *data,
     const usb_standard_device_descriptor_t *device_desc,
-    const usb_hub_descriptor_header_t *hub_desc,
-    usb_endpoint_t ep, unsigned port_count);
+    const usb_hub_descriptor_header_t *hub_desc, usb_endpoint_t ep);
 
 usb_address_t virthub_base_get_address(virthub_base_t *instance);

uspace/lib/usbvirt/src/virthub_base.c

@@ -37 +37 @@
 #include <macros.h>
 #include <str.h>
+#include <usb/classes/hub.h>
 
 #include "virthub_base.h"
@@ -56 +57 @@
     usbvirt_device_ops_t *ops, void *data,
     const usb_standard_device_descriptor_t *device_desc,
-    const usb_hub_descriptor_header_t *hub_desc,
-    usb_endpoint_t ep, unsigned port_count)
+    const usb_hub_descriptor_header_t *hub_desc, usb_endpoint_t ep)
 {
         assert(instance);
         assert(hub_desc);
         assert(name);
-        
+
         if (!usb_endpoint_is_valid(ep) || (ep == USB_ENDPOINT_DEFAULT_CONTROL))
                 return EINVAL;
@@ -73 +73 @@
         instance->endpoint_descriptor.endpoint_address = 128 | ep;
         instance->endpoint_descriptor.max_packet_size =
-            (1 + port_count + 7) / 8;
+            STATUS_BYTES(hub_desc->port_count);
 
         instance->descriptors.device =