Changeset 1256a0a in mainline for uspace/drv/uhci-rhd

Timestamp:

2011-02-01T00:08:46Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

993a1e1

Parents:

37ac7bb

Message:

uhci-rhd - UHCI Root hub drier as a separated process

this wil deffinitely need a lot of polishing

Location:

uspace/drv/uhci-rhd

Files:

• Makefile (added)
• debug.h (moved) (moved from uspace/drv/uhci-hcd/root_hub/debug.h ) (1 diff)
• main.c (added)
• name.h (added)
• port.c (moved) (moved from uspace/drv/uhci-hcd/root_hub/port.c ) (3 diffs)
• port.h (moved) (moved from uspace/drv/uhci-hcd/root_hub/port.h ) (1 diff)
• port_status.c (moved) (moved from uspace/drv/uhci-hcd/root_hub/port_status.c )
• port_status.h (moved) (moved from uspace/drv/uhci-hcd/root_hub/port_status.h )
• root_hub.c (added)
• root_hub.h (moved) (moved from uspace/drv/uhci-hcd/root_hub/root_hub.h ) (1 diff)
• uhci-rhd.ma (added)

uspace/drv/uhci-rhd/debug.h

@@ -38 +38 @@
 #include <usb/debug.h>
 
-#define NAME "uhci_root_hubd"
+#include "name.h"
+
 
 enum debug_levels {

uspace/drv/uhci-rhd/port.c

@@ -11 +11 @@
 static int uhci_port_remove_device(uhci_port_t *port);
 static int uhci_port_set_enabled(uhci_port_t *port, bool enabled);
+static int uhci_port_check(void *port);
 
+int uhci_port_init(
+  uhci_port_t *port, port_status_t *address, unsigned number,
+  unsigned usec, device_t *rh)
+{
+        assert(port);
+        port->address = address;
+        port->number = number;
+        port->wait_period_usec = usec;
+        port->attached_device = 0;
+        port->rh = rh;
+        port->hc_phone = rh->parent_phone;
+
+        port->checker = fibril_create(uhci_port_check, port);
+        if (port->checker == 0) {
+                uhci_print_error(": failed to launch root hub fibril.");
+                return ENOMEM;
+        }
+        fibril_add_ready(port->checker);
+        uhci_print_verbose(
+          "Added fibril for port %d: %p.\n", number, port->checker);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+void uhci_port_fini(uhci_port_t *port)
+{
+//      fibril_teardown(port->checker);
+        return;
+}
 /*----------------------------------------------------------------------------*/
 int uhci_port_check(void *port)
@@ -18 +47 @@
         uhci_port_t *port_instance = port;
         assert(port_instance);
-        port_instance->hc_phone = devman_device_connect(port_instance->hc->handle, 0);
-        if (port_instance->hc_phone < 0) {
-                uhci_print_fatal("Failed(%d) to connect to the hc(handle=%x.\n",
-                        port_instance->hc_phone, (unsigned)port_instance->hc->handle);
-                return port_instance->hc_phone;
-        }
 
         while (1) {
@@ -119 +142 @@
         assert(port->attached_device == 0);
 
-        ret = usb_drv_register_child_in_devman(port->hc_phone, port->hc, usb_address,
-                &port->attached_device);
+        ret = usb_drv_register_child_in_devman(port->hc_phone, port->rh,
+          usb_address, &port->attached_device);
 
         if (ret != EOK) { /* something went wrong */

uspace/drv/uhci-rhd/port.h

@@ -44 +44 @@
 {
         port_status_t *address;
-        device_t *hc;
         unsigned number;
         unsigned wait_period_usec;
         int hc_phone;
+        device_t *rh;
         devman_handle_t attached_device;
+        fid_t checker;
 } uhci_port_t;
 
-static inline void uhci_port_init(
-  uhci_port_t *port, port_status_t *address, device_t *hc, unsigned number,
-  unsigned usec)
-{
-        assert(port);
-        port->address = address;
-        port->hc = hc;
-        port->number = number;
-        port->hc_phone = -1;
-        port->wait_period_usec = usec;
-        port->attached_device = 0;
-}
+int uhci_port_init(
+  uhci_port_t *port, port_status_t *address, unsigned number,
+  unsigned usec, device_t *rh);
 
-int uhci_port_check(void *port);
+void uhci_port_fini(uhci_port_t *port);
 #endif
 /**

uspace/drv/uhci-rhd/root_hub.h

@@ -46 +46 @@
 typedef struct root_hub {
         uhci_port_t ports[UHCI_ROOT_HUB_PORT_COUNT];
-        fid_t checker[UHCI_ROOT_HUB_PORT_COUNT];
+        devman_handle_t hc_handle;
 } uhci_root_hub_t;
 
 int uhci_root_hub_init(
-  uhci_root_hub_t *instance, device_t *device, void *addr);
+  uhci_root_hub_t *instance, void *addr, size_t size, device_t *rh);
 
 int uhci_root_hub_fini(uhci_root_hub_t* instance);