Changeset 132ab5d1 in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_batch.c (modified) (1 diff)
• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -205 +205 @@
                             -= td_remain_size(&ehci_batch->tds[i]);
                 } else {
-                        usb_log_debug("Batch %p found error TD(%zu):%08x (%d).",
+                        usb_log_debug("Batch %p found error TD(%zu):%08x: %s.",
                             ehci_batch, i,
                             ehci_batch->tds[i].status,
-                            ehci_batch->base.error);
+                            str_error_name(ehci_batch->base.error));
                         /* Clear possible ED HALT */
                         qh_clear_halt(ehci_batch->qh);

uspace/drv/bus/usb/ehci/hc.c

@@ -95 +95 @@
  * @param[in] hw_res Device's resources.
  *
+ * @param[out] irq
+ *
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -138 +140 @@
             RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
 
-        return hw_res->irqs.irqs[0];
+        *irq = hw_res->irqs.irqs[0];
+        return EOK;
 }
 

uspace/drv/bus/usb/ehci/hc.h

@@ -103 +103 @@
 extern int hc_start(hc_device_t *);
 extern int hc_setup_roothub(hc_device_t *);
-extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *);
+extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
 extern int hc_gone(hc_device_t *);