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

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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-hcd

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (2 diffs)
• name.h (modified) (1 diff)
• pci.c (modified) (1 diff)
• pci.h (added)
• root_hub.c (added)
• root_hub.h (added)
• root_hub/root_hub.c (deleted)
• uhci.c (modified) (1 diff)
• uhci.h (modified) (4 diffs)

uspace/drv/uhci-hcd/Makefile

@@ -36 +36 @@
         iface.c \
         main.c \
-        root_hub/port.c \
-        root_hub/port_status.c \
-        root_hub/root_hub.c \
+        root_hub.c \
         transfer_list.c \
         uhci.c \

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include "iface.h"
 #include "name.h"
+#include "pci.h"
+#include "root_hub.h"
 #include "uhci.h"
 
@@ -75 +77 @@
             io_reg_base, io_reg_size, irq);
 
-        return uhci_init(device, (void*)io_reg_base, io_reg_size);
+        int ret = uhci_init(device, (void*)io_reg_base, io_reg_size);
+
+        if (ret != EOK) {
+                uhci_print_error("Failed to init uhci-hcd.\n");
+                return ret;
+        }
+        device_t *rh;
+        ret = setup_root_hub(&rh, device);
+
+        if (ret != EOK) {
+                uhci_print_error("Failed to setup uhci root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        ret = child_device_register(rh, device);
+        if (ret != EOK) {
+                uhci_print_error("Failed to register root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        return EOK;
 }
 

uspace/drv/uhci-hcd/name.h

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_TD_NAME_H
-#define DRV_UHCI_TD_NAME_H
+#ifndef DRV_UHCI_NAME_H
+#define DRV_UHCI_NAME_H
 
 #define NAME "uhci-hcd"

uspace/drv/uhci-hcd/pci.c

@@ -34 +34 @@
  * PCI related functions needed by the UHCI driver.
  */
-#include "uhci.h"
+#include "pci.h"
 #include <errno.h>
 #include <assert.h>

uspace/drv/uhci-hcd/uhci.c

@@ -51 +51 @@
         uhci_print_verbose("Transfer lists initialized.\n");
 
-        /* init root hub */
-        ret = uhci_root_hub_init(&instance->root_hub, device,
-          (char*)regs + UHCI_ROOT_HUB_PORT_REGISTERS_OFFSET);
-        CHECK_RET_FREE_INSTANCE("Failed to initialize root hub driver.\n");
 
         uhci_print_verbose("Initializing frame list.\n");
         instance->frame_list = get_page();
-//        memalign32(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT, 4096);
-        if (instance->frame_list == NULL) {
-                uhci_print_error("Failed to allocate frame list pointer.\n");
-                uhci_root_hub_fini(&instance->root_hub);
-                free(instance);
-                return ENOMEM;
-        }
+        ret = instance ? EOK : ENOMEM;
+        CHECK_RET_FREE_INSTANCE("Failed to get frame list page.\n");
 
         /* initialize all frames to point to the first queue head */

uspace/drv/uhci-hcd/uhci.h

@@ -41 +41 @@
 #include <usbhc_iface.h>
 
-#include "root_hub/root_hub.h"
 #include "transfer_list.h"
 
@@ -76 +75 @@
 typedef struct uhci {
         usb_address_keeping_t address_manager;
-        uhci_root_hub_t root_hub;
         volatile regs_t *registers;
 
@@ -87 +85 @@
 
 /* init uhci specifics in device.driver_data */
-int uhci_init( device_t *device, void *regs, size_t reg_size );
+int uhci_init(device_t *device, void *regs, size_t reg_size);
 
-int uhci_destroy( device_t *device );
+int uhci_destroy(device_t *device);
 
 int uhci_transfer(
@@ -102 +100 @@
   void *arg );
 
-int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
-
 #endif
 /**