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

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

Files:

• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)
• hw_struct/completion_codes.h (modified) (1 diff)
• hw_struct/hcca.h (modified) (1 diff)

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

@@ -102 +102 @@
  * @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);
@@ -140 +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/ohci/hc.h

@@ -90 +90 @@
 
 extern int hc_add(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 *);
+extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
 extern int hc_gain_control(hc_device_t *);
 extern int hc_start(hc_device_t *);

uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h

@@ -54 +54 @@
 };
 
-inline static unsigned int cc_to_rc(unsigned int cc)
+inline static int cc_to_rc(unsigned int cc)
 {
         switch (cc) {

uspace/drv/bus/usb/ohci/hw_struct/hcca.h

@@ -37 +37 @@
 #define DRV_OHCI_HW_STRUCT_HCCA_H
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <macros.h>