Changeset b01995b in mainline for uspace/drv/uhci-hcd/hc.h

Timestamp:

2011-03-21T23:42:08Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

11dd29b, 62f4212

Parents:

31b568e (diff), 87644b4 (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:

Fixes selecting a new USB address when max address has been reached.

Whitespace and code-style fixes, renames

File:

• uspace/drv/uhci-hcd/hc.h (moved) (moved from uspace/drv/uhci-hcd/uhci_hc.h ) (4 diffs)

uspace/drv/uhci-hcd/hc.h

@@ -82 +82 @@
 #define UHCI_ALLOWED_HW_FAIL 5
 
-typedef struct uhci_hc {
-        usb_device_keeper_t device_manager;
+typedef struct hc {
+        usb_device_keeper_t manager;
 
         regs_t *registers;
@@ -104 +104 @@
 
         ddf_fun_t *ddf_instance;
-} uhci_hc_t;
+} hc_t;
 
-int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun,
+int hc_init(hc_t *instance, ddf_fun_t *fun,
     void *regs, size_t reg_size, bool interupts);
 
-int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch);
+int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
 
-void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status);
+void hc_interrupt(hc_t *instance, uint16_t status);
 
 /** Safely dispose host controller internal structures
@@ -117 +117 @@
  * @param[in] instance Host controller structure to use.
  */
-static inline void uhci_hc_fini(uhci_hc_t *instance) { /* TODO: implement*/ };
+static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
 
 /** Get and cast pointer to the driver data
@@ -124 +124 @@
  * @return cast pointer to driver_data
  */
-static inline uhci_hc_t * fun_to_uhci_hc(ddf_fun_t *fun)
-        { return (uhci_hc_t*)fun->driver_data; }
+static inline hc_t * fun_to_hc(ddf_fun_t *fun)
+        { return (hc_t*)fun->driver_data; }
 #endif
 /**