Changeset d1984e0 in mainline

Timestamp:

2011-01-28T15:47:39Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

54229db

Parents:

a8e96683

Message:

Added UHCI command register values

HC is started on initialization.

Location:

uspace/drv/uhci

Files:

• uhci.c (modified) (3 diffs)
• uhci.h (modified) (1 diff)

uspace/drv/uhci/uhci.c

@@ -55 +55 @@
 
         uhci_print_verbose("Initializing frame list.\n");
-        instance->frame_list =
-          memallign32(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT, 4096);
+        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");
@@ -79 +79 @@
         instance->cleaner = fibril_create(uhci_clean_finished, instance);
         fibril_add_ready(instance->cleaner);
+
+        uhci_print_verbose("Starting UHCI HC.\n");
+        uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
+        cmd |= UHCI_CMD_RUN_STOP | UHCI_CMD_CONFIGURE;
+        pio_write_16(&instance->registers->usbcmd, cmd);
 
         device->driver_data = instance;
@@ -177 +182 @@
 
         while(1) {
-                uhci_print_verbose("Running cleaning fibril on %p.\n", instance);
+                uhci_print_verbose("Running cleaning fibril on: %p.\n", instance);
                 /* iterate all transfer queues */
-                usb_transfer_type_t i = USB_TRANSFER_BULK;
-                for (; i > USB_TRANSFER_ISOCHRONOUS; --i) {
+                int i = 1;
+                for (; i < TRANSFER_QUEUES; ++i) {
                         /* Remove inactive transfers from the top of the queue
                          * TODO: should I reach queue head or is this enough? */
+                        uhci_print_verbose("Running cleaning fibril on queue: %p.\n",
+                                &instance->transfers[i]);
                         while (instance->transfers[i].first &&
                          !(instance->transfers[i].first->status & TD_STATUS_ERROR_ACTIVE)) {

uspace/drv/uhci/uhci.h

@@ -46 +46 @@
 typedef struct uhci_regs {
         uint16_t usbcmd;
-#define USB_CMD_
+#define UHCI_CMD_MAX_PACKET (1 << 7)
+#define UHCI_CMD_CONFIGURE  (1 << 6)
+#define UHCI_CMD_DEBUG  (1 << 5)
+#define UHCI_CMD_FORCE_GLOBAL_RESUME  (1 << 4)
+#define UHCI_CMD_FORCE_GLOBAL_SUSPEND  (1 << 3)
+#define UHCI_CMD_GLOBAL_RESET  (1 << 2)
+#define UHCI_CMD_HCRESET  (1 << 1)
+#define UHCI_CMD_RUN_STOP  (1 << 0)
+
         uint16_t usbsts;
         uint16_t usbintr;