Changeset 361e61b in mainline for uspace/drv/uhci-hcd/uhci_rh.h

Timestamp:

2011-03-21T14:23:15Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

55e388a1

Parents:

c32688d (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 with development

File:

• uspace/drv/uhci-hcd/uhci_rh.h (moved) (moved from uspace/drv/uhci-rhd/port_status.h ) (3 diffs)

uspace/drv/uhci-hcd/uhci_rh.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jan Vesely
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+
+/** @addtogroup drvusbuhci
  * @{
  */
@@ -32 +33 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_TD_PORT_STATUS_H
-#define DRV_UHCI_TD_PORT_STATUS_H
+#ifndef DRV_UHCI_UHCI_RH_H
+#define DRV_UHCI_UHCI_RH_H
 
-#include <libarch/ddi.h> /* pio_read and pio_write */
+#include <ddf/driver.h>
+#include <ops/hw_res.h>
 
-#include <stdint.h>
+typedef struct uhci_rh {
+        hw_resource_list_t resource_list;
+        hw_resource_t io_regs;
+} uhci_rh_t;
 
-typedef uint16_t port_status_t;
+int uhci_rh_init(
+    uhci_rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size);
 
-#define STATUS_CONNECTED         (1 << 0)
-#define STATUS_CONNECTED_CHANGED (1 << 1)
-#define STATUS_ENABLED           (1 << 2)
-#define STATUS_ENABLED_CHANGED   (1 << 3)
-#define STATUS_LINE_D_PLUS       (1 << 4)
-#define STATUS_LINE_D_MINUS      (1 << 5)
-#define STATUS_RESUME            (1 << 6)
-#define STATUS_ALWAYS_ONE        (1 << 7)
-
-#define STATUS_LOW_SPEED (1 <<  8)
-#define STATUS_IN_RESET  (1 <<  9)
-#define STATUS_SUSPEND   (1 << 12)
-
-static inline port_status_t port_status_read(port_status_t * address)
-        { return pio_read_16(address); }
-
-static inline void port_status_write(
-  port_status_t *address, port_status_t value)
-        { pio_write_16(address, value); }
-
-void print_port_status(const port_status_t status);
 #endif
 /**