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

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/xhci

Files:

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

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

@@ -369 +369 @@
  * (except 0) are disabled.
  */
-int hc_irq_code_gen(irq_code_t *code, xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res)
+int hc_irq_code_gen(irq_code_t *code, xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -412 +412 @@
         code->cmds[6].addr = intr0_iman;
 
-        return hw_res->irqs.irqs[0];
+        *irq = hw_res->irqs.irqs[0];
+        return EOK;
 }
 

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

@@ -117 +117 @@
 extern int hc_init_memory(xhci_hc_t *, ddf_dev_t *);
 extern int hc_claim(xhci_hc_t *, ddf_dev_t *);
-extern int hc_irq_code_gen(irq_code_t *, xhci_hc_t *, const hw_res_list_parsed_t *);
+extern int hc_irq_code_gen(irq_code_t *, xhci_hc_t *, const hw_res_list_parsed_t *, int *);
 extern int hc_start(xhci_hc_t *, bool);
 extern void hc_fini(xhci_hc_t *);

uspace/drv/bus/usb/xhci/main.c

@@ -68 +68 @@
 }
 
-static int hcd_irq_code_gen(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+static int hcd_irq_code_gen(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         xhci_hc_t *hc = hcd_to_hc(hcd);
-        return hc_irq_code_gen(code, hc, hw_res);
+        return hc_irq_code_gen(code, hc, hw_res, irq);
 }