Changeset 2ef036a in mainline for uspace/drv/uhci-rhd/port.h

Timestamp:

2011-03-14T22:51:09Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2180979

Parents:

7ffe82f (diff), fcf07e6 (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/uhci-rhd/port.h (modified) (3 diffs)

uspace/drv/uhci-rhd/port.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 drvusbuhcirh
  * @{
  */
 /** @file
- * @brief UHCI port driver
+ * @brief UHCI root hub port routines
  */
 #ifndef DRV_UHCI_PORT_H
 #define DRV_UHCI_PORT_H
 
-#include <assert.h>
 #include <stdint.h>
+#include <fibril.h>
 #include <ddf/driver.h>
-#include <libarch/ddi.h> /* pio_read and pio_write */
-#include <usb/usbdevice.h>
+#include <usb/usbdevice.h> /* usb_hc_connection_t */
 
 typedef uint16_t port_status_t;
-
 #define STATUS_CONNECTED         (1 << 0)
 #define STATUS_CONNECTED_CHANGED (1 << 1)
@@ -74 +72 @@
 void uhci_port_fini(uhci_port_t *port);
 
-static inline port_status_t uhci_port_read_status(uhci_port_t *port)
-{
-        assert(port);
-        return pio_read_16(port->address);
-}
-
-static inline void uhci_port_write_status(
-    uhci_port_t *port, port_status_t value)
-{
-        assert(port);
-        pio_write_16(port->address, value);
-}
-
-static inline void uhci_port_print_status(
-    uhci_port_t *port, const port_status_t value)
-{
-        assert(port);
-        usb_log_debug2("%s Port status(%#x):%s%s%s%s%s%s%s%s%s%s%s.\n",
-            port->id_string, value,
-            (value & STATUS_SUSPEND) ? " SUSPENDED," : "",
-            (value & STATUS_RESUME) ? " IN RESUME," : "",
-            (value & STATUS_IN_RESET) ? " IN RESET," : "",
-            (value & STATUS_LINE_D_MINUS) ? " VD-," : "",
-            (value & STATUS_LINE_D_PLUS) ? " VD+," : "",
-            (value & STATUS_LOW_SPEED) ? " LOWSPEED," : "",
-            (value & STATUS_ENABLED_CHANGED) ? " ENABLED-CHANGE," : "",
-            (value & STATUS_ENABLED) ? " ENABLED," : "",
-            (value & STATUS_CONNECTED_CHANGED) ? " CONNECTED-CHANGE," : "",
-            (value & STATUS_CONNECTED) ? " CONNECTED," : "",
-            (value & STATUS_ALWAYS_ONE) ? " ALWAYS ONE" : " ERROR: NO ALWAYS ONE"
-        );
-}
 #endif
 /**