Changeset bf61d3a in mainline for uspace/srv
- Timestamp:
- 2010-11-26T01:34:21Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 273b958
- Parents:
- 4b9a410 (diff), 7e752b2 (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/srv
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/bd/ata_bd/ata_bd.c
r4b9a410 rbf61d3a 113 113 printf(NAME ": ATA disk driver\n"); 114 114 115 printf("I/O address %p/%p\n", ctl_physical, cmd_physical); 115 printf("I/O address %p/%p\n", (void *) ctl_physical, 116 (void *) cmd_physical); 116 117 117 118 if (ata_bd_init() != EOK) … … 181 182 } 182 183 183 printf(" %" PRIu64 " blocks", d->blocks , d->blocks / (2 * 1024));184 printf(" %" PRIu64 " blocks", d->blocks); 184 185 185 186 mbytes = d->blocks / (2 * 1024); -
uspace/srv/bd/part/guid_part/guid_part.c
r4b9a410 rbf61d3a 155 155 156 156 if (block_size < 512 || (block_size % 512) != 0) { 157 printf(NAME ": invalid block size % d.\n");157 printf(NAME ": invalid block size %zu.\n", block_size); 158 158 return ENOTSUP; 159 159 } -
uspace/srv/bd/part/mbr_part/mbr_part.c
r4b9a410 rbf61d3a 206 206 207 207 if (block_size < 512 || (block_size % 512) != 0) { 208 printf(NAME ": invalid block size % d.\n");208 printf(NAME ": invalid block size %zu.\n", block_size); 209 209 return ENOTSUP; 210 210 } -
uspace/srv/bd/rd/rd.c
r4b9a410 rbf61d3a 230 230 } 231 231 232 printf("%s: Found RAM disk at %p, %d bytes\n", NAME, rd_ph_addr, rd_size); 232 printf("%s: Found RAM disk at %p, %zu bytes\n", NAME, 233 (void *) rd_ph_addr, rd_size); 233 234 234 235 int rc = devmap_driver_register(NAME, rd_connection); -
uspace/srv/devman/devman.c
r4b9a410 rbf61d3a 1014 1014 1015 1015 size_t idx = get_new_class_dev_idx(cl); 1016 asprintf(&dev_name, "%s% d", base_name, idx);1016 asprintf(&dev_name, "%s%zu", base_name, idx); 1017 1017 1018 1018 return dev_name; -
uspace/srv/devman/main.c
r4b9a410 rbf61d3a 36 36 */ 37 37 38 #include <inttypes.h> 38 39 #include <assert.h> 39 40 #include <ipc/services.h> … … 417 418 node_t *dev = find_dev_node(&device_tree, handle); 418 419 if (dev == NULL) { 419 printf(NAME ": devman_forward error - no device with handle % x "420 " was found.\n", handle);420 printf(NAME ": devman_forward error - no device with handle %" PRIun 421 " was found.\n", handle); 421 422 ipc_answer_0(iid, ENOENT); 422 423 return; … … 434 435 435 436 if (driver == NULL) { 436 printf(NAME ": devman_forward error - the device is not in "437 " usable state.\n", handle);437 printf(NAME ": devman_forward error - the device is not in %" PRIun 438 " usable state.\n", handle); 438 439 ipc_answer_0(iid, ENOENT); 439 440 return; … … 449 450 printf(NAME ": devman_forward: cound not forward to driver %s ", 450 451 driver->name); 451 printf("the driver's phone is % x).\n", driver->phone);452 printf("the driver's phone is %" PRIun ").\n", driver->phone); 452 453 ipc_answer_0(iid, EINVAL); 453 454 return; -
uspace/srv/devmap/devmap.c
r4b9a410 rbf61d3a 555 555 if (devmap_device_find_name(namespace->name, device->name) != NULL) { 556 556 printf("%s: Device '%s/%s' already registered\n", NAME, 557 device->namespace , device->name);557 device->namespace->name, device->name); 558 558 devmap_namespace_destroy(namespace); 559 559 fibril_mutex_unlock(&devices_list_mutex); -
uspace/srv/hid/console/console.c
r4b9a410 rbf61d3a 804 804 if (screenbuffer_init(&consoles[i].scr, 805 805 fb_info.cols, fb_info.rows) == NULL) { 806 printf(NAME ": Unable to allocate screen buffer % u\n", i);806 printf(NAME ": Unable to allocate screen buffer %zu\n", i); 807 807 return false; 808 808 } … … 813 813 814 814 char vc[DEVMAP_NAME_MAXLEN + 1]; 815 snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc% u", NAMESPACE, i);815 snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i); 816 816 817 817 if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) { -
uspace/srv/hid/console/gcons.c
r4b9a410 rbf61d3a 157 157 158 158 char data[5]; 159 snprintf(data, 5, "% u", index + 1);159 snprintf(data, 5, "%zu", index + 1); 160 160 161 161 size_t i; -
uspace/srv/hid/fb/serial_console.c
r4b9a410 rbf61d3a 47 47 #include <io/style.h> 48 48 #include <str.h> 49 #include <inttypes.h> 49 50 #include <io/screenbuffer.h> 50 51 … … 135 136 136 137 char control[MAX_CONTROL]; 137 snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1); 138 snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f", 139 row + 1, col + 1); 138 140 serial_puts(control); 139 141 } … … 253 255 { 254 256 char control[MAX_CONTROL]; 255 snprintf(control, MAX_CONTROL, "\033[0;% ur", last_row);257 snprintf(control, MAX_CONTROL, "\033[0;%" PRIun "r", last_row); 256 258 serial_puts(control); 257 259 } -
uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
r4b9a410 rbf61d3a 50 50 #include <sysinfo.h> 51 51 #include <errno.h> 52 #include <inttypes.h> 52 53 53 54 #include "s3c24xx_ts.h" … … 136 137 ts->last_y = 0; 137 138 138 printf(NAME ": device at physical address 0x%x, inr %d.\n",139 ts->paddr, inr);139 printf(NAME ": device at physical address %p, inr %" PRIun ".\n", 140 (void *) ts->paddr, inr); 140 141 141 142 async_set_interrupt_received(s3c24xx_ts_irq_handler); -
uspace/srv/hw/char/i8042/i8042.c
r4b9a410 rbf61d3a 46 46 #include <stdio.h> 47 47 #include <errno.h> 48 #include <inttypes.h> 48 49 49 50 #include "i8042.h" … … 201 202 ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd); 202 203 ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd); 203 printf("%s: registered for interrupts %d and %d\n", NAME, inr_a, inr_b); 204 printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n", 205 NAME, inr_a, inr_b); 204 206 205 207 wait_ready(); … … 262 264 break; 263 265 case IPC_FIRST_USER_METHOD: 264 printf(NAME ": write % dto devid %d\n",266 printf(NAME ": write %" PRIun " to devid %d\n", 265 267 IPC_GET_ARG1(call), dev_id); 266 268 i8042_port_write(dev_id, IPC_GET_ARG1(call)); -
uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
r4b9a410 rbf61d3a 48 48 #include <sysinfo.h> 49 49 #include <errno.h> 50 #include <inttypes.h> 50 51 51 52 #include "s3c24xx_uart.h" … … 95 96 if (rc != EOK) { 96 97 devmap_hangup_phone(DEVMAP_DRIVER); 97 printf(NAME ": Unable to register device %s.\n"); 98 printf(NAME ": Unable to register device %s.\n", 99 NAMESPACE "/" NAME); 98 100 return -1; 99 101 } … … 134 136 break; 135 137 case CHAR_WRITE_BYTE: 136 printf(NAME ": write % dto device\n",138 printf(NAME ": write %" PRIun " to device\n", 137 139 IPC_GET_ARG1(call)); 138 140 s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call)); … … 185 187 uart->client_phone = -1; 186 188 187 printf(NAME ": device at physical address 0x%x, inr %d.\n",188 uart->paddr, inr);189 printf(NAME ": device at physical address %p, inr %" PRIun ".\n", 190 (void *) uart->paddr, inr); 189 191 190 192 async_set_interrupt_received(s3c24xx_uart_irq_handler); -
uspace/srv/hw/cir/fhc/fhc.c
r4b9a410 rbf61d3a 129 129 } 130 130 131 printf(NAME ": FHC UART registers at %p, % dbytes\n", fhc_uart_phys,131 printf(NAME ": FHC UART registers at %p, %zu bytes\n", fhc_uart_phys, 132 132 fhc_uart_size); 133 133 -
uspace/srv/hw/netif/dp8390/dp8390.c
r4b9a410 rbf61d3a 1516 1516 if (!wdeth_probe(dep) && !ne_probe(dep) && !el2_probe(dep)) 1517 1517 { 1518 printf("%s: No ethernet card found at 0x%x\n",1519 1518 printf("%s: No ethernet card found at %#lx\n", 1519 dep->de_name, dep->de_base_port); 1520 1520 dep->de_mode= DEM_DISABLED; 1521 1521 return; -
uspace/srv/hw/netif/dp8390/ne2000.c
r4b9a410 rbf61d3a 267 267 if (!debug) 268 268 { 269 printf("%s: NE%d000 at % X:%d\n",270 271 269 printf("%s: NE%d000 at %#lx:%d\n", 270 dep->de_name, dep->de_16bit ? 2 : 1, 271 dep->de_base_port, dep->de_irq); 272 272 } 273 273 else 274 274 { 275 275 printf("%s: Novell NE%d000 ethernet card at I/O address " 276 "0x%X, memory size 0x%X, irq %d\n",277 278 276 "%#lx, memory size %#lx, irq %d\n", 277 dep->de_name, dep->de_16bit ? 2 : 1, 278 dep->de_base_port, dep->de_ramsize, dep->de_irq); 279 279 } 280 280 } -
uspace/srv/net/il/arp/arp.c
r4b9a410 rbf61d3a 391 391 device->packet_dimension.content = mtu; 392 392 fibril_rwlock_write_unlock(&arp_globals.lock); 393 printf("arp - device %d changed mtu to % d\n\n", device_id, mtu);393 printf("arp - device %d changed mtu to %zu\n\n", device_id, mtu); 394 394 return EOK; 395 395 } -
uspace/srv/net/il/ip/ip.c
r4b9a410 rbf61d3a 461 461 462 462 if (ip_netif->packet_dimension.content < IP_MIN_CONTENT) { 463 printf("Maximum transmission unit % dbytes is too small, at "463 printf("Maximum transmission unit %zu bytes is too small, at " 464 464 "least %d bytes are needed\n", 465 465 ip_netif->packet_dimension.content, IP_MIN_CONTENT); … … 502 502 fibril_rwlock_write_unlock(&ip_globals.netifs_lock); 503 503 504 printf("%s: Device %d changed MTU to % d\n", NAME, device_id, mtu);504 printf("%s: Device %d changed MTU to %zu\n", NAME, device_id, mtu); 505 505 506 506 return EOK; -
uspace/srv/net/nil/eth/eth.c
r4b9a410 rbf61d3a 315 315 device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags); 316 316 317 printf("Device %d already exists:\tMTU\t= % d\n",317 printf("Device %d already exists:\tMTU\t= %zu\n", 318 318 device->device_id, device->mtu); 319 319 fibril_rwlock_write_unlock(ð_globals.devices_lock); … … 407 407 } 408 408 409 printf("%s: Device registered (id: %d, service: %d: mtu: % d, "409 printf("%s: Device registered (id: %d, service: %d: mtu: %zu, " 410 410 "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n", 411 411 NAME, device->device_id, device->service, device->mtu, -
uspace/srv/net/nil/nildummy/nildummy.c
r4b9a410 rbf61d3a 175 175 device->mtu = NET_DEFAULT_MTU; 176 176 177 printf("Device %d already exists:\tMTU\t= % d\n",177 printf("Device %d already exists:\tMTU\t= %zu\n", 178 178 device->device_id, device->mtu); 179 179 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); … … 232 232 } 233 233 234 printf("%s: Device registered (id: %d, service: %d, mtu: % d)\n",234 printf("%s: Device registered (id: %d, service: %d, mtu: %zu)\n", 235 235 NAME, device->device_id, device->service, device->mtu); 236 236 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); -
uspace/srv/taskmon/taskmon.c
r4b9a410 rbf61d3a 60 60 thread = IPC_GET_ARG3(*call); 61 61 62 if (asprintf(&s_taskid, "%" PRIu TASKID, taskid) < 0) {62 if (asprintf(&s_taskid, "%" PRIu64, taskid) < 0) { 63 63 printf("Memory allocation failed.\n"); 64 64 return; 65 65 } 66 66 67 printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread); 67 printf(NAME ": Task %" PRIu64 " fault in thread %p.\n", taskid, 68 (void *) thread); 68 69 69 70 fname = "/app/taskdump"; … … 72 73 char *dump_fname; 73 74 74 if (asprintf(&dump_fname, "/data/core%" PRIu TASKID, taskid) < 0) {75 if (asprintf(&dump_fname, "/data/core%" PRIu64, taskid) < 0) { 75 76 printf("Memory allocation failed.\n"); 76 77 return; 77 78 } 78 79 79 printf(NAME ": Executing %s -c %s -t %s\n", dump_fname, s_taskid);80 printf(NAME ": Executing %s -c %s -t %s\n", fname, dump_fname, s_taskid); 80 81 rc = task_spawnl(NULL, fname, fname, "-c", dump_fname, "-t", s_taskid, 81 82 NULL); 82 83 #else 83 printf(NAME ": Executing %s -t %s\n", s_taskid);84 printf(NAME ": Executing %s -t %s\n", fname, s_taskid); 84 85 rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL); 85 86 #endif
Note:
See TracChangeset
for help on using the changeset viewer.