Changes in uspace/drv/ohci/hc.c [049eb87:53f1c87] in mainline

File:

• uspace/drv/ohci/hc.c (modified) (7 diffs)

uspace/drv/ohci/hc.c

@@ -45 +45 @@
 
 static int interrupt_emulator(hc_t *instance);
-static void hc_gain_control(hc_t *instance);
-static void hc_init_hw(hc_t *instance);
 /*----------------------------------------------------------------------------*/
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
@@ -60 +58 @@
 
         char *match_str = NULL;
-        int ret = asprintf(&match_str, "usb&class=hub");
+        int ret = asprintf(&match_str, "usb&mid");
         ret = (match_str == NULL) ? ret : EOK;
         if (ret < 0) {
@@ -79 +77 @@
         assert(instance);
         int ret = EOK;
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-} else (void)0
 
         ret = pio_enable((void*)regs, reg_size, (void**)&instance->registers);
-        CHECK_RET_RETURN(ret,
-            "Failed(%d) to gain access to device registers: %s.\n",
-            ret, str_error(ret));
-
+        if (ret != EOK) {
+                usb_log_error("Failed to gain access to device registers.\n");
+                return ret;
+        }
         instance->ddf_instance = fun;
         usb_device_keeper_init(&instance->manager);
-        ret = usb_endpoint_manager_init(&instance->ep_manager,
-            BANDWIDTH_AVAILABLE_USB11);
-        CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
-            ret, str_error(ret));
 
         if (!interrupts) {
@@ -103 +92 @@
         }
 
-        hc_gain_control(instance);
-
         rh_init(&instance->rh, dev, instance->registers);
-
-        hc_init_hw(instance);
 
         /* TODO: implement */
@@ -132 +117 @@
                 rh_interrupt(&instance->rh);
 
-        usb_log_info("OHCI interrupt: %x.\n", status);
-
         /* TODO: Check for further interrupt causes */
         /* TODO: implement */
@@ -143 +126 @@
         usb_log_info("Started interrupt emulator.\n");
         while (1) {
-                const uint32_t status = instance->registers->interrupt_status;
+                uint32_t status = instance->registers->interrupt_status;
                 instance->registers->interrupt_status = status;
                 hc_interrupt(instance, status);
@@ -150 +133 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-void hc_gain_control(hc_t *instance)
-{
-        assert(instance);
-        /* Interrupt routing enabled => smm driver is active */
-        if (instance->registers->control & C_IR) {
-                usb_log_info("Found SMM driver requesting ownership change.\n");
-                instance->registers->command_status |= CS_OCR;
-                while (instance->registers->control & C_IR) {
-                        async_usleep(1000);
-                }
-                usb_log_info("Ownership taken from SMM driver.\n");
-                return;
-        }
-
-        const unsigned hc_status =
-            (instance->registers->control >> C_HCFS_SHIFT) & C_HCFS_MASK;
-        /* Interrupt routing disabled && status != USB_RESET => BIOS active */
-        if (hc_status != C_HCFS_RESET) {
-                usb_log_info("Found BIOS driver.\n");
-                if (hc_status == C_HCFS_OPERATIONAL) {
-                        usb_log_info("HC operational(BIOS).\n");
-                        return;
-                }
-                /* HC is suspended assert resume for 20ms */
-                instance->registers->control &= (C_HCFS_RESUME << C_HCFS_SHIFT);
-                async_usleep(20000);
-                return;
-        }
-
-        /* HC is in reset (hw startup) => no other driver
-         * maintain reset for at least the time specified in USB spec (50 ms)*/
-        async_usleep(50000);
-
-        /* turn off legacy emulation */
-        volatile uint32_t *ohci_emulation_reg =
-            (uint32_t*)((char*)instance->registers + 0x100);
-        usb_log_info("OHCI legacy register status %p: %x.\n",
-                ohci_emulation_reg, *ohci_emulation_reg);
-        *ohci_emulation_reg = 0;
-
-}
-/*----------------------------------------------------------------------------*/
-void hc_init_hw(hc_t *instance)
-{
-        assert(instance);
-        const uint32_t fm_interval = instance->registers->fm_interval;
-        instance->registers->command_status = CS_HCR;
-        async_usleep(10);
-        instance->registers->fm_interval = fm_interval;
-        assert((instance->registers->command_status & CS_HCR) == 0);
-        /* hc is now in suspend state */
-        /* TODO: init HCCA block */
-        /* TODO: init queues */
-        /* TODO: enable queues */
-        /* TODO: enable interrupts */
-        /* TODO: set periodic start to 90% */
-
-        instance->registers->control &= (C_HCFS_OPERATIONAL << C_HCFS_SHIFT);
-        usb_log_info("OHCI HC up and running.\n");
-}
 /**
  * @}