Changeset 8a951ca in mainline for uspace/drv/ohci/hc.h

Timestamp:

2011-03-21T13:47:30Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a372663

Parents:

f8e1a2c (diff), 48fe0c9 (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/hc.h (moved) (moved from uspace/drv/ohci/ohci_hc.h ) (5 diffs)

uspace/drv/ohci/hc.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup drvusbohcihc
+/** @addtogroup drvusbohci
  * @{
  */
@@ -33 +32 @@
  * @brief OHCI host controller driver structure
  */
-#ifndef DRV_OHCI_OHCI_HC_H
-#define DRV_OHCI_OHCI_HC_H
+#ifndef DRV_OHCI_HC_H
+#define DRV_OHCI_HC_H
 
 #include <fibril.h>
@@ -42 +41 @@
 
 #include <usb/usb.h>
+#include <usb/host/device_keeper.h>
 #include <usbhc_iface.h>
 
 #include "batch.h"
 #include "ohci_regs.h"
-#include "ohci_rh.h"
+#include "root_hub.h"
 
-typedef struct ohci_hc {
+typedef struct hc {
         ohci_regs_t *registers;
         usb_address_t rh_address;
-        ohci_rh_t rh;
+        rh_t rh;
         ddf_fun_t *ddf_instance;
-} ohci_hc_t;
+        device_keeper_t manager;
+} hc_t;
 
-int ohci_hc_init(ohci_hc_t *instance, ddf_fun_t *fun,
+int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
      uintptr_t regs, size_t reg_size, bool interrupts);
 
-int ohci_hc_schedule(ohci_hc_t *instance, batch_t *batch);
+int hc_register_hub(hc_t *instance);
 
-void ohci_hc_interrupt(ohci_hc_t *instance, uint16_t status);
+int hc_schedule(hc_t *instance, batch_t *batch);
+
+void hc_interrupt(hc_t *instance, uint16_t status);
 
 /** Safely dispose host controller internal structures
@@ -66 +69 @@
  * @param[in] instance Host controller structure to use.
  */
-static inline void ohci_hc_fini(ohci_hc_t *instance) { /* TODO: implement*/ };
+static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
 
 /** Get and cast pointer to the driver data
@@ -73 +76 @@
  * @return cast pointer to driver_data
  */
-static inline ohci_hc_t * fun_to_ohci_hc(ddf_fun_t *fun)
-        { return (ohci_hc_t*)fun->driver_data; }
+static inline hc_t * fun_to_hc(ddf_fun_t *fun)
+        { return (hc_t*)fun->driver_data; }
 #endif
 /**