Changeset 9ee87f6 in mainline

Timestamp:

2011-01-25T22:51:08Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7fc092a

Parents:

d03ade7

Message:

uhci initialization refactored

Added cleaner fibril(will handle callbacks and completed transfers)

Location:

uspace/drv/uhci

Files:

• uhci.c (modified) (5 diffs)
• uhci.h (modified) (3 diffs)
• uhci_struct/frame_list.h (deleted)

uspace/drv/uhci/uhci.c

@@ -9 +9 @@
 #include "uhci.h"
 
-static int uhci_init_tranfer_lists(transfer_list_t list[]);
-
+static int uhci_init_transfer_lists(transfer_list_t list[]);
+static int uhci_clean_finished(void *arg);
 static inline int uhci_add_transfer(
   device_t *dev,
@@ -23 +23 @@
 int uhci_init(device_t *device, void *regs)
 {
-        assert( device );
-        uhci_print_info( "Initializing device at address %p\n", device);
+        assert(device);
+        uhci_print_info("Initializing device at address %p.\n", device);
+
+#define CHECK_RET_FREE_INSTANCE(message...) \
+        if (ret != EOK) { \
+                uhci_print_error(message); \
+                if (instance) { \
+                        free(instance); \
+                } \
+                return ret; \
+        } else (void) 0
 
         /* create instance */
         uhci_t *instance = malloc( sizeof(uhci_t) );
-        if (!instance)
-                { return ENOMEM; }
-        bzero( instance, sizeof(uhci_t) );
+        int ret = instance ? EOK : ENOMEM;
+        CHECK_RET_FREE_INSTANCE("Failed to allocate uhci driver instance.\n");
+
+        bzero(instance, sizeof(uhci_t));
 
         /* init address keeper(libusb) */
-        usb_address_keeping_init( &instance->address_manager, USB11_ADDRESS_MAX );
+        usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
 
         /* allow access to hc control registers */
         regs_t *io;
-        int ret = pio_enable( regs, sizeof(regs_t), (void**)&io);
-        if (ret < 0) {
-                free( instance );
-                uhci_print_error("Failed to gain access to registers at %p\n", io);
-                return ret;
-        }
+        ret = pio_enable(regs, sizeof(regs_t), (void**)&io);
+        CHECK_RET_FREE_INSTANCE("Failed to gain access to registers at %p.\n", io);
         instance->registers = io;
+
+        /* init transfer lists */
+        ret = uhci_init_transfer_lists(instance->transfers);
+        CHECK_RET_FREE_INSTANCE("Failed to initialize transfer lists.\n");
 
         /* init root hub */
         ret = uhci_root_hub_init(&instance->root_hub, device,
           (char*)regs + UHCI_ROOT_HUB_PORT_REGISTERS_OFFSET);
-        if (ret < 0) {
-                free(instance);
-                uhci_print_error("Failed to initialize root hub driver.\n");
-                return ret;
-        }
-
-        instance->frame_list = trans_malloc(sizeof(frame_list_t));
+        CHECK_RET_FREE_INSTANCE("Failed to initialize root hub driver.\n");
+
+        instance->frame_list =
+          trans_malloc(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT);
         if (instance->frame_list == NULL) {
                 uhci_print_error("Failed to allocate frame list pointer.\n");
@@ -62 +69 @@
         }
 
+        /* initialize all frames to point to the first queue head */
+        unsigned i = 0;
+        const uint32_t queue =
+          instance->transfers[USB_TRANSFER_INTERRUPT].queue_head_pa
+          | LINK_POINTER_QUEUE_HEAD_FLAG;
+        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
+                instance->frame_list[i] = queue;
+        }
+
         const uintptr_t pa = (uintptr_t)addr_to_phys(instance->frame_list);
 
         pio_write_32(&instance->registers->flbaseadd, (uint32_t)pa);
 
-        ret = uhci_init_tranfer_lists(instance->transfers);
-        if (ret != EOK) {
-                uhci_print_error("Transfer list initialization failed.\n");
-                uhci_root_hub_fini(&instance->root_hub);
-                free(instance);
-                return ret;
-        }
+        instance->cleaner = fibril_create(uhci_clean_finished, instance);
+        fibril_add_ready(instance->cleaner);
 
         device->driver_data = instance;
@@ -129 +140 @@
 }
 /*----------------------------------------------------------------------------*/
-int uhci_init_tranfer_lists(transfer_list_t transfers[])
+int uhci_init_transfer_lists(transfer_list_t transfers[])
 {
         //TODO:refactor
@@ -220 +231 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+int uhci_clean_finished(void* arg)
+{
+        uhci_print_verbose("Started cleaning fibril.\n");
+        uhci_t *instance = (uhci_t*)arg;
+        assert(instance);
+        while(1) {
+                uhci_print_verbose("Running cleaning fibril on %p.\n", instance);
+
+                async_usleep(1000000);
+        }
+        return EOK;
+}

uspace/drv/uhci/uhci.h

@@ -42 +42 @@
 
 #include "root_hub/root_hub.h"
-#include "uhci_struct/frame_list.h"
 #include "transfer_list.h"
-
 
 typedef struct uhci_regs {
@@ -56 +54 @@
 
 #define TRANSFER_QUEUES 4
+#define UHCI_FRAME_LIST_COUNT 1024
 
 typedef struct uhci {
@@ -62 +61 @@
         volatile regs_t *registers;
 
-        frame_list_t *frame_list;
+        link_pointer_t *frame_list;
 
         transfer_list_t transfers[TRANSFER_QUEUES];
+        fid_t cleaner;
 } uhci_t;