Changes in uspace/app/trace/ipcp.c [7354b5e:1569a9b] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/trace/ipcp.c
r7354b5e r1569a9b 35 35 #include <stdio.h> 36 36 #include <stdlib.h> 37 #include <str_error.h> 37 38 #include <inttypes.h> 38 39 #include <adt/hash_table.h> … … 44 45 #include "ipcp.h" 45 46 46 #define IPCP_CALLID_SYNC 047 48 47 typedef struct { 49 48 sysarg_t phone_hash; … … 145 144 V_INTEGER, 146 145 V_INTEGER, 147 V_INTEGER 146 V_INTEGER 148 147 }; 149 148 … … 189 188 190 189 if ((display_mask & DM_IPC) != 0) { 191 printf("Call ID: % p, phone: %d, proto: %s, method: ",192 (void *)hash, phone,190 printf("Call ID: %d, phone: %d, proto: %s, method: ", 191 hash, phone, 193 192 (proto ? proto->name : "n/a")); 194 193 ipc_m_print(proto, IPC_GET_IMETHOD(*call)); … … 251 250 sysarg_t method; 252 251 sysarg_t service; 253 sysarg_t retval;252 int retval; 254 253 proto_t *proto; 255 254 int cphone; … … 266 265 267 266 if ((display_mask & DM_IPC) != 0) { 268 printf("Response to % p: retval=%" PRIdn ", args = (%" PRIun ", "267 printf("Response to %d: retval=%s, args = (%" PRIun ", " 269 268 "%" PRIun ", %" PRIun ", %" PRIun ", %" PRIun ")\n", 270 (void *) hash, retval, IPC_GET_ARG1(*answer),269 hash, str_error_name(retval), IPC_GET_ARG1(*answer), 271 270 IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer), 272 271 IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer)); … … 282 281 if (oper->rv_type != V_VOID) { 283 282 putchar(' '); 284 val_print( retval, oper->rv_type);283 val_print((sysarg_t) retval, oper->rv_type); 285 284 } 286 285 … … 323 322 pending_call_t *pcall; 324 323 325 if (( hash & IPC_CALLID_ANSWERED) == 0 && hash != IPCP_CALLID_SYNC) {324 if ((call->flags & IPC_CALL_ANSWERED) == 0) { 326 325 /* Not a response */ 327 326 if ((display_mask & DM_IPC) != 0) { 328 printf("Not a response (hash % p)\n", (void *)hash);327 printf("Not a response (hash %d)\n", hash); 329 328 } 330 329 return; 331 330 } 332 333 hash = hash & ~IPC_CALLID_ANSWERED;334 331 335 332 item = hash_table_find(&pending_calls, &hash); … … 348 345 } 349 346 350 void ipcp_call_sync(int phone, ipc_call_t *call, ipc_call_t *answer)351 {352 ipcp_call_out(phone, call, IPCP_CALLID_SYNC);353 ipcp_call_in(answer, IPCP_CALLID_SYNC);354 }355 356 347 void ipcp_hangup(int phone, int rc) 357 348 { 358 349 if ((display_mask & DM_SYSTEM) != 0) { 359 printf("Hang phone %d up -> % d\n", phone, rc);350 printf("Hang phone %d up -> %s\n", phone, str_error_name(rc)); 360 351 ipcp_connection_clear(phone); 361 352 }
Note:
See TracChangeset
for help on using the changeset viewer.