Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 44b1674 in mainline


Ignore:
Timestamp:
2011-04-18T21:48:55Z (11 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master
Children:
9014dcd
Parents:
618f9ed (diff), 84a04dd (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 form usb/development

Location:
uspace
Files:
7 added
50 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/usbinfo/dev.c

    r618f9ed r44b1674  
    7777        }
    7878
    79         rc = usb_pipe_start_long_transfer(&dev->ctrl_pipe);
    80         if (rc != EOK) {
    81                 fprintf(stderr,
    82                     NAME ": failed to start transfer on control pipe: %s.\n",
    83                     str_error(rc));
    84                 goto leave;
    85         }
     79        usb_pipe_start_long_transfer(&dev->ctrl_pipe);
    8680        transfer_started = true;
    8781
  • uspace/drv/ehci-hcd/main.c

    r618f9ed r44b1674  
    8282            pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq);
    8383        CHECK_RET_RETURN(ret,
    84             "Failed(%d) to get memory addresses:.\n", ret, device->handle);
    85         usb_log_info("Memory mapped regs at 0x%X (size %zu), IRQ %d.\n",
     84            "Failed to get memory addresses for %" PRIun ": %s.\n",
     85            device->handle, str_error(ret));
     86        usb_log_info("Memory mapped regs at 0x%" PRIxn " (size %zu), IRQ %d.\n",
    8687            mem_reg_base, mem_reg_size, irq);
    8788
     
    102103            str_error(ret));
    103104
    104         usb_log_info("Controlling new EHCI device `%s' (handle %llu).\n",
     105        usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n",
    105106            device->name, device->handle);
    106107
  • uspace/drv/ehci-hcd/pci.c

    r618f9ed r44b1674  
    117117                                mem_address = res->res.mem_range.address;
    118118                                mem_size = res->res.mem_range.size;
    119                                 usb_log_debug2("Found mem: %llx %zu.\n",
     119                                usb_log_debug2("Found mem: %" PRIxn" %zu.\n",
    120120                                    mem_address, mem_size);
    121121                                mem_found = true;
     
    186186        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read PCI config space.\n",
    187187            ret);
    188         usb_log_info("Register space BAR at %p:%x.\n", address, value);
     188        usb_log_info("Register space BAR at %p:%" PRIxn ".\n", (void *) address, value);
    189189
    190190        /* clear lower byte, it's not part of the BASE address */
    191191        uintptr_t registers = (value & 0xffffff00);
    192         usb_log_info("Memory registers BASE address:%p.\n", registers);
     192        usb_log_info("Memory registers BASE address:%p.\n", (void *) registers);
    193193
    194194        /* if nothing setup the hc, we don't need to turn it off */
     
    201201            AS_AREA_READ | AS_AREA_WRITE);
    202202        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to map registers %p:%p.\n",
    203             ret, regs, registers);
     203            ret, regs, (void *) registers);
    204204
    205205        /* calculate value of BASE */
     
    221221            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value);
    222222        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGCTLSTS.\n", ret);
    223         usb_log_debug("USBLEGCTLSTS: %x.\n", value);
     223        usb_log_debug("USBLEGCTLSTS: %" PRIxn ".\n", value);
    224224
    225225        /* Read the first EEC. i.e. Legacy Support register */
     
    228228            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value);
    229229        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
    230         usb_log_debug2("USBLEGSUP: %x.\n", value);
     230        usb_log_debug2("USBLEGSUP: %" PRIxn ".\n", value);
    231231
    232232        /* Request control from firmware/BIOS, by writing 1 to highest byte.
     
    248248
    249249        if ((value & USBLEGSUP_BIOS_CONTROL) == 0) {
    250                 usb_log_info("BIOS released control after %d usec.\n", wait);
     250                usb_log_info("BIOS released control after %zu usec.\n", wait);
    251251        } else {
    252252                /* BIOS failed to hand over control, this should not happen. */
    253253                usb_log_warning( "BIOS failed to release control after "
    254                     "%d usecs, force it.\n", wait);
     254                    "%zu usecs, force it.\n", wait);
    255255                ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
    256256                    IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGSUP_OFFSET,
     
    271271            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value);
    272272        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGCTLSTS.\n", ret);
    273         usb_log_debug2("USBLEGCTLSTS: %x.\n", value);
     273        usb_log_debug2("USBLEGCTLSTS: %" PRIxn ".\n", value);
    274274
    275275        /* Read again Legacy Support register */
     
    277277            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value);
    278278        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
    279         usb_log_debug2("USBLEGSUP: %x.\n", value);
     279        usb_log_debug2("USBLEGSUP: %" PRIxn ".\n", value);
    280280
    281281        /*
  • uspace/drv/ohci/batch.c

    r618f9ed r44b1674  
    141141        assert(data);
    142142        size_t tds = data->td_count;
    143         usb_log_debug("Batch(%p) checking %d td(s) for completion.\n",
     143        usb_log_debug("Batch(%p) checking %zu td(s) for completion.\n",
    144144            instance, tds);
    145145        usb_log_debug("ED: %x:%x:%x:%x.\n",
     
    147147            data->ed->next);
    148148        size_t i = 0;
     149        instance->transfered_size = instance->buffer_size;
    149150        for (; i < tds; ++i) {
    150151                assert(data->tds[i] != NULL);
    151                 usb_log_debug("TD %d: %x:%x:%x:%x.\n", i,
     152                usb_log_debug("TD %zu: %x:%x:%x:%x.\n", i,
    152153                    data->tds[i]->status, data->tds[i]->cbp, data->tds[i]->next,
    153154                    data->tds[i]->be);
     
    156157                }
    157158                instance->error = td_error(data->tds[i]);
    158                 /* FIXME: calculate real transfered size */
    159                 instance->transfered_size = instance->buffer_size;
    160159                if (instance->error != EOK) {
    161                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
     160                        usb_log_debug("Batch(%p) found error TD(%zu):%x.\n",
    162161                            instance, i, data->tds[i]->status);
    163162                        /* Make sure TD queue is empty (one TD),
     
    174173        assert(hcd_ep);
    175174        hcd_ep->td = data->tds[i];
     175        if (i > 0)
     176                instance->transfered_size -= td_remain_size(data->tds[i - 1]);
     177
    176178        /* Clear possible ED HALT */
    177179        data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
     
    238240{
    239241        assert(instance);
    240         instance->next_step = usb_transfer_batch_call_in_and_dispose;
     242        /* We are data out, we are supposed to provide data */
     243        memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
     244        instance->next_step = usb_transfer_batch_call_out_and_dispose;
    241245        batch_data(instance);
    242         usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
     246        usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
    243247}
    244248/*----------------------------------------------------------------------------*/
  • uspace/drv/ohci/endpoint_list.c

    r618f9ed r44b1674  
    5555        }
    5656        instance->list_head_pa = addr_to_phys(instance->list_head);
    57         usb_log_debug2("Transfer list %s setup with ED: %p(%p).\n",
     57        usb_log_debug2("Transfer list %s setup with ED: %p(0x%0" PRIx32 ")).\n",
    5858            name, instance->list_head, instance->list_head_pa);
    5959
     
    121121                hcd_ep, instance->name, first, first->ed);
    122122        if (last_ed == instance->list_head) {
    123                 usb_log_debug2("%s head ED(%p-%p): %x:%x:%x:%x.\n",
     123                usb_log_debug2("%s head ED(%p-0x%0" PRIx32 "): %x:%x:%x:%x.\n",
    124124                    instance->name, last_ed, instance->list_head_pa,
    125125                    last_ed->status, last_ed->td_tail, last_ed->td_head,
  • uspace/drv/ohci/hc.c

    r618f9ed r44b1674  
    113113            BANDWIDTH_AVAILABLE_USB11);
    114114        CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
    115             ret, str_error(ret));
     115            str_error(ret));
    116116
    117117        hc_gain_control(instance);
    118118        ret = hc_init_memory(instance);
    119         CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures:%s.\n",
    120             ret, str_error(ret));
     119        CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
     120            str_error(ret));
    121121        hc_init_hw(instance);
    122122        fibril_mutex_initialize(&instance->guard);
     
    294294        if (status & IS_WDH) {
    295295                fibril_mutex_lock(&instance->guard);
    296                 usb_log_debug2("HCCA: %p-%p(%p).\n", instance->hcca,
    297                     instance->registers->hcca, addr_to_phys(instance->hcca));
    298                 usb_log_debug2("Periodic current: %p.\n",
     296                usb_log_debug2("HCCA: %p-%#" PRIx32 " (%p).\n", instance->hcca,
     297                    instance->registers->hcca,
     298                    (void *) addr_to_phys(instance->hcca));
     299                usb_log_debug2("Periodic current: %#" PRIx32 ".\n",
    299300                    instance->registers->periodic_current);
    300301
     
    405406        instance->registers->bulk_head =
    406407            instance->lists[USB_TRANSFER_BULK].list_head_pa;
    407         usb_log_debug2("Bulk HEAD set to: %p(%p).\n",
     408        usb_log_debug2("Bulk HEAD set to: %p (%#" PRIx32 ").\n",
    408409            instance->lists[USB_TRANSFER_BULK].list_head,
    409410            instance->lists[USB_TRANSFER_BULK].list_head_pa);
     
    411412        instance->registers->control_head =
    412413            instance->lists[USB_TRANSFER_CONTROL].list_head_pa;
    413         usb_log_debug2("Control HEAD set to: %p(%p).\n",
     414        usb_log_debug2("Control HEAD set to: %p (%#" PRIx32 ").\n",
    414415            instance->lists[USB_TRANSFER_CONTROL].list_head,
    415416            instance->lists[USB_TRANSFER_CONTROL].list_head_pa);
     
    487488                    instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa;
    488489        }
    489         usb_log_debug2("Interrupt HEADs set to: %p(%p).\n",
     490        usb_log_debug2("Interrupt HEADs set to: %p (%#" PRIx32 ").\n",
    490491            instance->lists[USB_TRANSFER_INTERRUPT].list_head,
    491492            instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa);
  • uspace/drv/ohci/hw_struct/transfer_descriptor.c

    r618f9ed r44b1674  
    5252                instance->status |= togg[toggle] << TD_STATUS_T_SHIFT;
    5353        }
     54        if (dir == USB_DIRECTION_IN) {
     55                instance->status |= TD_STATUS_ROUND_FLAG;
     56        }
    5457        if (buffer != NULL) {
    5558                assert(size != 0);
  • uspace/drv/ohci/hw_struct/transfer_descriptor.h

    r618f9ed r44b1674  
    5959#define TD_STATUS_T_0 (0x2)
    6060#define TD_STATUS_T_1 (0x3)
     61#define TD_STATUS_T_ED (0)
    6162#define TD_STATUS_EC_MASK (0x3) /* error count */
    6263#define TD_STATUS_EC_SHIFT (26)
     
    102103        return cc_to_rc(cc);
    103104}
     105
     106static inline size_t td_remain_size(td_t *instance)
     107{
     108        assert(instance);
     109        if (instance->cbp == 0)
     110                return 0;
     111        return instance->be - instance->cbp + 1;
     112}
    104113#endif
    105114/**
  • uspace/drv/ohci/iface.c

    r618f9ed r44b1674  
    118118        hc_t *hc = fun_to_hc(fun);
    119119        assert(hc);
    120         usb_log_debug("Address bind %d-%d.\n", address, handle);
     120        usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
    121121        usb_device_keeper_bind(&hc->manager, address, handle);
    122122        return EOK;
  • uspace/drv/ohci/ohci.c

    r618f9ed r44b1674  
    148148            pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq);
    149149        CHECK_RET_DEST_FUN_RETURN(ret,
    150             "Failed(%d) to get memory addresses:.\n", ret, device->handle);
    151         usb_log_debug("Memory mapped regs at 0x%X (size %zu), IRQ %d.\n",
    152             mem_reg_base, mem_reg_size, irq);
     150            "Failed to get memory addresses for %" PRIun ": %s.\n",
     151            device->handle, str_error(ret));
     152        usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
     153            (void *) mem_reg_base, mem_reg_size, irq);
    153154
    154155        ret = pci_disable_legacy(device);
  • uspace/drv/ohci/pci.c

    r618f9ed r44b1674  
    117117                                mem_address = res->res.mem_range.address;
    118118                                mem_size = res->res.mem_range.size;
    119                                 usb_log_debug2("Found mem: %llx %zu.\n",
    120                                     mem_address, mem_size);
     119                                usb_log_debug2("Found mem: %p %zu.\n",
     120                                    (void *) mem_address, mem_size);
    121121                                mem_found = true;
    122122                                }
  • uspace/drv/uhci-hcd/batch.c

    r618f9ed r44b1674  
    162162        assert(data);
    163163
    164         usb_log_debug2("Batch(%p) checking %d transfer(s) for completion.\n",
     164        usb_log_debug2("Batch(%p) checking %zu transfer(s) for completion.\n",
    165165            instance, data->td_count);
    166166        instance->transfered_size = 0;
     
    173173                instance->error = td_status(&data->tds[i]);
    174174                if (instance->error != EOK) {
    175                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
     175                        usb_log_debug("Batch(%p) found error TD(%zu):%" PRIx32 ".\n",
    176176                            instance, i, data->tds[i].status);
    177177                        td_print_status(&data->tds[i]);
  • uspace/drv/uhci-hcd/hc.c

    r618f9ed r44b1674  
    101101            ret, io, str_error(ret));
    102102        instance->registers = io;
    103         usb_log_debug("Device registers at %p(%u) accessible.\n",
     103        usb_log_debug("Device registers at %p (%zuB) accessible.\n",
    104104            io, reg_size);
    105105
     
    423423                if (frame_list != addr_to_phys(instance->frame_list)) {
    424424                        usb_log_debug("Framelist address: %p vs. %p.\n",
    425                             frame_list, addr_to_phys(instance->frame_list));
     425                            (void *) frame_list,
     426                            (void *) addr_to_phys(instance->frame_list));
    426427                }
    427428
     
    432433                uintptr_t real_pa = addr_to_phys(QH(interrupt));
    433434                if (expected_pa != real_pa) {
    434                         usb_log_debug("Interrupt QH: %p(frame: %d) vs. %p.\n",
    435                             expected_pa, frnum, real_pa);
     435                        usb_log_debug("Interrupt QH: %p (frame %d) vs. %p.\n",
     436                            (void *) expected_pa, frnum, (void *) real_pa);
    436437                }
    437438
     
    440441                if (expected_pa != real_pa) {
    441442                        usb_log_debug("Control Slow QH: %p vs. %p.\n",
    442                             expected_pa, real_pa);
     443                            (void *) expected_pa, (void *) real_pa);
    443444                }
    444445
     
    447448                if (expected_pa != real_pa) {
    448449                        usb_log_debug("Control Full QH: %p vs. %p.\n",
    449                             expected_pa, real_pa);
     450                            (void *) expected_pa, (void *) real_pa);
    450451                }
    451452
     
    454455                if (expected_pa != real_pa ) {
    455456                        usb_log_debug("Bulk QH: %p vs. %p.\n",
    456                             expected_pa, real_pa);
     457                            (void *) expected_pa, (void *) real_pa);
    457458                }
    458459                async_usleep(UHCI_DEBUGER_TIMEOUT);
  • uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.c

    r618f9ed r44b1674  
    154154        assert(instance);
    155155        const uint32_t s = instance->status;
    156         usb_log_debug2("TD(%p) status(%#x):%s %d,%s%s%s%s%s%s%s%s%s%s%s %d.\n",
     156        usb_log_debug2("TD(%p) status(%#" PRIx32 "):%s %d,%s%s%s%s%s%s%s%s%s%s%s %zu.\n",
    157157            instance, instance->status,
    158158            (s & TD_STATUS_SPD_FLAG) ? " SPD," : "",
  • uspace/drv/uhci-hcd/iface.c

    r618f9ed r44b1674  
    118118        hc_t *hc = fun_to_hc(fun);
    119119        assert(hc);
    120         usb_log_debug("Address bind %d-%d.\n", address, handle);
     120        usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
    121121        usb_device_keeper_bind(&hc->manager, address, handle);
    122122        return EOK;
  • uspace/drv/uhci-hcd/main.c

    r618f9ed r44b1674  
    7272        int ret = uhci_init(uhci, device);
    7373        if (ret != EOK) {
    74                 usb_log_error("Failed(%d) to initialize UHCI driver: %s.\n",
    75                     ret, str_error(ret));
     74                usb_log_error("Failed to initialize UHCI driver: %s.\n",
     75                    str_error(ret));
    7676                return ret;
    7777        }
  • uspace/drv/uhci-hcd/pci.c

    r618f9ed r44b1674  
    9090                        io_address = res->res.io_range.address;
    9191                        io_size = res->res.io_range.size;
    92                         usb_log_debug2("Found io: %llx %zu.\n",
     92                        usb_log_debug2("Found io: %" PRIx64" %zu.\n",
    9393                            res->res.io_range.address, res->res.io_range.size);
    9494                        io_found = true;
  • uspace/drv/uhci-hcd/transfer_list.c

    r618f9ed r44b1674  
    5858        }
    5959        uint32_t queue_head_pa = addr_to_phys(instance->queue_head);
    60         usb_log_debug2("Transfer list %s setup with QH: %p(%p).\n",
     60        usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32" ).\n",
    6161            name, instance->queue_head, queue_head_pa);
    6262
  • uspace/drv/uhci-hcd/uhci.c

    r618f9ed r44b1674  
    168168            pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
    169169        CHECK_RET_DEST_FUN_RETURN(ret,
    170             "Failed(%d) to get I/O addresses:.\n", ret, device->handle);
    171         usb_log_debug("I/O regs at 0x%X (size %zu), IRQ %d.\n",
    172             io_reg_base, io_reg_size, irq);
     170            "Failed to get I/O addresses for %" PRIun ": %s.\n",
     171            device->handle, str_error(ret));
     172        usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
     173            (void *) io_reg_base, io_reg_size, irq);
    173174
    174175        ret = pci_disable_legacy(device);
  • uspace/drv/uhci-rhd/main.c

    r618f9ed r44b1674  
    11/*
    2  * Copyright (c) 2011 Vojtech Horky, Jan Vesely
     2 * Copyright (c) 2011 Jan Vesely
    33 * All rights reserved.
    44 *
     
    8484                return EINVAL;
    8585
    86         usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
     86        usb_log_debug2("uhci_rh_add_device(handle=%" PRIun ")\n",
     87            device->handle);
    8788
    8889        uintptr_t io_regs = 0;
     
    101102        ret = hc_get_my_registers(device, &io_regs, &io_size);
    102103        CHECK_RET_FREE_RH_RETURN(ret,
    103             "Failed(%d) to get registers from HC: %s.\n", ret, str_error(ret));
    104         usb_log_debug("I/O regs at %#x (size %zu).\n", io_regs, io_size);
     104            "Failed to get registers from HC: %s.\n", str_error(ret));
     105        usb_log_debug("I/O regs at %p (size %zuB).\n",
     106            (void *) io_regs, io_size);
    105107
    106108        rh = malloc(sizeof(uhci_root_hub_t));
     
    115117
    116118        device->driver_data = rh;
    117         usb_log_info("Controlling root hub '%s' (%llu).\n",
     119        usb_log_info("Controlling root hub '%s' (%" PRIun ").\n",
    118120            device->name, device->handle);
    119121        return EOK;
  • uspace/drv/uhci-rhd/port.c

    r618f9ed r44b1674  
    8989{
    9090        assert(port);
    91         asprintf(&port->id_string, "Port (%p - %d)", port, number);
     91        asprintf(&port->id_string, "Port (%p - %u)", port, number);
    9292        if (port->id_string == NULL) {
    9393                return ENOMEM;
     
    115115
    116116        fibril_add_ready(port->checker);
    117         usb_log_debug("%s: Started polling fibril(%x).\n",
     117        usb_log_debug("%s: Started polling fibril (%" PRIun ").\n",
    118118            port->id_string, port->checker);
    119119        return EOK;
     
    267267        }
    268268
    269         usb_log_info("New device at port %u, address %d (handle %llu).\n",
     269        usb_log_info("New device at port %u, address %d (handle %" PRIun ").\n",
    270270            port->number, dev_addr, port->attached_device);
    271271        return EOK;
     
    283283int uhci_port_remove_device(uhci_port_t *port)
    284284{
    285         usb_log_error("%s: Don't know how to remove device %llu.\n",
     285        usb_log_error("%s: Don't know how to remove device %" PRIun ".\n",
    286286            port->id_string, port->attached_device);
    287287        return ENOTSUP;
  • uspace/drv/usbflbk/main.c

    r618f9ed r44b1674  
    6565
    6666        usb_log_info("Pretending to control %s `%s'" \
    67             " (node `%s', handle %llu).\n",
     67            " (node `%s', handle %" PRIun ").\n",
    6868            dev->interface_no < 0 ? "device" : "interface",
    6969            dev->ddf_dev->name, fun_name, dev->ddf_dev->handle);
  • uspace/drv/usbhid/Makefile

    r618f9ed r44b1674  
    4646        generic/hiddev.c \
    4747        mouse/mousedev.c \
     48        lgtch-ultrax/lgtch-ultrax.c \
    4849        $(STOLEN_LAYOUT_SOURCES)
    4950
  • uspace/drv/usbhid/kbd/kbddev.c

    r618f9ed r44b1674  
    176176
    177177/*----------------------------------------------------------------------------*/
     178
     179static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
     180    uint8_t report_id, void *arg);
     181
     182static const usb_hid_report_in_callbacks_t usb_kbd_parser_callbacks = {
     183        .keyboard = usb_kbd_process_keycodes
     184};
     185
     186/*----------------------------------------------------------------------------*/
    178187/* Keyboard layouts                                                           */
    179188/*----------------------------------------------------------------------------*/
     
    598607       
    599608        if (count != kbd_dev->key_count) {
    600                 usb_log_warning("Number of received keycodes (%d) differs from"
    601                     " expected number (%d).\n", count, kbd_dev->key_count);
     609                usb_log_warning("Number of received keycodes (%zu) differs from"
     610                    " expected (%zu).\n", count, kbd_dev->key_count);
    602611                return;
    603612        }
     
    630639{
    631640        assert(hid_dev->parser != NULL);
    632        
    633         usb_hid_report_in_callbacks_t *callbacks =
    634             (usb_hid_report_in_callbacks_t *)malloc(
    635                 sizeof(usb_hid_report_in_callbacks_t));
    636        
    637         callbacks->keyboard = usb_kbd_process_keycodes;
    638641
    639642        usb_log_debug("Calling usb_hid_parse_report() with "
     
    644647        usb_hid_report_path_t *path = usb_hid_report_path();
    645648        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
    646         usb_hid_report_path_set_report_id(path, 0);
     649        //usb_hid_report_path_set_report_id(path, 0);
    647650       
    648651        int rc = usb_hid_parse_report(hid_dev->parser, buffer,
    649652            actual_size, path,
    650653            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
    651             callbacks, hid_dev);
     654            &usb_kbd_parser_callbacks, hid_dev);
    652655
    653656        usb_hid_report_path_free(path);
  • uspace/drv/usbhid/main.c

    r618f9ed r44b1674  
    7575static int usb_hid_try_add_device(usb_device_t *dev)
    7676{
     77        assert(dev != NULL);
     78       
    7779        /*
    7880         * Initialize device (get and process descriptors, get address, etc.)
     
    178180        usb_log_debug("usb_hid_add_device()\n");
    179181       
     182        if (dev == NULL) {
     183                usb_log_warning("Wrong parameter given for add_device().\n");
     184                return EINVAL;
     185        }
     186       
    180187        if (dev->interface_no < 0) {
    181188                usb_log_warning("Device is not a supported HID device.\n");
  • uspace/drv/usbhid/mouse/mousedev.c

    r618f9ed r44b1674  
    157157static void usb_mouse_free(usb_mouse_t **mouse_dev)
    158158{
    159         if (mouse_dev == NULL || *mouse_dev == NULL) {
    160                 return;
    161         }
     159        assert(mouse_dev != NULL && *mouse_dev != NULL);
    162160       
    163161        // hangup phone to the console
    164         async_hangup((*mouse_dev)->console_phone);
     162        if ((*mouse_dev)->console_phone >= 0) {
     163                async_hangup((*mouse_dev)->console_phone);
     164        }
    165165       
    166166        free(*mouse_dev);
  • uspace/drv/usbhid/subdrivers.c

    r618f9ed r44b1674  
    3737#include "usb/classes/hidut.h"
    3838
    39 static usb_hid_subdriver_usage_t path_kbd[] = {{USB_HIDUT_PAGE_KEYBOARD, 0}};
     39#include "lgtch-ultrax/lgtch-ultrax.h"
     40
     41static usb_hid_subdriver_usage_t path_kbd[] = {
     42        {USB_HIDUT_PAGE_KEYBOARD, 0},
     43        {0, 0}
     44};
     45
     46static usb_hid_subdriver_usage_t lgtch_path[] = {
     47        {0xc, 0},
     48        {0, 0}
     49};
    4050
    4151const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
    4252        {
    4353                path_kbd,
     54                -1,
     55                USB_HID_PATH_COMPARE_END
     56                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
     57                0,
     58                0,
     59                {
     60                        .init = usb_kbd_init,
     61                        .deinit = usb_kbd_deinit,
     62                        .poll = usb_kbd_polling_callback,
     63                        .poll_end = NULL
     64                },
     65               
     66        },
     67        {
     68                lgtch_path,
    4469                1,
    4570                USB_HID_PATH_COMPARE_END
    4671                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
    47                 NULL,
    48                 NULL,
     72                0x046d,
     73                0xc30e,
    4974                {
    50                         usb_kbd_init,
    51                         usb_kbd_deinit,
    52                         usb_kbd_polling_callback,
    53                         NULL
    54                 },
    55                
     75                        .init = NULL,
     76                        .deinit = NULL,
     77                        .poll = usb_lgtch_polling_callback,
     78                        .poll_end = NULL
     79                }
    5680        },
    57         {NULL, 0, 0, NULL, NULL, {NULL, NULL, NULL, NULL}}
     81        {NULL, -1, 0, 0, 0, {NULL, NULL, NULL, NULL}}
    5882};
    5983
  • uspace/drv/usbhid/subdrivers.h

    r618f9ed r44b1674  
    5454typedef struct usb_hid_subdriver_mapping {
    5555        const usb_hid_subdriver_usage_t *usage_path;
    56         int path_size;
     56        int report_id;
    5757        int compare;
    58         const char *vendor_id;
    59         const char *product_id;
     58        uint16_t vendor_id;
     59        uint16_t product_id;
    6060        usb_hid_subdriver_t subdriver;
    6161} usb_hid_subdriver_mapping_t;
  • uspace/drv/usbhid/usbhid.c

    r618f9ed r44b1674  
    6767static int usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
    6868{
    69         assert(hid_dev->subdriver_count == 0);
     69        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
    7070       
    7171        hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
     
    9797static int usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
    9898{
    99         assert(hid_dev->subdriver_count == 0);
     99        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
    100100       
    101101        hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
     
    127127static int usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
    128128{
    129         assert(hid_dev->subdriver_count == 0);
     129        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
    130130       
    131131        hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
     
    164164
    165165static bool usb_hid_path_matches(usb_hid_dev_t *hid_dev,
    166     const usb_hid_subdriver_usage_t *path, int path_size, int compare)
     166    const usb_hid_subdriver_mapping_t *mapping)
    167167{
    168168        assert(hid_dev != NULL);
    169         assert(path != NULL);
     169        assert(mapping != NULL);
    170170       
    171171        usb_hid_report_path_t *usage_path = usb_hid_report_path();
     
    174174                return false;
    175175        }
    176         int i;
    177         for (i = 0; i < path_size; ++i) {
     176        int i = 0;
     177        while (mapping->usage_path[i].usage != 0
     178            || mapping->usage_path[i].usage_page != 0) {
    178179                if (usb_hid_report_path_append_item(usage_path,
    179                     path[i].usage_page, path[i].usage) != EOK) {
     180                    mapping->usage_path[i].usage_page,
     181                    mapping->usage_path[i].usage) != EOK) {
    180182                        usb_log_debug("Failed to append to usage path.\n");
    181183                        usb_hid_report_path_free(usage_path);
    182184                        return false;
    183185                }
     186                ++i;
     187        }
     188       
     189        if (mapping->report_id >= 0) {
     190                usb_hid_report_path_set_report_id(usage_path,
     191                    mapping->report_id);
    184192        }
    185193       
    186194        assert(hid_dev->parser != NULL);
    187195       
    188         usb_log_debug("Compare flags: %d\n", compare);
     196        usb_log_debug("Compare flags: %d\n", mapping->compare);
    189197        size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path,
    190             compare);
    191         usb_log_debug("Size of the input report: %d\n", size);
     198            mapping->compare);
     199        usb_log_debug("Size of the input report: %zuB\n", size);
    192200       
    193201        usb_hid_report_path_free(usage_path);
     
    231239static int usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
    232240{
     241        assert(hid_dev != NULL);
     242       
    233243        const usb_hid_subdriver_t *subdrivers[USB_HID_MAX_SUBDRIVERS];
    234244       
    235245        int i = 0, count = 0;
    236246        const usb_hid_subdriver_mapping_t *mapping = &usb_hid_subdrivers[i];
     247
     248        bool ids_matched;
     249        bool matched;
    237250       
    238251        while (count < USB_HID_MAX_SUBDRIVERS &&
    239252            (mapping->usage_path != NULL
    240             || mapping->vendor_id != NULL
    241             || mapping->product_id != NULL)) {
     253            || mapping->vendor_id != 0 || mapping->product_id != 0)) {
    242254                // check the vendor & product ID
    243                 if (mapping->vendor_id != NULL && mapping->product_id == NULL) {
    244                         usb_log_warning("Missing Product ID for Vendor ID %s\n",
     255                if (mapping->vendor_id != 0 && mapping->product_id == 0) {
     256                        usb_log_warning("Missing Product ID for Vendor ID %u\n",
    245257                            mapping->vendor_id);
    246258                        return EINVAL;
    247259                }
    248                 if (mapping->product_id != NULL && mapping->vendor_id == NULL) {
    249                         usb_log_warning("Missing Vendor ID for Product ID %s\n",
     260                if (mapping->product_id != 0 && mapping->vendor_id == 0) {
     261                        usb_log_warning("Missing Vendor ID for Product ID %u\n",
    250262                            mapping->product_id);
    251263                        return EINVAL;
    252264                }
    253265               
    254                 if (mapping->vendor_id != NULL) {
    255                         assert(mapping->product_id != NULL);
    256                         usb_log_debug("Comparing device against vendor ID %s"
    257                             " and product ID %s.\n", mapping->vendor_id,
     266                ids_matched = false;
     267                matched = false;
     268               
     269                if (mapping->vendor_id != 0) {
     270                        assert(mapping->product_id != 0);
     271                        usb_log_debug("Comparing device against vendor ID %u"
     272                            " and product ID %u.\n", mapping->vendor_id,
    258273                            mapping->product_id);
    259274                        if (usb_hid_ids_match(hid_dev, mapping)) {
    260                                 usb_log_debug("Matched.\n");
    261                                 subdrivers[count++] = &mapping->subdriver;
    262                                 // skip the checking of usage path
    263                                 goto next;
     275                                usb_log_debug("IDs matched.\n");
     276                                ids_matched = true;
    264277                        }
    265278                }
     
    267280                if (mapping->usage_path != NULL) {
    268281                        usb_log_debug("Comparing device against usage path.\n");
    269                         if (usb_hid_path_matches(hid_dev,
    270                             mapping->usage_path, mapping->path_size,
    271                             mapping->compare)) {
    272                                 subdrivers[count++] = &mapping->subdriver;
    273                         } else {
    274                                 usb_log_debug("Not matched.\n");
     282                        if (usb_hid_path_matches(hid_dev, mapping)) {
     283                                // does not matter if IDs were matched
     284                                matched = true;
    275285                        }
    276                 }
    277         next:
     286                } else {
     287                        // matched only if IDs were matched and there is no path
     288                        matched = ids_matched;
     289                }
     290               
     291                if (matched) {
     292                        subdrivers[count++] = &mapping->subdriver;
     293                }
     294               
    278295                mapping = &usb_hid_subdrivers[++i];
    279296        }
     
    287304static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
    288305{
     306        assert(hid_dev != NULL && dev != NULL);
     307       
    289308        int rc = EOK;
    290309       
  • uspace/drv/usbhub/ports.c

    r618f9ed r44b1674  
    8383void usb_hub_process_interrupt(usb_hub_info_t * hub,
    8484        uint16_t port) {
    85         usb_log_debug("interrupt at port %d\n", port);
     85        usb_log_debug("interrupt at port %zu\n", (size_t) port);
    8686        //determine type of change
    8787        //usb_pipe_t *pipe = hub->control_pipe;
     
    9393        if (opResult != EOK) {
    9494                usb_log_error("Failed to get port %zu status: %s.\n",
    95                     port, str_error(opResult));
     95                    (size_t) port, str_error(opResult));
    9696                return;
    9797        }
     
    100100                bool device_connected = usb_port_is_status(status,
    101101                    USB_HUB_FEATURE_PORT_CONNECTION);
    102                 usb_log_debug("Connection change on port %zu: %s.\n", port,
     102                usb_log_debug("Connection change on port %zu: %s.\n",
     103                    (size_t) port,
    103104                    device_connected ? "device attached" : "device removed");
    104105
     
    109110                                usb_log_error(
    110111                                    "Cannot handle change on port %zu: %s.\n",
    111                                     str_error(opResult));
     112                                    (size_t) port, str_error(opResult));
    112113                        }
    113114                } else {
     
    210211static void usb_hub_port_reset_completed(usb_hub_info_t * hub,
    211212        uint16_t port, uint32_t status){
    212         usb_log_debug("Port %zu reset complete.\n", port);
     213        usb_log_debug("Port %zu reset complete.\n", (size_t) port);
    213214        if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_ENABLE)) {
    214215                /* Finalize device adding. */
     
    222223                usb_log_warning(
    223224                    "Port %zu reset complete but port not enabled.\n",
    224                     port);
     225                    (size_t) port);
    225226        }
    226227}
  • uspace/drv/usbhub/usbhub.c

    r618f9ed r44b1674  
    260260                                    port+1, USB_HUB_FEATURE_PORT_POWER);
    261261                                if (opResult != EOK) {
    262                                         usb_log_error("cannot power on port %d;  %d\n",
    263                                             port+1, opResult);
     262                                        usb_log_error("cannot power on port %zu: %s.\n",
     263                                            port+1, str_error(opResult));
    264264                                }
    265265                        }
     
    269269                            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
    270270                        if (opResult != EOK) {
    271                                 usb_log_error("cannot power hub;  %d\n",
    272                                   opResult);
     271                                usb_log_error("cannot power hub: %s\n",
     272                                    str_error(opResult));
    273273                        }
    274274                }
     
    356356        }
    357357
    358         usb_log_info("Controlling hub `%s' (%d ports).\n",
     358        usb_log_info("Controlling hub `%s' (%zu ports).\n",
    359359            hub_info->usb_device->ddf_dev->name, hub_info->port_count);
    360360        return EOK;
     
    424424                            port, USB_HUB_FEATURE_PORT_POWER);
    425425                        if (opResult != EOK) {
    426                                 usb_log_error("cannot power on port %d;  %d\n",
    427                                     port, opResult);
     426                                usb_log_error("Cannot power on port %zu: %s.\n",
     427                                    port, str_error(opResult));
    428428                        }
    429429                }
  • uspace/drv/usbkbd/kbddev.c

    r618f9ed r44b1674  
    567567       
    568568        if (count != kbd_dev->key_count) {
    569                 usb_log_warning("Number of received keycodes (%d) differs from"
    570                     " expected number (%d).\n", count, kbd_dev->key_count);
     569                usb_log_warning("Number of received keycodes (%zu) differs from"
     570                    " expected (%zu).\n", count, kbd_dev->key_count);
    571571                return;
    572572        }
  • uspace/drv/usbmid/main.c

    r618f9ed r44b1674  
    5353        usb_log_info("Taking care of new MID `%s'.\n", dev->ddf_dev->name);
    5454
    55         int rc;
    56 
    57         rc = usb_pipe_start_long_transfer(&dev->ctrl_pipe);
    58         if (rc != EOK) {
    59                 usb_log_error("Failed to start transfer on control pipe: %s.\n",
    60                     str_error(rc));
    61                 return rc;
    62         }
     55        usb_pipe_start_long_transfer(&dev->ctrl_pipe);
    6356
    6457        bool accept = usbmid_explore_device(dev);
  • uspace/drv/usbmouse/init.c

    r618f9ed r44b1674  
    125125        }
    126126       
    127         /* Open the control pipe. */
    128         rc = usb_pipe_start_session(&dev->ctrl_pipe);
    129         if (rc != EOK) {
    130                 goto leave;
    131         }
    132        
    133127        /* Set the boot protocol. */
    134128        rc = usb_control_request_set(&dev->ctrl_pipe,
     
    140134        }
    141135       
    142         /* Close the control pipe (ignore errors). */
    143         usb_pipe_end_session(&dev->ctrl_pipe);
    144 
    145 
    146         /* Everything allright. */
     136        /* Everything all right. */
    147137        dev->driver_data = mouse;
    148138        mouse->mouse_fun->driver_data = mouse;
  • uspace/drv/usbmouse/main.c

    r618f9ed r44b1674  
    5454        }
    5555
    56         usb_log_debug("Polling pipe at endpoint %d.\n", dev->pipes[0].pipe->endpoint_no);
     56        usb_log_debug("Polling pipe at endpoint %d.\n",
     57            dev->pipes[0].pipe->endpoint_no);
    5758
    5859        rc = usb_device_auto_poll(dev, 0,
     
    6667        }
    6768
    68         usb_log_info("controlling new mouse (handle %llu).\n",
     69        usb_log_info("controlling new mouse (handle %" PRIun ").\n",
    6970            dev->ddf_dev->handle);
    7071
  • uspace/drv/vhc/conndev.c

    r618f9ed r44b1674  
    9999                int rc = get_device_name(callback, devname, DEVICE_NAME_MAXLENGTH);
    100100
    101                 usb_log_info("New virtual device `%s' (id = %x).\n",
     101                usb_log_info("New virtual device `%s' (id = %" PRIxn ").\n",
    102102                    rc == EOK ? devname : "<unknown>", dev->id);
    103103
     
    122122        }
    123123
    124         usb_log_info("Virtual device disconnected (id = %x).\n", dev->id);
     124        usb_log_info("Virtual device disconnected (id = %" PRIxn ").\n",
     125            dev->id);
    125126        virtdev_destroy_device(dev);
    126127}
  • uspace/lib/c/include/ipc/dev_iface.h

    r618f9ed r44b1674  
    4545        /** Interface provided by USB host controller. */
    4646        USBHC_DEV_IFACE,
     47        /** Interface provided by USB HID devices. */
     48        USBHID_DEV_IFACE,
    4749
    4850        DEV_IFACE_MAX
  • uspace/lib/drv/generic/dev_iface.c

    r618f9ed r44b1674  
    4343#include "remote_usb.h"
    4444#include "remote_usbhc.h"
     45#include "remote_usbhid.h"
    4546#include "remote_pci.h"
    4647
     
    5152                &remote_pci_iface,
    5253                &remote_usb_iface,
    53                 &remote_usbhc_iface
     54                &remote_usbhc_iface,
     55                &remote_usbhid_iface
    5456        }
    5557};
  • uspace/lib/usb/Makefile

    r618f9ed r44b1674  
    4242        src/dp.c \
    4343        src/dump.c \
     44        src/hidiface.c \
    4445        src/hidparser.c \
    4546        src/hub.c \
  • uspace/lib/usb/include/usb/debug.h

    r618f9ed r44b1674  
    3636#define LIBUSB_DEBUG_H_
    3737#include <stdio.h>
     38#include <inttypes.h>
    3839#include <usb/usb.h>
    3940#include <assert.h>
     
    8586void usb_log_enable(usb_log_level_t, const char *);
    8687
    87 void usb_log_printf(usb_log_level_t, const char *, ...);
     88void usb_log_printf(usb_log_level_t, const char *, ...)
     89        PRINTF_ATTRIBUTE(2, 3);
    8890
    8991/** Log fatal error. */
  • uspace/lib/usb/include/usb/pipes.h

    r618f9ed r44b1674  
    9999        /** Number of active transfers over the pipe. */
    100100        int refcount;
     101        /** Number of failed attempts to open the HC phone.
     102         * When user requests usb_pipe_start_long_transfer() and the operation
     103         * fails, there is no way to report this to the user.
     104         * That the soft reference counter is increased to record the attempt.
     105         * When the user then request e.g. usb_pipe_read(), it will try to
     106         * add reference as well.
     107         * If that fails, it is reported to the user. If it is okay, the
     108         * real reference counter is incremented.
     109         * The problem might arise when ending the long transfer (since
     110         * the number of references would be only 1, but logically it shall be
     111         * two).
     112         * Decrementing the soft counter first shall solve this.
     113         */
     114        int refcount_soft;
    101115
    102116        /** Whether to automatically reset halt on the endpoint.
     
    163177int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
    164178
    165 int usb_pipe_start_session(usb_pipe_t *);
    166 int usb_pipe_end_session(usb_pipe_t *);
    167 bool usb_pipe_is_session_started(usb_pipe_t *);
    168 
    169 int usb_pipe_start_long_transfer(usb_pipe_t *);
     179void usb_pipe_start_long_transfer(usb_pipe_t *);
    170180void usb_pipe_end_long_transfer(usb_pipe_t *);
    171181
  • uspace/lib/usb/src/devdrv.c

    r618f9ed r44b1674  
    236236
    237237        /* It is worth to start a long transfer. */
    238         rc = usb_pipe_start_long_transfer(ctrl_pipe);
    239         if (rc != EOK) {
    240                 return rc;
    241         }
     238        usb_pipe_start_long_transfer(ctrl_pipe);
    242239
    243240        /* Get the device descriptor. */
  • uspace/lib/usb/src/devpoll.c

    r618f9ed r44b1674  
    7878                usb_endpoint_mapping_t *mapping
    7979                    = &polling_data->dev->pipes[polling_data->pipe_index];
    80                 usb_log_debug("Poll0x%x: started polling of `%s' - " \
     80                usb_log_debug("Poll%p: started polling of `%s' - " \
    8181                    "interface %d (%s,%d,%d), %zuB/%zu.\n",
    8282                    polling_data,
     
    100100                        if (rc == EOK) {
    101101                                usb_log_debug(
    102                                     "Poll0x%x: received: '%s' (%zuB).\n",
     102                                    "Poll%p: received: '%s' (%zuB).\n",
    103103                                    polling_data,
    104104                                    usb_debug_str_buffer(polling_data->buffer,
     
    107107                        } else {
    108108                                usb_log_debug(
    109                                     "Poll0x%x: polling failed: %s.\n",
     109                                    "Poll%p: polling failed: %s.\n",
    110110                                    polling_data, str_error(rc));
    111111                        }
  • uspace/lib/usb/src/hidparser.c

    r618f9ed r44b1674  
    167167
    168168                        usb_log_debug2(
    169                                 "i(%u) data(%X) value(%X): TAG %u, class %u, size %u - ", i,
     169                                "i(%zu) data(%X) value(%X): TAG %d, class %u, size %u - ", i,
    170170                            data[i], usb_hid_report_tag_data_int32(data+i+1,item_size),
    171171                            tag, class, item_size);
     
    576576                report_item = list_get_instance(item, usb_hid_report_item_t, link);
    577577
    578                 usb_log_debug("\tOFFSET: %X\n", report_item->offset);
     578                usb_log_debug("\tOFFSET: %zX\n", report_item->offset);
    579579                usb_log_debug("\tCOUNT: %X\n", report_item->count);
    580580                usb_log_debug("\tSIZE: %X\n", report_item->size);
  • uspace/lib/usb/src/hidreport.c

    r618f9ed r44b1674  
    109109       
    110110        if (*d != sizeof(usb_standard_hid_descriptor_t)) {
    111                 usb_log_error("HID descriptor hass wrong size (%u, expected %u"
     111                usb_log_error("HID descriptor has wrong size (%u, expected %zu"
    112112                    ")\n", *d, sizeof(usb_standard_hid_descriptor_t));
    113113                return EINVAL;
     
    149149                free(*report_desc);
    150150                *report_desc = NULL;
    151                 usb_log_error("Report descriptor has wrong size (%u, expected "
     151                usb_log_error("Report descriptor has wrong size (%zu, expected "
    152152                    "%u)\n", actual_size, length);
    153153                return EINVAL;
  • uspace/lib/usb/src/pipepriv.c

    r618f9ed r44b1674  
    7777 *
    7878 * @param pipe The USB pipe.
     79 * @param hide_failure Whether to hide failure when adding reference
     80 *      (use soft refcount).
    7981 * @return Error code.
    8082 * @retval EOK Currently always.
    8183 */
    82 int pipe_add_ref(usb_pipe_t *pipe)
     84int pipe_add_ref(usb_pipe_t *pipe, bool hide_failure)
    8385{
    84 another_try:
    8586        pipe_acquire(pipe);
    8687
     
    8990                int phone = devman_device_connect(pipe->wire->hc_handle, 0);
    9091                if (phone < 0) {
    91                         // TODO: treat some error as non-recoverable
    92                         // and return error from here
     92                        if (hide_failure) {
     93                                pipe->refcount_soft++;
     94                                phone = EOK;
     95                        }
    9396                        pipe_release(pipe);
    94                         goto another_try;
     97                        return phone;
    9598                }
    9699                /*
     
    114117{
    115118        pipe_acquire(pipe);
     119        if (pipe->refcount_soft > 0) {
     120                pipe->refcount_soft--;
     121                pipe_release(pipe);
     122                return;
     123        }
    116124        assert(pipe->refcount > 0);
    117125        pipe->refcount--;
  • uspace/lib/usb/src/pipepriv.h

    r618f9ed r44b1674  
    3737
    3838#include <usb/pipes.h>
     39#include <bool.h>
    3940
    4041void pipe_acquire(usb_pipe_t *);
     
    4445void pipe_end_transaction(usb_pipe_t *);
    4546
    46 int pipe_add_ref(usb_pipe_t *);
     47int pipe_add_ref(usb_pipe_t *, bool);
    4748void pipe_drop_ref(usb_pipe_t *);
    4849
  • uspace/lib/usb/src/pipes.c

    r618f9ed r44b1674  
    229229}
    230230
    231 
    232 /** Start a session on the endpoint pipe.
    233  *
    234  * A session is something inside what any communication occurs.
    235  * It is expected that sessions would be started right before the transfer
    236  * and ended - see usb_pipe_end_session() - after the last
    237  * transfer.
    238  * The reason for this is that session actually opens some communication
    239  * channel to the host controller (or to the physical hardware if you
    240  * wish) and thus it involves acquiring kernel resources.
    241  * Since they are limited, sessions shall not be longer than strictly
    242  * necessary.
    243  *
    244  * @deprecated
    245  * Obsoleted with introduction of usb_pipe_start_long_transfer
    246  *
    247  * @param pipe Endpoint pipe to start the session on.
    248  * @return Error code.
    249  */
    250 int usb_pipe_start_session(usb_pipe_t *pipe)
    251 {
    252         usb_log_warning("usb_pipe_start_session() was deprecated.\n");
    253         return EOK;
    254 }
    255 
    256 
    257 /** Ends a session on the endpoint pipe.
    258  *
    259  * @deprecated
    260  * Obsoleted with introduction of usb_pipe_end_long_transfer
    261  *
    262  * @see usb_pipe_start_session
    263  *
    264  * @param pipe Endpoint pipe to end the session on.
    265  * @return Error code.
    266  */
    267 int usb_pipe_end_session(usb_pipe_t *pipe)
    268 {
    269         usb_log_warning("usb_pipe_end_session() was deprecated.\n");
    270         return EOK;
    271 }
    272 
    273 /** Tell whether a session is started (open) on the endpoint pipe.
    274  *
    275  * The expected usage of this function is in assertions for some
    276  * nested functions.
    277  *
    278  * @param pipe Endpoint pipe in question.
    279  * @return Whether @p pipe has opened a session.
    280  */
    281 bool usb_pipe_is_session_started(usb_pipe_t *pipe)
    282 {
    283         pipe_acquire(pipe);
    284         bool started = pipe->refcount > 0;
    285         pipe_release(pipe);
    286         return started;
    287 }
    288 
    289231/** Prepare pipe for a long transfer.
    290232 *
     
    297239 * @return Error code.
    298240 */
    299 int usb_pipe_start_long_transfer(usb_pipe_t *pipe)
    300 {
    301         return pipe_add_ref(pipe);
     241void usb_pipe_start_long_transfer(usb_pipe_t *pipe)
     242{
     243        (void) pipe_add_ref(pipe, true);
    302244}
    303245
  • uspace/lib/usb/src/pipesinit.c

    r618f9ed r44b1674  
    365365        pipe->direction = direction;
    366366        pipe->refcount = 0;
     367        pipe->refcount_soft = 0;
    367368        pipe->auto_reset_halt = false;
    368369
     
    419420        int rc;
    420421
    421         rc = usb_pipe_start_long_transfer(pipe);
    422         if (rc != EOK) {
    423                 return rc;
    424         }
    425 
     422        usb_pipe_start_long_transfer(pipe);
    426423
    427424        uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];
  • uspace/lib/usb/src/pipesio.c

    r618f9ed r44b1674  
    173173
    174174        int rc;
    175         rc = pipe_add_ref(pipe);
     175        rc = pipe_add_ref(pipe, false);
    176176        if (rc != EOK) {
    177177                return rc;
     
    296296        int rc;
    297297
    298         rc = pipe_add_ref(pipe);
     298        rc = pipe_add_ref(pipe, false);
    299299        if (rc != EOK) {
    300300                return rc;
     
    447447        int rc;
    448448
    449         rc = pipe_add_ref(pipe);
     449        rc = pipe_add_ref(pipe, false);
    450450        if (rc != EOK) {
    451451                return rc;
     
    579579        int rc;
    580580
    581         rc = pipe_add_ref(pipe);
     581        rc = pipe_add_ref(pipe, false);
    582582        if (rc != EOK) {
    583583                return rc;
Note: See TracChangeset for help on using the changeset viewer.