Changeset e1dbcbc in mainline for uspace/drv/ohci/root_hub.h

Timestamp:

2011-04-29T13:43:01Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/drv/ohci/root_hub.h (modified) (1 diff)

uspace/drv/ohci/root_hub.h

@@ -50 +50 @@
         /** usb address of the root hub */
         usb_address_t address;
-        /** ddf device information */
-        ddf_dev_t *device;
         /** hub port count */
         int 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;
+        /** pre-allocated interrupt mask
+         *
+         * This is allocated when initializing instance, so that memory
+         * allocation is not needed when processing request. Buffer is used for
+         * interrupt bitmask.
+         */
+        uint8_t * interrupt_buffer;
+        /** size of interrupt buffer */
+        size_t interrupt_mask_size;
+        /** instance`s descriptor*/
+        uint8_t * hub_descriptor;
+        /** size of hub descriptor */
+        size_t descriptor_size;
+
+
 } rh_t;
 
-int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs);
+int rh_init(rh_t *instance, ohci_regs_t *regs);
 
 int rh_request(rh_t *instance, usb_transfer_batch_t *request);