Changes in uspace/drv/uhci-rhd/port.h [f123909:0063838] in mainline

File:

• uspace/drv/uhci-rhd/port.h (modified) (3 diffs)

uspace/drv/uhci-rhd/port.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2010 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbuhcirh
+/** @addtogroup usb
  * @{
  */
 /** @file
- * @brief UHCI root hub port routines
+ * @brief UHCI port driver
  */
 #ifndef DRV_UHCI_PORT_H
 #define DRV_UHCI_PORT_H
 
+#include <assert.h>
+#include <ddf/driver.h>
 #include <stdint.h>
-#include <fibril.h>
-#include <ddf/driver.h>
-#include <usb/usbdevice.h> /* usb_hc_connection_t */
+#include <usb/usbdevice.h>
 
-typedef uint16_t port_status_t;
-#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)
+#include "port_status.h"
 
 typedef struct uhci_port
 {
-        char *id_string;
         port_status_t *address;
         unsigned number;
@@ -71 +58 @@
 
 void uhci_port_fini(uhci_port_t *port);
-
 #endif
 /**