Changeset 5944244 in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-02-01T23:25:48Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1f5c1e61

Parents:

c56dbe0

Message:

Refactoring uhci_ functions are called on uhci_t not device_t

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (11 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -37 +37 @@
 #include <usb/usb.h>
 
-#include "utils/malloc32.h"
 #include "uhci.h"
 
@@ -44 +43 @@
 static int uhci_debug_checker(void *arg);
 
-int uhci_init(device_t *device, void *regs, size_t reg_size)
-{
-        assert(device);
-        usb_log_info("Initializing device at address %p.\n", device);
-
-#define CHECK_RET_FREE_INSTANCE(message...) \
+int uhci_init(uhci_t *instance, void *regs, size_t reg_size)
+{
+#define CHECK_RET_RETURN(message...) \
         if (ret != EOK) { \
                 usb_log_error(message); \
-                if (instance) { \
-                        free(instance); \
-                } \
                 return ret; \
         } else (void) 0
-
-        /* create instance */
-        uhci_t *instance = malloc(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) */
@@ -72 +58 @@
         regs_t *io;
         assert(reg_size >= sizeof(regs_t));
-        ret = pio_enable(regs, reg_size, (void**)&io);
-        CHECK_RET_FREE_INSTANCE("Failed to gain access to registers at %p.\n", io);
+        int ret = pio_enable(regs, reg_size, (void**)&io);
+        CHECK_RET_RETURN("Failed to gain access to registers at %p.\n", io);
         instance->registers = io;
         usb_log_debug("Device registers accessible.\n");
@@ -79 +65 @@
         /* init transfer lists */
         ret = uhci_init_transfer_lists(instance->transfers);
-        CHECK_RET_FREE_INSTANCE("Failed to initialize transfer lists.\n");
+        CHECK_RET_RETURN("Failed to initialize transfer lists.\n");
         usb_log_debug("Transfer lists initialized.\n");
 
@@ -86 +72 @@
         instance->frame_list = get_page();
         ret = instance ? EOK : ENOMEM;
-        CHECK_RET_FREE_INSTANCE("Failed to get frame list page.\n");
+        CHECK_RET_RETURN("Failed to get frame list page.\n");
 
         /* 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;
+        unsigned i = 0;
         for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
                 instance->frame_list[i] = queue;
@@ -107 +93 @@
         fibril_add_ready(instance->debug_checker);
 
-        usb_log_debug("Starting UHCI HC.\n");
-        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_RUN_STOP);
+        /* Start the hc with large(64b) packet FSBR */
+        pio_write_16(&instance->registers->usbcmd,
+            UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET);
+        usb_log_debug("Started UHCI HC.\n");
 /*
         uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
@@ -114 +102 @@
         pio_write_16(&instance->registers->usbcmd, cmd);
 */
-        device->driver_data = instance;
         return EOK;
 }
@@ -152 +139 @@
 /*----------------------------------------------------------------------------*/
 int uhci_transfer(
+  uhci_t *instance,
   device_t *dev,
   usb_target_t target,
@@ -172 +160 @@
         callback_t *job = NULL;
         int ret = EOK;
+        assert(dev);
 
 #define CHECK_RET_TRANS_FREE_JOB_TD(message) \
@@ -183 +172 @@
         } else (void) 0
 
-
         job = callback_get(dev, buffer, size, callback_in, callback_out, arg);
         ret = job ? EOK : ENOMEM;
@@ -193 +181 @@
 
         td->callback = job;
-
-        assert(dev);
-        uhci_t *instance = (uhci_t*)dev->driver_data;
-        assert(instance);
 
         usb_log_debug("Appending a new transfer to queue.\n");