Changeset 243cb86 in mainline for uspace/lib/usb/include/usb/hcdhubd.h

Timestamp:

2010-12-12T10:50:19Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8365533

Parents:

101ef25c (diff), ebb98c5 (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 from development + several changes to hid driver.

Changes to hid driver:

• copied some code to usbkbd_get_descriptors() function
• base structure for hid descriptor and report parser (files uspace/lib/usb/include/usb/classes/hidparser.h

and uspace/lib/usb/src/hidparser.c)

File:

• uspace/lib/usb/include/usb/hcdhubd.h (modified) (4 diffs)

uspace/lib/usb/include/usb/hcdhubd.h

@@ -116 +116 @@
 } usb_hcd_transfer_ops_t;
 
+/**
+ * @brief structure holding information about free and used addresses
+ *
+ * This structure should not be used outside usb hcd driver.
+ * You better consider it to be 'private'.
+ */
+typedef struct {
+        /** lower bound included in the interval */
+        usb_address_t lower_bound;
+
+        /** upper bound, excluded from the interval */
+        usb_address_t upper_bound;
+
+        /** */
+        link_t link;
+}usb_address_list_t;
+
 struct usb_hc_device {
         /** Transfer operations. */
@@ -131 +148 @@
         /** List of hubs operating from this HC. */
         link_t hubs;
+
+        /** Structure with free and used addresses */
+        link_t addresses;
 
         /** Link to other driven HCs. */
@@ -146 +166 @@
 
 int usb_hcd_main(usb_hc_driver_t *);
-int usb_hcd_add_root_hub(usb_hc_device_t *dev);
+int usb_hcd_add_root_hub(device_t *dev);
+
+/**
+ * find first not yet used address on this host controller and use it
+ * @param this_hcd
+ * @return number in the range of allowed usb addresses or
+ *     a negative number if not succesful
+ */
+usb_address_t usb_use_free_address(usb_hc_device_t * this_hcd);
+
+/**
+ * @brief free the address in the address space of this hcd.
+ *
+ * if address is not used, nothing happens
+ * @param this_hcd
+ * @param addr
+ */
+void usb_free_used_address(usb_hc_device_t * this_hcd, usb_address_t addr );
 
 
@@ -154 +191 @@
  */
 
+device_t *usb_hc_connect(device_t *);
 
 int usb_hc_async_interrupt_out(usb_hc_device_t *, usb_target_t,