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


Ignore:
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
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r8bfb163 r132ab5d1  
    205205                            -= td_remain_size(&ehci_batch->tds[i]);
    206206                } else {
    207                         usb_log_debug("Batch %p found error TD(%zu):%08x (%d).",
     207                        usb_log_debug("Batch %p found error TD(%zu):%08x: %s.",
    208208                            ehci_batch, i,
    209209                            ehci_batch->tds[i].status,
    210                             ehci_batch->base.error);
     210                            str_error_name(ehci_batch->base.error));
    211211                        /* Clear possible ED HALT */
    212212                        qh_clear_halt(ehci_batch->qh);

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

    r8bfb163 r132ab5d1  
    9595 * @param[in] hw_res Device's resources.
    9696 *
     97 * @param[out] irq
     98 *
    9799 * @return Error code.
    98100 */
    99 int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
     101int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
    100102{
    101103        assert(code);
    … …  
    138140            RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
    139141
    140         return hw_res->irqs.irqs[0];
     142        *irq = hw_res->irqs.irqs[0];
     143        return EOK;
    141144}
    142145

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

    r8bfb163 r132ab5d1  
    103103extern int hc_start(hc_device_t *);
    104104extern int hc_setup_roothub(hc_device_t *);
    105 extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *);
     105extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
    106106extern int hc_gone(hc_device_t *);
    107107

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

    r8bfb163 r132ab5d1  
    102102 * @return Error code.
    103103 */
    104 int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
     104int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
    105105{
    106106        assert(code);
    … …  
    140140            RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
    141141
    142         return hw_res->irqs.irqs[0];
     142        *irq = hw_res->irqs.irqs[0];
     143        return EOK;
    143144}
    144145

  • uspace/drv/bus/usb/ohci/hc.h

    r8bfb163 r132ab5d1  
    9090
    9191extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
    92 extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *);
     92extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
    9393extern int hc_gain_control(hc_device_t *);
    9494extern int hc_start(hc_device_t *);

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

    r8bfb163 r132ab5d1  
    5454};
    5555
    56 inline static unsigned int cc_to_rc(unsigned int cc)
     56inline static int cc_to_rc(unsigned int cc)
    5757{
    5858        switch (cc) {

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

    r8bfb163 r132ab5d1  
    3737#define DRV_OHCI_HW_STRUCT_HCCA_H
    3838
    39 #include <malloc.h>
     39#include <stdlib.h>
    4040#include <stdint.h>
    4141#include <macros.h>

  • uspace/drv/bus/usb/uhci/hc.c

    r8bfb163 r132ab5d1  
    106106 * @param[out] code IRQ code structure.
    107107 * @param[in] hw_res Device's resources.
     108 * @param[out] irq
    108109 *
    109110 * @return Error code.
    110111 */
    111 int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
     112int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
    112113{
    113114        assert(code);
    … …  
    145146            RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
    146147
    147         return hw_res->irqs.irqs[0];
     148        *irq = hw_res->irqs.irqs[0];
     149        return EOK;
    148150}
    149151

  • uspace/drv/bus/usb/uhci/hc.h

    r8bfb163 r132ab5d1  
    158158
    159159extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
    160 extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *);
     160extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
    161161extern int hc_start(hc_device_t *);
    162162extern int hc_setup_roothub(hc_device_t *);

  • uspace/drv/bus/usb/usbmid/usbmid.c

    r8bfb163 r132ab5d1  
    120120         * class name something humanly understandable.
    121121         */
    122         rc = asprintf(&child_name, "%s%hhu",
     122        int ret = asprintf(&child_name, "%s%hhu",
    123123            usb_str_class(interface_descriptor->interface_class),
    124124            interface_descriptor->interface_number);
    125         if (rc < 0) {
     125        if (ret < 0) {
    126126                return ENOMEM;
    127127        }

  • uspace/drv/bus/usb/vhc/conndev.c

    r8bfb163 r132ab5d1  
    7575        }
    7676       
    77         sysarg_t data_request_rc;
    78         sysarg_t opening_request_rc;
     77        int data_request_rc;
     78        int opening_request_rc;
    7979        async_wait_for(data_request, &data_request_rc);
    8080        async_wait_for(opening_request, &opening_request_rc);

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

    r8bfb163 r132ab5d1  
    369369 * (except 0) are disabled.
    370370 */
    371 int hc_irq_code_gen(irq_code_t *code, xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res)
     371int hc_irq_code_gen(irq_code_t *code, xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res, int *irq)
    372372{
    373373        assert(code);
    … …  
    412412        code->cmds[6].addr = intr0_iman;
    413413
    414         return hw_res->irqs.irqs[0];
     414        *irq = hw_res->irqs.irqs[0];
     415        return EOK;
    415416}
    416417

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

    r8bfb163 r132ab5d1  
    117117extern int hc_init_memory(xhci_hc_t *, ddf_dev_t *);
    118118extern int hc_claim(xhci_hc_t *, ddf_dev_t *);
    119 extern int hc_irq_code_gen(irq_code_t *, xhci_hc_t *, const hw_res_list_parsed_t *);
     119extern int hc_irq_code_gen(irq_code_t *, xhci_hc_t *, const hw_res_list_parsed_t *, int *);
    120120extern int hc_start(xhci_hc_t *, bool);
    121121extern void hc_fini(xhci_hc_t *);

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

    r8bfb163 r132ab5d1  
    6868}
    6969
    70 static int hcd_irq_code_gen(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
     70static int hcd_irq_code_gen(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
    7171{
    7272        xhci_hc_t *hc = hcd_to_hc(hcd);
    73         return hc_irq_code_gen(code, hc, hw_res);
     73        return hc_irq_code_gen(code, hc, hw_res, irq);
    7474}
    7575
Note: See TracChangeset for help on using the changeset viewer.