Changeset 28f660d in mainline for uspace/drv/uhci/root_hub/root_hub.h

Timestamp:

2010-12-31T15:53:35Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

92f924c8

Parents:

2972e21

Message:

moved logic to port structure

File:

• uspace/drv/uhci/root_hub/root_hub.h (modified) (1 diff)

uspace/drv/uhci/root_hub/root_hub.h

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_TD_ROOT_HUB_H
-#define DRV_UHCI_TD_ROOT_HUB_H
+#ifndef DRV_UHCI_ROOT_HUB_H
+#define DRV_UHCI_ROOT_HUB_H
 
 #include <fibril.h>
 #include <driver.h>
 
+#include "port.h"
+
 #define UHCI_ROOT_HUB_PORT_COUNT 2
 #define UHCI_ROOT_HUB_PORT_REGISTERS_OFFSET 0x10
 
-typedef struct port_regs {
-        uint16_t portsc[UHCI_ROOT_HUB_PORT_COUNT];
-} port_regs_t;
-
 typedef struct root_hub {
-        port_regs_t *registers;
-        fid_t checker;
+        uhci_port_t ports[UHCI_ROOT_HUB_PORT_COUNT];
+        fid_t checker[UHCI_ROOT_HUB_PORT_COUNT];
 } uhci_root_hub_t;
 
 int uhci_root_hub_init(
-  uhci_root_hub_t *instance, device_t *device, void *addr );
+  uhci_root_hub_t *instance, device_t *device, void *addr);
 
-int uhci_root_hub_fini( uhci_root_hub_t* instance );
-
-//int uhci_root_hub_check_ports( void * device );
-
+int uhci_root_hub_fini(uhci_root_hub_t* instance);
 #endif
 /**