Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/ohci


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

Location:
uspace/drv/bus/usb/ohci
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r132ab5d1 r5a6cc679  
    5151 * Allocates memory for internal ed_t structure.
    5252 */
    53 int endpoint_list_init(endpoint_list_t *instance, const char *name)
     53errno_t endpoint_list_init(endpoint_list_t *instance, const char *name)
    5454{
    5555        assert(instance);

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

    r132ab5d1 r5a6cc679  
    7171}
    7272
    73 int endpoint_list_init(endpoint_list_t *instance, const char *name);
     73errno_t endpoint_list_init(endpoint_list_t *instance, const char *name);
    7474void endpoint_list_set_next(
    7575    const endpoint_list_t *instance, const endpoint_list_t *next);

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

    r132ab5d1 r5a6cc679  
    9090};
    9191
    92 static int hc_init_transfer_lists(hc_t *instance);
    93 static int hc_init_memory(hc_t *instance);
     92static errno_t hc_init_transfer_lists(hc_t *instance);
     93static errno_t hc_init_memory(hc_t *instance);
    9494
    9595/** Generate IRQ code.
    … …  
    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, int *irq)
     104errno_t 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);
    … …  
    151151 * @return Error code
    152152 */
    153 int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
     153errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
    154154{
    155155        hc_t *instance = hcd_to_hc(hcd);
    … …  
    159159            return EINVAL;
    160160
    161         int ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
     161        errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
    162162            (void **) &instance->registers);
    163163        if (ret != EOK) {
    … …  
    263263}
    264264
    265 int ohci_hc_status(bus_t *bus_base, uint32_t *status)
     265errno_t ohci_hc_status(bus_t *bus_base, uint32_t *status)
    266266{
    267267        assert(bus_base);
    … …  
    285285 * @return Error code.
    286286 */
    287 int ohci_hc_schedule(usb_transfer_batch_t *batch)
     287errno_t ohci_hc_schedule(usb_transfer_batch_t *batch)
    288288{
    289289        assert(batch);
    … …  
    547547 * @return Error code
    548548 */
    549 int hc_init_transfer_lists(hc_t *instance)
     549errno_t hc_init_transfer_lists(hc_t *instance)
    550550{
    551551        assert(instance);
    … …  
    553553do { \
    554554        const char *name = usb_str_transfer_type(type); \
    555         const int ret = endpoint_list_init(&instance->lists[type], name); \
     555        const errno_t ret = endpoint_list_init(&instance->lists[type], name); \
    556556        if (ret != EOK) { \
    557557                usb_log_error("Failed to setup %s endpoint list: %s.", \
    … …  
    581581 * @return Error code.
    582582 */
    583 int hc_init_memory(hc_t *instance)
     583errno_t hc_init_memory(hc_t *instance)
    584584{
    585585        assert(instance);
    … …  
    587587        memset(&instance->rh, 0, sizeof(instance->rh));
    588588        /* Init queues */
    589         int ret = hc_init_transfer_lists(instance);
     589        errno_t ret = hc_init_transfer_lists(instance);
    590590        if (ret != EOK) {
    591591                return ret;

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

    r132ab5d1 r5a6cc679  
    8989}
    9090
    91 extern 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 *, int *);
    93 extern int hc_gain_control(hc_device_t *);
    94 extern int hc_start(hc_device_t *);
    95 extern int hc_setup_roothub(hc_device_t *);
    96 extern int hc_gone(hc_device_t *);
     91extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *);
     92extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
     93extern errno_t hc_gain_control(hc_device_t *);
     94extern errno_t hc_start(hc_device_t *);
     95extern errno_t hc_setup_roothub(hc_device_t *);
     96extern errno_t hc_gone(hc_device_t *);
    9797
    9898extern void hc_enqueue_endpoint(hc_t *, const endpoint_t *);
    9999extern void hc_dequeue_endpoint(hc_t *, const endpoint_t *);
    100100
    101 extern int ohci_hc_schedule(usb_transfer_batch_t *);
    102 extern int ohci_hc_status(bus_t *, uint32_t *);
     101extern errno_t ohci_hc_schedule(usb_transfer_batch_t *);
     102extern errno_t ohci_hc_status(bus_t *, uint32_t *);
    103103extern void ohci_hc_interrupt(bus_t *, uint32_t);
    104104

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

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

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

    r132ab5d1 r5a6cc679  
    119119 * @return Error code.
    120120 */
    121 static inline int td_error(const td_t *instance)
     121static inline errno_t td_error(const td_t *instance)
    122122{
    123123        assert(instance);

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

    r132ab5d1 r5a6cc679  
    6565} ohci_bus_t;
    6666
    67 int ohci_bus_init(ohci_bus_t *, hc_t *);
     67errno_t ohci_bus_init(ohci_bus_t *, hc_t *);
    6868void ohci_ep_toggle_reset(endpoint_t *);
    6969

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

    r132ab5d1 r5a6cc679  
    109109 * initializes internal virtual hub.
    110110 */
    111 int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs,
     111errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs,
    112112    fibril_mutex_t *guard, const char *name)
    113113{
    … …  
    176176 * status change requests might be postponed until there is something to report.
    177177 */
    178 int ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch)
     178errno_t ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch)
    179179{
    180180        assert(instance);
    … …  
    214214 * processing of a postponed request.
    215215 */
    216 int ohci_rh_interrupt(ohci_rh_t *instance)
     216errno_t ohci_rh_interrupt(ohci_rh_t *instance)
    217217{
    218218        fibril_mutex_lock(instance->guard);
    … …  
    259259 * @return Error code.
    260260 */
    261 static int req_get_status(usbvirt_device_t *device,
     261static errno_t req_get_status(usbvirt_device_t *device,
    262262    const usb_device_request_setup_packet_t *setup_packet,
    263263    uint8_t *data, size_t *act_size)
    … …  
    282282 * @return Error code.
    283283 */
    284 static int req_clear_hub_feature(usbvirt_device_t *device,
     284static errno_t req_clear_hub_feature(usbvirt_device_t *device,
    285285    const usb_device_request_setup_packet_t *setup_packet,
    286286    uint8_t *data, size_t *act_size)
    … …  
    312312 * @return Error code.
    313313 */
    314 static int req_get_port_status(usbvirt_device_t *device,
     314static errno_t req_get_port_status(usbvirt_device_t *device,
    315315    const usb_device_request_setup_packet_t *setup_packet,
    316316    uint8_t *data, size_t *act_size)
    … …  
    336336 * @return Error code.
    337337 */
    338 static int req_clear_port_feature(usbvirt_device_t *device,
     338static errno_t req_clear_port_feature(usbvirt_device_t *device,
    339339    const usb_device_request_setup_packet_t *setup_packet,
    340340    uint8_t *data, size_t *act_size)
    … …  
    400400 * @return Error code.
    401401 */
    402 static int req_set_port_feature(usbvirt_device_t *device,
     402static errno_t req_set_port_feature(usbvirt_device_t *device,
    403403    const usb_device_request_setup_packet_t *setup_packet,
    404404    uint8_t *data, size_t *act_size)
    … …  
    451451 * only need 1 byte.
    452452 */
    453 static int req_status_change_handler(usbvirt_device_t *device,
     453static errno_t req_status_change_handler(usbvirt_device_t *device,
    454454    usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
    455455    void *buffer, size_t buffer_size, size_t *actual_size)

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

    r132ab5d1 r5a6cc679  
    6666} ohci_rh_t;
    6767
    68 int ohci_rh_init(ohci_rh_t *, ohci_regs_t *, fibril_mutex_t *, const char *);
    69 int ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch);
    70 int ohci_rh_interrupt(ohci_rh_t *instance);
     68errno_t ohci_rh_init(ohci_rh_t *, ohci_regs_t *, fibril_mutex_t *, const char *);
     69errno_t ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch);
     70errno_t ohci_rh_interrupt(ohci_rh_t *instance);
    7171
    7272/** Get OHCI rh address.
Note: See TracChangeset for help on using the changeset viewer.