Changeset 1368a6b in mainline for uspace/drv/bus/usb/ohci/root_hub.h

Timestamp:

2011-07-11T14:10:27Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b7c2757

Parents:

5fd0dc23

Message:

OHCI: Root hub: Nice and clean initialization of descriptors.

Last malloc is out.

File:

• uspace/drv/bus/usb/ohci/root_hub.h (modified) (3 diffs)

uspace/drv/bus/usb/ohci/root_hub.h

@@ -41 +41 @@
 #include "batch.h"
 
-#define HUB_DESCRIPTOR_MAX_SIZE 11
+#define HUB_DESCRIPTOR_MAX_SIZE (7 + 2 + 2)
 #define INTERRUPT_BUFFER_MAX_SIZE 2
 
@@ -54 +54 @@
         /** hub port count */
         size_t port_count;
-        /** hubs descriptors */
-        usb_device_descriptors_t descriptors;
         /** interrupt transfer waiting for an actual interrupt to occur */
         usb_transfer_batch_t *unfinished_interrupt_transfer;
@@ -66 +64 @@
         /** size of interrupt buffer */
         size_t interrupt_mask_size;
-        /** instance`s descriptor*/
-        uint8_t hub_descriptor[HUB_DESCRIPTOR_MAX_SIZE];
+
+        /** Descriptors */
+        struct {
+                usb_standard_configuration_descriptor_t configuration;
+                usb_standard_interface_descriptor_t interface;
+                usb_standard_endpoint_descriptor_t endpoint;
+                uint8_t hub[HUB_DESCRIPTOR_MAX_SIZE];
+        } __attribute__ ((packed)) descriptors;
         /** size of hub descriptor */
-        size_t descriptor_size;
+        size_t hub_descriptor_size;
 
 } rh_t;