Changeset e099f26 in mainline for uspace/drv/ohci/hc.h

Timestamp:

2011-03-21T20:22:50Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56c5b5b

Parents:

4fb6d9ee (diff), 31b568e (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:

Development branch changes (including OHCI)

File:

• uspace/drv/ohci/hc.h (moved) (moved from uspace/drv/uhci-hcd/utils/device_keeper.h ) (1 diff)

uspace/drv/ohci/hc.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup drvusbuhcihc
+/** @addtogroup drvusbohci
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * @brief OHCI host controller driver structure
  */
-#ifndef UTILS_DEVICE_KEEPER_H
-#define UTILS_DEVICE_KEEPER_H
-#include <devman.h>
+#ifndef DRV_OHCI_HC_H
+#define DRV_OHCI_HC_H
+
+#include <fibril.h>
 #include <fibril_synch.h>
+#include <adt/list.h>
+#include <ddi.h>
+
 #include <usb/usb.h>
+#include <usb/host/device_keeper.h>
+#include <usbhc_iface.h>
 
-#define USB_ADDRESS_COUNT (USB11_ADDRESS_MAX + 1)
+#include "batch.h"
+#include "ohci_regs.h"
+#include "root_hub.h"
 
-struct usb_device_info {
-        usb_speed_t speed;
-        bool occupied;
-        uint16_t toggle_status;
-        devman_handle_t handle;
-};
+typedef struct hc {
+        ohci_regs_t *registers;
+        usb_address_t rh_address;
+        rh_t rh;
+        ddf_fun_t *ddf_instance;
+        usb_device_keeper_t manager;
+        fid_t interrupt_emulator;
+} hc_t;
 
-typedef struct device_keeper {
-        struct usb_device_info devices[USB_ADDRESS_COUNT];
-        fibril_mutex_t guard;
-        fibril_condvar_t default_address_occupied;
-        usb_address_t last_address;
-} device_keeper_t;
+int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
+     uintptr_t regs, size_t reg_size, bool interrupts);
 
-void device_keeper_init(device_keeper_t *instance);
+int hc_register_hub(hc_t *instance);
 
-void device_keeper_reserve_default(
-    device_keeper_t *instance, usb_speed_t speed);
+int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
 
-void device_keeper_release_default(device_keeper_t *instance);
+void hc_interrupt(hc_t *instance, uint32_t status);
 
-void device_keeper_reset_if_need(
-    device_keeper_t *instance, usb_target_t target, const unsigned char *setup_data);
+/** Safely dispose host controller internal structures
+ *
+ * @param[in] instance Host controller structure to use.
+ */
+static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
 
-int device_keeper_get_toggle(device_keeper_t *instance, usb_target_t target);
-
-int device_keeper_set_toggle(
-    device_keeper_t *instance, usb_target_t target, bool toggle);
-
-usb_address_t device_keeper_request(
-    device_keeper_t *instance, usb_speed_t speed);
-
-void device_keeper_bind(
-    device_keeper_t *instance, usb_address_t address, devman_handle_t handle);
-
-void device_keeper_release(device_keeper_t *instance, usb_address_t address);
-
-usb_address_t device_keeper_find(
-    device_keeper_t *instance, devman_handle_t handle);
-
-usb_speed_t device_keeper_speed(
-    device_keeper_t *instance, usb_address_t address);
+/** Get and cast pointer to the driver data
+ *
+ * @param[in] fun DDF function pointer
+ * @return cast pointer to driver_data
+ */
+static inline hc_t * fun_to_hc(ddf_fun_t *fun)
+        { return (hc_t*)fun->driver_data; }
 #endif
 /**