Changeset 062b25f in mainline for uspace/drv/bus/usb/ohci/root_hub.h

Timestamp:

2011-07-11T11:27:57Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

01bbbb2

Parents:

c85804f

Message:

OHCI: Root hub: Get rid of allocation in hub descriptor creation.

Still one more to go.
Add some asserts.

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 INTERRUPT_BUFFER_MAX_SIZE 2
+
 /**
  * ohci root hub representation
@@ -54 +57 @@
         usb_device_descriptors_t descriptors;
         /** interrupt transfer waiting for an actual interrupt to occur */
-        usb_transfer_batch_t * unfinished_interrupt_transfer;
+        usb_transfer_batch_t *unfinished_interrupt_transfer;
         /** Interrupt mask of changes
          *
@@ -60 +63 @@
          * gives max 2 bytes.
          */
-        uint8_t interrupt_buffer[2];
+        uint8_t interrupt_buffer[INTERRUPT_BUFFER_MAX_SIZE];
         /** size of interrupt buffer */
         size_t interrupt_mask_size;
         /** instance`s descriptor*/
-        uint8_t * hub_descriptor;
+        uint8_t hub_descriptor[HUB_DESCRIPTOR_MAX_SIZE];
         /** size of hub descriptor */
         size_t descriptor_size;
-
 
 } rh_t;