Changeset 68e5406 in mainline for uspace/drv/bus


Ignore:
Timestamp:
2017-12-10T21:08:11Z (8 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4c6de4f
Parents:
dd8ab1c
Message:

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

Location:
uspace/drv/bus/usb
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    rdd8ab1c r68e5406  
    9696 * @param[in] hw_res Device's resources.
    9797 *
     98 * @param[out] irq
     99 *
    98100 * @return Error code.
    99101 */
    100 int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
     102int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
    101103{
    102104        assert(code);
    … …  
    146148            RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
    147149
    148         return hw_res->irqs.irqs[0];
     150        *irq = hw_res->irqs.irqs[0];
     151        return EOK;
    149152}
    150153

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

    rdd8ab1c r68e5406  
    8888void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
    8989
    90 int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
     90int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq);
    9191
    9292void ehci_hc_interrupt(hcd_t *hcd, uint32_t status);

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

    rdd8ab1c r68e5406  
    103103 * @return Error code.
    104104 */
    105 int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
     105int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
    106106{
    107107        assert(code);
    … …  
    141141            RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
    142142
    143         return hw_res->irqs.irqs[0];
     143        *irq = hw_res->irqs.irqs[0];
     144        return EOK;
    144145}
    145146

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

    rdd8ab1c r68e5406  
    8686extern void hc_dequeue_endpoint(hc_t *, const endpoint_t *);
    8787
    88 int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
     88int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq);
    8989
    9090extern void ohci_hc_interrupt(hcd_t *, uint32_t);

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

    rdd8ab1c r68e5406  
    103103 * @param[out] code IRQ code structure.
    104104 * @param[in] hw_res Device's resources.
     105 * @param[out] irq
    105106 *
    106107 * @return Error code.
    107108 */
    108 int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
     109int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
    109110{
    110111        assert(code);
    … …  
    142143            RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
    143144
    144         return hw_res->irqs.irqs[0];
     145        *irq = hw_res->irqs.irqs[0];
     146        return EOK;
    145147}
    146148

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

    rdd8ab1c r68e5406  
    127127extern void hc_fini(hc_t *);
    128128
    129 extern int uhci_hc_gen_irq_code(irq_code_t *, const hw_res_list_parsed_t *);
     129extern int uhci_hc_gen_irq_code(irq_code_t *, const hw_res_list_parsed_t *, int *);
    130130
    131131extern void uhci_hc_interrupt(hcd_t *, uint32_t);
Note: See TracChangeset for help on using the changeset viewer.