Changeset 84a04dd in mainline
- Timestamp:
- 2011-04-18T20:21:58Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 44b1674, c7d19d84, da1dd48, e3f1987
- Parents:
- 8595577b (diff), 4125b7d (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. - Location:
- uspace
- Files:
-
- 40 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/usbinfo/dev.c
r8595577b r84a04dd 77 77 } 78 78 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); 86 80 transfer_started = true; 87 81 -
uspace/drv/ehci-hcd/main.c
r8595577b r84a04dd 82 82 pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq); 83 83 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", 86 87 mem_reg_base, mem_reg_size, irq); 87 88 … … 102 103 str_error(ret)); 103 104 104 usb_log_info("Controlling new EHCI device `%s' (handle % llu).\n",105 usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n", 105 106 device->name, device->handle); 106 107 -
uspace/drv/ehci-hcd/pci.c
r8595577b r84a04dd 117 117 mem_address = res->res.mem_range.address; 118 118 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", 120 120 mem_address, mem_size); 121 121 mem_found = true; … … 186 186 CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read PCI config space.\n", 187 187 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); 189 189 190 190 /* clear lower byte, it's not part of the BASE address */ 191 191 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); 193 193 194 194 /* if nothing setup the hc, we don't need to turn it off */ … … 201 201 AS_AREA_READ | AS_AREA_WRITE); 202 202 CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to map registers %p:%p.\n", 203 ret, regs, registers);203 ret, regs, (void *) registers); 204 204 205 205 /* calculate value of BASE */ … … 221 221 IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value); 222 222 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); 224 224 225 225 /* Read the first EEC. i.e. Legacy Support register */ … … 228 228 IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value); 229 229 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); 231 231 232 232 /* Request control from firmware/BIOS, by writing 1 to highest byte. … … 248 248 249 249 if ((value & USBLEGSUP_BIOS_CONTROL) == 0) { 250 usb_log_info("BIOS released control after % dusec.\n", wait);250 usb_log_info("BIOS released control after %zu usec.\n", wait); 251 251 } else { 252 252 /* BIOS failed to hand over control, this should not happen. */ 253 253 usb_log_warning( "BIOS failed to release control after " 254 "% dusecs, force it.\n", wait);254 "%zu usecs, force it.\n", wait); 255 255 ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE), 256 256 IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGSUP_OFFSET, … … 271 271 IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value); 272 272 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); 274 274 275 275 /* Read again Legacy Support register */ … … 277 277 IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value); 278 278 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); 280 280 281 281 /* -
uspace/drv/ohci/batch.c
r8595577b r84a04dd 141 141 assert(data); 142 142 size_t tds = data->td_count; 143 usb_log_debug("Batch(%p) checking % dtd(s) for completion.\n",143 usb_log_debug("Batch(%p) checking %zu td(s) for completion.\n", 144 144 instance, tds); 145 145 usb_log_debug("ED: %x:%x:%x:%x.\n", … … 150 150 for (; i < tds; ++i) { 151 151 assert(data->tds[i] != NULL); 152 usb_log_debug("TD % d: %x:%x:%x:%x.\n", i,152 usb_log_debug("TD %zu: %x:%x:%x:%x.\n", i, 153 153 data->tds[i]->status, data->tds[i]->cbp, data->tds[i]->next, 154 154 data->tds[i]->be); … … 158 158 instance->error = td_error(data->tds[i]); 159 159 if (instance->error != EOK) { 160 usb_log_debug("Batch(%p) found error TD(% d):%x.\n",160 usb_log_debug("Batch(%p) found error TD(%zu):%x.\n", 161 161 instance, i, data->tds[i]->status); 162 162 /* Make sure TD queue is empty (one TD), -
uspace/drv/ohci/endpoint_list.c
r8595577b r84a04dd 55 55 } 56 56 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", 58 58 name, instance->list_head, instance->list_head_pa); 59 59 … … 121 121 hcd_ep, instance->name, first, first->ed); 122 122 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", 124 124 instance->name, last_ed, instance->list_head_pa, 125 125 last_ed->status, last_ed->td_tail, last_ed->td_head, -
uspace/drv/ohci/hc.c
r8595577b r84a04dd 113 113 BANDWIDTH_AVAILABLE_USB11); 114 114 CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n", 115 ret,str_error(ret));115 str_error(ret)); 116 116 117 117 hc_gain_control(instance); 118 118 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)); 121 121 hc_init_hw(instance); 122 122 fibril_mutex_initialize(&instance->guard); … … 294 294 if (status & IS_WDH) { 295 295 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", 299 300 instance->registers->periodic_current); 300 301 … … 405 406 instance->registers->bulk_head = 406 407 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", 408 409 instance->lists[USB_TRANSFER_BULK].list_head, 409 410 instance->lists[USB_TRANSFER_BULK].list_head_pa); … … 411 412 instance->registers->control_head = 412 413 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", 414 415 instance->lists[USB_TRANSFER_CONTROL].list_head, 415 416 instance->lists[USB_TRANSFER_CONTROL].list_head_pa); … … 487 488 instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa; 488 489 } 489 usb_log_debug2("Interrupt HEADs set to: %p (%p).\n",490 usb_log_debug2("Interrupt HEADs set to: %p (%#" PRIx32 ").\n", 490 491 instance->lists[USB_TRANSFER_INTERRUPT].list_head, 491 492 instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa); -
uspace/drv/ohci/iface.c
r8595577b r84a04dd 118 118 hc_t *hc = fun_to_hc(fun); 119 119 assert(hc); 120 usb_log_debug("Address bind %d-% d.\n", address, handle);120 usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle); 121 121 usb_device_keeper_bind(&hc->manager, address, handle); 122 122 return EOK; -
uspace/drv/ohci/ohci.c
r8595577b r84a04dd 148 148 pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq); 149 149 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); 153 154 154 155 ret = pci_disable_legacy(device); -
uspace/drv/ohci/pci.c
r8595577b r84a04dd 117 117 mem_address = res->res.mem_range.address; 118 118 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); 121 121 mem_found = true; 122 122 } -
uspace/drv/uhci-hcd/batch.c
r8595577b r84a04dd 162 162 assert(data); 163 163 164 usb_log_debug2("Batch(%p) checking % dtransfer(s) for completion.\n",164 usb_log_debug2("Batch(%p) checking %zu transfer(s) for completion.\n", 165 165 instance, data->td_count); 166 166 instance->transfered_size = 0; … … 173 173 instance->error = td_status(&data->tds[i]); 174 174 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", 176 176 instance, i, data->tds[i].status); 177 177 td_print_status(&data->tds[i]); -
uspace/drv/uhci-hcd/hc.c
r8595577b r84a04dd 101 101 ret, io, str_error(ret)); 102 102 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", 104 104 io, reg_size); 105 105 … … 423 423 if (frame_list != addr_to_phys(instance->frame_list)) { 424 424 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)); 426 427 } 427 428 … … 432 433 uintptr_t real_pa = addr_to_phys(QH(interrupt)); 433 434 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); 436 437 } 437 438 … … 440 441 if (expected_pa != real_pa) { 441 442 usb_log_debug("Control Slow QH: %p vs. %p.\n", 442 expected_pa,real_pa);443 (void *) expected_pa, (void *) real_pa); 443 444 } 444 445 … … 447 448 if (expected_pa != real_pa) { 448 449 usb_log_debug("Control Full QH: %p vs. %p.\n", 449 expected_pa,real_pa);450 (void *) expected_pa, (void *) real_pa); 450 451 } 451 452 … … 454 455 if (expected_pa != real_pa ) { 455 456 usb_log_debug("Bulk QH: %p vs. %p.\n", 456 expected_pa,real_pa);457 (void *) expected_pa, (void *) real_pa); 457 458 } 458 459 async_usleep(UHCI_DEBUGER_TIMEOUT); -
uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.c
r8595577b r84a04dd 154 154 assert(instance); 155 155 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", 157 157 instance, instance->status, 158 158 (s & TD_STATUS_SPD_FLAG) ? " SPD," : "", -
uspace/drv/uhci-hcd/iface.c
r8595577b r84a04dd 118 118 hc_t *hc = fun_to_hc(fun); 119 119 assert(hc); 120 usb_log_debug("Address bind %d-% d.\n", address, handle);120 usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle); 121 121 usb_device_keeper_bind(&hc->manager, address, handle); 122 122 return EOK; -
uspace/drv/uhci-hcd/main.c
r8595577b r84a04dd 72 72 int ret = uhci_init(uhci, device); 73 73 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)); 76 76 return ret; 77 77 } -
uspace/drv/uhci-hcd/pci.c
r8595577b r84a04dd 90 90 io_address = res->res.io_range.address; 91 91 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", 93 93 res->res.io_range.address, res->res.io_range.size); 94 94 io_found = true; -
uspace/drv/uhci-hcd/transfer_list.c
r8595577b r84a04dd 58 58 } 59 59 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", 61 61 name, instance->queue_head, queue_head_pa); 62 62 -
uspace/drv/uhci-hcd/uhci.c
r8595577b r84a04dd 168 168 pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq); 169 169 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); 173 174 174 175 ret = pci_disable_legacy(device); -
uspace/drv/uhci-rhd/main.c
r8595577b r84a04dd 1 1 /* 2 * Copyright (c) 2011 Vojtech Horky,Jan Vesely2 * Copyright (c) 2011 Jan Vesely 3 3 * All rights reserved. 4 4 * … … 84 84 return EINVAL; 85 85 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); 87 88 88 89 uintptr_t io_regs = 0; … … 101 102 ret = hc_get_my_registers(device, &io_regs, &io_size); 102 103 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); 105 107 106 108 rh = malloc(sizeof(uhci_root_hub_t)); … … 115 117 116 118 device->driver_data = rh; 117 usb_log_info("Controlling root hub '%s' (% llu).\n",119 usb_log_info("Controlling root hub '%s' (%" PRIun ").\n", 118 120 device->name, device->handle); 119 121 return EOK; -
uspace/drv/uhci-rhd/port.c
r8595577b r84a04dd 89 89 { 90 90 assert(port); 91 asprintf(&port->id_string, "Port (%p - % d)", port, number);91 asprintf(&port->id_string, "Port (%p - %u)", port, number); 92 92 if (port->id_string == NULL) { 93 93 return ENOMEM; … … 115 115 116 116 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", 118 118 port->id_string, port->checker); 119 119 return EOK; … … 267 267 } 268 268 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", 270 270 port->number, dev_addr, port->attached_device); 271 271 return EOK; … … 283 283 int uhci_port_remove_device(uhci_port_t *port) 284 284 { 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", 286 286 port->id_string, port->attached_device); 287 287 return ENOTSUP; -
uspace/drv/usbflbk/main.c
r8595577b r84a04dd 65 65 66 66 usb_log_info("Pretending to control %s `%s'" \ 67 " (node `%s', handle % llu).\n",67 " (node `%s', handle %" PRIun ").\n", 68 68 dev->interface_no < 0 ? "device" : "interface", 69 69 dev->ddf_dev->name, fun_name, dev->ddf_dev->handle); -
uspace/drv/usbhid/kbd/kbddev.c
r8595577b r84a04dd 607 607 608 608 if (count != kbd_dev->key_count) { 609 usb_log_warning("Number of received keycodes (% d) differs from"610 " 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); 611 611 return; 612 612 } -
uspace/drv/usbhid/usbhid.c
r8595577b r84a04dd 197 197 size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path, 198 198 mapping->compare); 199 usb_log_debug("Size of the input report: % d\n", size);199 usb_log_debug("Size of the input report: %zuB\n", size); 200 200 201 201 usb_hid_report_path_free(usage_path); -
uspace/drv/usbhub/ports.c
r8595577b r84a04dd 83 83 void usb_hub_process_interrupt(usb_hub_info_t * hub, 84 84 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); 86 86 //determine type of change 87 87 //usb_pipe_t *pipe = hub->control_pipe; … … 93 93 if (opResult != EOK) { 94 94 usb_log_error("Failed to get port %zu status: %s.\n", 95 port, str_error(opResult));95 (size_t) port, str_error(opResult)); 96 96 return; 97 97 } … … 100 100 bool device_connected = usb_port_is_status(status, 101 101 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, 103 104 device_connected ? "device attached" : "device removed"); 104 105 … … 109 110 usb_log_error( 110 111 "Cannot handle change on port %zu: %s.\n", 111 str_error(opResult));112 (size_t) port, str_error(opResult)); 112 113 } 113 114 } else { … … 210 211 static void usb_hub_port_reset_completed(usb_hub_info_t * hub, 211 212 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); 213 214 if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_ENABLE)) { 214 215 /* Finalize device adding. */ … … 222 223 usb_log_warning( 223 224 "Port %zu reset complete but port not enabled.\n", 224 port);225 (size_t) port); 225 226 } 226 227 } -
uspace/drv/usbhub/usbhub.c
r8595577b r84a04dd 264 264 port+1, USB_HUB_FEATURE_PORT_POWER); 265 265 if (opResult != EOK) { 266 usb_log_error("cannot power on port % d; %d\n",267 port+1, opResult);266 usb_log_error("cannot power on port %zu: %s.\n", 267 port+1, str_error(opResult)); 268 268 } 269 269 } … … 273 273 USB_HUB_FEATURE_C_HUB_LOCAL_POWER); 274 274 if (opResult != EOK) { 275 usb_log_error("cannot power hub ; %d\n",276 opResult);275 usb_log_error("cannot power hub: %s\n", 276 str_error(opResult)); 277 277 } 278 278 } … … 362 362 } 363 363 364 usb_log_info("Controlling hub `%s' (% dports).\n",364 usb_log_info("Controlling hub `%s' (%zu ports).\n", 365 365 hub_info->usb_device->ddf_dev->name, hub_info->port_count); 366 366 return EOK; … … 430 430 port, USB_HUB_FEATURE_PORT_POWER); 431 431 if (opResult != EOK) { 432 usb_log_error(" cannot power on port %d; %d\n",433 port, opResult);432 usb_log_error("Cannot power on port %zu: %s.\n", 433 port, str_error(opResult)); 434 434 } 435 435 } -
uspace/drv/usbkbd/kbddev.c
r8595577b r84a04dd 567 567 568 568 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); 571 571 return; 572 572 } -
uspace/drv/usbmid/main.c
r8595577b r84a04dd 53 53 usb_log_info("Taking care of new MID `%s'.\n", dev->ddf_dev->name); 54 54 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); 63 56 64 57 bool accept = usbmid_explore_device(dev); -
uspace/drv/usbmouse/init.c
r8595577b r84a04dd 125 125 } 126 126 127 /* Open the control pipe. */128 rc = usb_pipe_start_session(&dev->ctrl_pipe);129 if (rc != EOK) {130 goto leave;131 }132 133 127 /* Set the boot protocol. */ 134 128 rc = usb_control_request_set(&dev->ctrl_pipe, … … 140 134 } 141 135 142 /* Close the control pipe (ignore errors). */ 143 usb_pipe_end_session(&dev->ctrl_pipe); 144 145 146 /* Everything allright. */ 136 /* Everything all right. */ 147 137 dev->driver_data = mouse; 148 138 mouse->mouse_fun->driver_data = mouse; -
uspace/drv/usbmouse/main.c
r8595577b r84a04dd 54 54 } 55 55 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); 57 58 58 59 rc = usb_device_auto_poll(dev, 0, … … 66 67 } 67 68 68 usb_log_info("controlling new mouse (handle % llu).\n",69 usb_log_info("controlling new mouse (handle %" PRIun ").\n", 69 70 dev->ddf_dev->handle); 70 71 -
uspace/drv/vhc/conndev.c
r8595577b r84a04dd 99 99 int rc = get_device_name(callback, devname, DEVICE_NAME_MAXLENGTH); 100 100 101 usb_log_info("New virtual device `%s' (id = % x).\n",101 usb_log_info("New virtual device `%s' (id = %" PRIxn ").\n", 102 102 rc == EOK ? devname : "<unknown>", dev->id); 103 103 … … 122 122 } 123 123 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); 125 126 virtdev_destroy_device(dev); 126 127 } -
uspace/lib/usb/include/usb/debug.h
r8595577b r84a04dd 36 36 #define LIBUSB_DEBUG_H_ 37 37 #include <stdio.h> 38 #include <inttypes.h> 38 39 #include <usb/usb.h> 39 40 #include <assert.h> … … 85 86 void usb_log_enable(usb_log_level_t, const char *); 86 87 87 void usb_log_printf(usb_log_level_t, const char *, ...); 88 void usb_log_printf(usb_log_level_t, const char *, ...) 89 PRINTF_ATTRIBUTE(2, 3); 88 90 89 91 /** Log fatal error. */ -
uspace/lib/usb/include/usb/pipes.h
r8595577b r84a04dd 99 99 /** Number of active transfers over the pipe. */ 100 100 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; 101 115 102 116 /** Whether to automatically reset halt on the endpoint. … … 163 177 int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *); 164 178 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 *); 179 void usb_pipe_start_long_transfer(usb_pipe_t *); 170 180 void usb_pipe_end_long_transfer(usb_pipe_t *); 171 181 -
uspace/lib/usb/src/devdrv.c
r8595577b r84a04dd 236 236 237 237 /* 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); 242 239 243 240 /* Get the device descriptor. */ -
uspace/lib/usb/src/devpoll.c
r8595577b r84a04dd 78 78 usb_endpoint_mapping_t *mapping 79 79 = &polling_data->dev->pipes[polling_data->pipe_index]; 80 usb_log_debug("Poll 0x%x: started polling of `%s' - " \80 usb_log_debug("Poll%p: started polling of `%s' - " \ 81 81 "interface %d (%s,%d,%d), %zuB/%zu.\n", 82 82 polling_data, … … 100 100 if (rc == EOK) { 101 101 usb_log_debug( 102 "Poll 0x%x: received: '%s' (%zuB).\n",102 "Poll%p: received: '%s' (%zuB).\n", 103 103 polling_data, 104 104 usb_debug_str_buffer(polling_data->buffer, … … 107 107 } else { 108 108 usb_log_debug( 109 "Poll 0x%x: polling failed: %s.\n",109 "Poll%p: polling failed: %s.\n", 110 110 polling_data, str_error(rc)); 111 111 } -
uspace/lib/usb/src/hidparser.c
r8595577b r84a04dd 167 167 168 168 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, 170 170 data[i], usb_hid_report_tag_data_int32(data+i+1,item_size), 171 171 tag, class, item_size); … … 576 576 report_item = list_get_instance(item, usb_hid_report_item_t, link); 577 577 578 usb_log_debug("\tOFFSET: % X\n", report_item->offset);578 usb_log_debug("\tOFFSET: %zX\n", report_item->offset); 579 579 usb_log_debug("\tCOUNT: %X\n", report_item->count); 580 580 usb_log_debug("\tSIZE: %X\n", report_item->size); -
uspace/lib/usb/src/hidreport.c
r8595577b r84a04dd 109 109 110 110 if (*d != sizeof(usb_standard_hid_descriptor_t)) { 111 usb_log_error("HID descriptor has s wrong size (%u, expected %u"111 usb_log_error("HID descriptor has wrong size (%u, expected %zu" 112 112 ")\n", *d, sizeof(usb_standard_hid_descriptor_t)); 113 113 return EINVAL; … … 149 149 free(*report_desc); 150 150 *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 " 152 152 "%u)\n", actual_size, length); 153 153 return EINVAL; -
uspace/lib/usb/src/pipepriv.c
r8595577b r84a04dd 77 77 * 78 78 * @param pipe The USB pipe. 79 * @param hide_failure Whether to hide failure when adding reference 80 * (use soft refcount). 79 81 * @return Error code. 80 82 * @retval EOK Currently always. 81 83 */ 82 int pipe_add_ref(usb_pipe_t *pipe )84 int pipe_add_ref(usb_pipe_t *pipe, bool hide_failure) 83 85 { 84 another_try:85 86 pipe_acquire(pipe); 86 87 … … 89 90 int phone = devman_device_connect(pipe->wire->hc_handle, 0); 90 91 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 } 93 96 pipe_release(pipe); 94 goto another_try;97 return phone; 95 98 } 96 99 /* … … 114 117 { 115 118 pipe_acquire(pipe); 119 if (pipe->refcount_soft > 0) { 120 pipe->refcount_soft--; 121 pipe_release(pipe); 122 return; 123 } 116 124 assert(pipe->refcount > 0); 117 125 pipe->refcount--; -
uspace/lib/usb/src/pipepriv.h
r8595577b r84a04dd 37 37 38 38 #include <usb/pipes.h> 39 #include <bool.h> 39 40 40 41 void pipe_acquire(usb_pipe_t *); … … 44 45 void pipe_end_transaction(usb_pipe_t *); 45 46 46 int pipe_add_ref(usb_pipe_t * );47 int pipe_add_ref(usb_pipe_t *, bool); 47 48 void pipe_drop_ref(usb_pipe_t *); 48 49 -
uspace/lib/usb/src/pipes.c
r8595577b r84a04dd 229 229 } 230 230 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 transfer236 * and ended - see usb_pipe_end_session() - after the last237 * transfer.238 * The reason for this is that session actually opens some communication239 * channel to the host controller (or to the physical hardware if you240 * wish) and thus it involves acquiring kernel resources.241 * Since they are limited, sessions shall not be longer than strictly242 * necessary.243 *244 * @deprecated245 * Obsoleted with introduction of usb_pipe_start_long_transfer246 *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 * @deprecated260 * Obsoleted with introduction of usb_pipe_end_long_transfer261 *262 * @see usb_pipe_start_session263 *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 some276 * 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 289 231 /** Prepare pipe for a long transfer. 290 232 * … … 297 239 * @return Error code. 298 240 */ 299 intusb_pipe_start_long_transfer(usb_pipe_t *pipe)300 { 301 return pipe_add_ref(pipe);241 void usb_pipe_start_long_transfer(usb_pipe_t *pipe) 242 { 243 (void) pipe_add_ref(pipe, true); 302 244 } 303 245 -
uspace/lib/usb/src/pipesinit.c
r8595577b r84a04dd 365 365 pipe->direction = direction; 366 366 pipe->refcount = 0; 367 pipe->refcount_soft = 0; 367 368 pipe->auto_reset_halt = false; 368 369 … … 419 420 int rc; 420 421 421 rc = usb_pipe_start_long_transfer(pipe); 422 if (rc != EOK) { 423 return rc; 424 } 425 422 usb_pipe_start_long_transfer(pipe); 426 423 427 424 uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE]; -
uspace/lib/usb/src/pipesio.c
r8595577b r84a04dd 173 173 174 174 int rc; 175 rc = pipe_add_ref(pipe );175 rc = pipe_add_ref(pipe, false); 176 176 if (rc != EOK) { 177 177 return rc; … … 296 296 int rc; 297 297 298 rc = pipe_add_ref(pipe );298 rc = pipe_add_ref(pipe, false); 299 299 if (rc != EOK) { 300 300 return rc; … … 447 447 int rc; 448 448 449 rc = pipe_add_ref(pipe );449 rc = pipe_add_ref(pipe, false); 450 450 if (rc != EOK) { 451 451 return rc; … … 579 579 int rc; 580 580 581 rc = pipe_add_ref(pipe );581 rc = pipe_add_ref(pipe, false); 582 582 if (rc != EOK) { 583 583 return rc;
Note:
See TracChangeset
for help on using the changeset viewer.