Changes in uspace/drv/ohci/hc.c [02cacce:68b9f148] in mainline

File:

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

uspace/drv/ohci/hc.c

@@ -51 +51 @@
 static int hc_init_memory(hc_t *instance);
 /*----------------------------------------------------------------------------*/
-/** Announce OHCI root hub to the DDF
- *
- * @param[in] instance OHCI driver intance
- * @param[in] hub_fun DDF fuction representing OHCI root hub
- * @return Error code
- */
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
 {
@@ -62 +56 @@
         assert(hub_fun);
 
-        const usb_address_t hub_address =
+        int ret;
+
+        usb_address_t hub_address =
             device_keeper_get_free_address(&instance->manager, USB_SPEED_FULL);
         if (hub_address <= 0) {
-                usb_log_error("Failed(%d) to get OHCI root hub address.\n",
-                    hub_address);
+                usb_log_error("Failed to get OHCI root hub address.\n");
                 return hub_address;
         }
@@ -73 +68 @@
             &instance->manager, hub_address, hub_fun->handle);
 
-#define CHECK_RET_RELEASE(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        hc_remove_endpoint(instance, hub_address, 0, USB_DIRECTION_BOTH); \
-        usb_device_keeper_release(&instance->manager, hub_address); \
-        return ret; \
-} else (void)0
-
-        int ret = hc_add_endpoint(instance, hub_address, 0, USB_SPEED_FULL,
+        ret = hc_add_endpoint(instance, hub_address, 0, USB_SPEED_FULL,
             USB_TRANSFER_CONTROL, USB_DIRECTION_BOTH, 64, 0, 0);
-        CHECK_RET_RELEASE(ret, "Failed(%d) to add OHCI rh endpoint 0.\n", ret);
+        if (ret != EOK) {
+                usb_log_error("Failed to add OHCI rh endpoint 0.\n");
+                usb_device_keeper_release(&instance->manager, hub_address);
+                return ret;
+        }
 
         char *match_str = NULL;
         /* DDF needs heap allocated string */
         ret = asprintf(&match_str, "usb&class=hub");
-        ret = ret > 0 ? 0 : ret;
-        CHECK_RET_RELEASE(ret, "Failed(%d) to create match-id string.\n", ret);
+        if (ret < 0) {
+                usb_log_error(
+                    "Failed(%d) to create root hub match-id string.\n", ret);
+                usb_device_keeper_release(&instance->manager, hub_address);
+                return ret;
+        }
 
         ret = ddf_fun_add_match_id(hub_fun, match_str, 100);
-        CHECK_RET_RELEASE(ret, "Failed(%d) add root hub match-id.\n", ret);
-
+        if (ret != EOK) {
+                usb_log_error("Failed add root hub match-id.\n");
+        }
         ret = ddf_fun_bind(hub_fun);
-        CHECK_RET_RELEASE(ret, "Failed(%d) to bind root hub function.\n", ret);
-
-        return EOK;
-#undef CHECK_RET_RELEASE
-}
-/*----------------------------------------------------------------------------*/
-/** Initialize OHCI hc driver structure
- *
- * @param[in] instance Memory place for the structure.
- * @param[in] regs Address of the memory mapped I/O registers.
- * @param[in] reg_size Size of the memory mapped area.
- * @param[in] interrupts True if w interrupts should be used
- * @return Error code
- */
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
 int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts)
 {
@@ -136 +121 @@
 #undef CHECK_RET_RETURN
 
+
+//      hc_init_hw(instance);
+        hc_gain_control(instance);
         fibril_mutex_initialize(&instance->guard);
-        hc_gain_control(instance);
 
         rh_init(&instance->rh, instance->registers);
@@ -150 +137 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Create end register endpoint structures
- *
- * @param[in] instance OHCI driver structure.
- * @param[in] address USB address of the device.
- * @param[in] endpoint USB endpoint number.
- * @param[in] speed Communication speeed of the device.
- * @param[in] type Endpoint's transfer type.
- * @param[in] direction Endpoint's direction.
- * @param[in] mps Maximum packet size the endpoint accepts.
- * @param[in] size Maximum allowed buffer size.
- * @param[in] interval Time between transfers(interrupt transfers only).
- * @return Error code
- */
 int hc_add_endpoint(
     hc_t *instance, usb_address_t address, usb_endpoint_t endpoint,
@@ -220 +194 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Dequeue and delete endpoint structures
- *
- * @param[in] instance OHCI hc driver structure.
- * @param[in] address USB address of the device.
- * @param[in] endpoint USB endpoint number.
- * @param[in] direction Direction of the endpoint.
- * @return Error code
- */
 int hc_remove_endpoint(hc_t *instance, usb_address_t address,
     usb_endpoint_t endpoint, usb_direction_t direction)
@@ -278 +244 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Get access to endpoint structures
- *
- * @param[in] instance OHCI hc driver structure.
- * @param[in] address USB address of the device.
- * @param[in] endpoint USB endpoint number.
- * @param[in] direction Direction of the endpoint.
- * @param[out] bw Reserved bandwidth.
- * @return Error code
- */
 endpoint_t * hc_get_endpoint(hc_t *instance, usb_address_t address,
     usb_endpoint_t endpoint, usb_direction_t direction, size_t *bw)
@@ -298 +255 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Add USB transfer to the schedule.
- *
- * @param[in] instance OHCI hc driver structure.
- * @param[in] batch Batch representing the transfer.
- * @return Error code.
- */
 int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch)
 {
@@ -310 +261 @@
         assert(batch->ep);
 
-        /* Check for root hub communication */
+        /* check for root hub communication */
         if (batch->ep->address == instance->rh.address) {
                 return rh_request(&instance->rh, batch);
@@ -318 +269 @@
         list_append(&batch->link, &instance->pending_batches);
         batch_commit(batch);
-
-        /* Control and bulk schedules need a kick to start working */
-        switch (batch->ep->transfer_type)
-        {
+        switch (batch->ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
                 instance->registers->command_status |= CS_CLF;
@@ -331 +279 @@
                 break;
         }
+
         fibril_mutex_unlock(&instance->guard);
         return EOK;
 }
 /*----------------------------------------------------------------------------*/
-/** Interrupt handling routine
- *
- * @param[in] instance OHCI hc driver structure.
- * @param[in] status Value of the status register at the time of interrupt.
- */
 void hc_interrupt(hc_t *instance, uint32_t status)
 {
@@ -378 +322 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check status register regularly
- *
- * @param[in] instance OHCI hc driver structure.
- * @return Error code
- */
 int interrupt_emulator(hc_t *instance)
 {
@@ -391 +330 @@
                 instance->registers->interrupt_status = status;
                 hc_interrupt(instance, status);
-                async_usleep(10000);
+                async_usleep(50000);
         }
         return EOK;
 }
 /*----------------------------------------------------------------------------*/
-/** Turn off any (BIOS)driver that might be in control of the device.
- *
- * @param[in] instance OHCI hc driver structure.
- */
 void hc_gain_control(hc_t *instance)
 {
@@ -449 +384 @@
 }
 /*----------------------------------------------------------------------------*/
-/** OHCI hw initialization routine.
- *
- * @param[in] instance OHCI hc driver structure.
- */
 void hc_start_hw(hc_t *instance)
 {
@@ -520 +451 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Initialize schedule queues
- *
- * @param[in] instance OHCI hc driver structure
- * @return Error code
- */
 int hc_init_transfer_lists(hc_t *instance)
 {
@@ -540 +466 @@
                 endpoint_list_fini(&instance->lists[USB_TRANSFER_BULK]); \
         } \
-        return ret; \
 } while (0)
 
@@ -554 +479 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Initialize memory structures used by the OHCI hcd.
- *
- * @param[in] instance OHCI hc driver structure.
- * @return Error code.
- */
 int hc_init_memory(hc_t *instance)
 {
@@ -585 +505 @@
         /* Init interrupt code */
         instance->interrupt_code.cmds = instance->interrupt_commands;
-        instance->interrupt_code.cmdcount = OHCI_NEEDED_IRQ_COMMANDS;
         {
                 /* Read status register */
@@ -605 +524 @@
                 instance->interrupt_commands[2].srcarg = 2;
 
-                /* Write-clean status register */
+                /* Write clean status register */
                 instance->interrupt_commands[3].cmd = CMD_MEM_WRITE_A_32;
                 instance->interrupt_commands[3].srcarg = 1;
@@ -613 +532 @@
                 /* Accept interrupt */
                 instance->interrupt_commands[4].cmd = CMD_ACCEPT;
+
+                instance->interrupt_code.cmdcount = OHCI_NEEDED_IRQ_COMMANDS;
         }