Changeset 8a951ca in mainline for uspace/drv/ohci/root_hub.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/root_hub.h (moved) (moved from uspace/drv/ohci/ohci_rh.h ) (2 diffs)

uspace/drv/ohci/root_hub.h

@@ -33 +33 @@
  * @brief OHCI driver
  */
-#ifndef DRV_OHCI_OHCI_RH_H
-#define DRV_OHCI_OHCI_RH_H
+#ifndef DRV_OHCI_ROOT_HUB_H
+#define DRV_OHCI_ROOT_HUB_H
 
 #include <usb/usb.h>
@@ -41 +41 @@
 #include "batch.h"
 
-typedef struct ohci_rh {
+typedef struct rh {
         ohci_regs_t *registers;
         usb_address_t address;
-} ohci_rh_t;
+        ddf_dev_t *device;
+} rh_t;
 
-int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs);
+int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs);
 
-void ohci_rh_request(ohci_rh_t *instance, batch_t *request);
+int rh_request(rh_t *instance, batch_t *request);
 
-void ohci_rh_interrupt(ohci_rh_t *instance);
+void rh_interrupt(rh_t *instance);
 #endif
 /**