Changes in uspace/app/trace/trace.c [07b7c48:6c34f587] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/trace/trace.c
r07b7c48 r6c34f587 43 43 #include <mem.h> 44 44 #include <str.h> 45 #include < stdbool.h>45 #include <bool.h> 46 46 #include <loader/loader.h> 47 47 #include <io/console.h> … … 136 136 } 137 137 138 free(task_ldr); 138 139 task_ldr = NULL; 139 140 … … 347 348 if ((display_mask & DM_SYSCALL) != 0) { 348 349 /* Print syscall name and arguments */ 349 if (syscall_desc_defined(sc_id)) { 350 printf("%s", syscall_desc[sc_id].name); 351 print_sc_args(sc_args, syscall_desc[sc_id].n_args); 352 } 353 else { 354 printf("unknown_syscall<%d>", sc_id); 355 print_sc_args(sc_args, 6); 356 } 350 printf("%s", syscall_desc[sc_id].name); 351 print_sc_args(sc_args, syscall_desc[sc_id].n_args); 357 352 } 358 353 } … … 377 372 if ((display_mask & DM_SYSCALL) != 0) { 378 373 /* Print syscall return value */ 379 if (syscall_desc_defined(sc_id)) 380 rv_type = syscall_desc[sc_id].rv_type; 381 else 382 rv_type = V_PTR; 374 rv_type = syscall_desc[sc_id].rv_type; 383 375 print_sc_retval(sc_rc, rv_type); 384 376 } … … 505 497 ldr = loader_connect(); 506 498 if (ldr == NULL) 507 return NULL;499 return 0; 508 500 509 501 /* Get task ID. */ … … 565 557 static int cev_fibril(void *arg) 566 558 { 567 cons_event_t event;568 569 559 (void) arg; 570 560 … … 577 567 fibril_mutex_unlock(&state_lock); 578 568 579 if (!console_get_ event(console, &event))569 if (!console_get_kbd_event(console, &cev)) 580 570 return -1; 581 571 582 if (event.type == CEV_KEY) { 583 fibril_mutex_lock(&state_lock); 584 cev = event.ev.key; 585 cev_valid = true; 586 fibril_condvar_broadcast(&state_cv); 587 fibril_mutex_unlock(&state_lock); 588 } 572 fibril_mutex_lock(&state_lock); 573 cev_valid = true; 574 fibril_condvar_broadcast(&state_cv); 575 fibril_mutex_unlock(&state_lock); 589 576 } 590 577 }
Note:
See TracChangeset
for help on using the changeset viewer.