Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/init/init.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -37,5 +37,4 @@ #include #include -#include #include #include Index: uspace/app/klog/klog.c =================================================================== --- uspace/app/klog/klog.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/klog/klog.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -36,13 +36,12 @@ #include -#include #include -#include #include -#include +#include #include #include #include #include +#include #define NAME "klog" @@ -79,29 +78,42 @@ int main(int argc, char *argv[]) { - size_t klog_pages; - if (sysinfo_get_value("klog.pages", &klog_pages) != EOK) { - printf("%s: Error getting klog address\n", NAME); - return -1; + size_t pages; + int rc = sysinfo_get_value("klog.pages", &pages); + if (rc != EOK) { + fprintf(stderr, "%s: Unable to get number of klog pages\n", + NAME); + return rc; } - size_t klog_size = klog_pages * PAGE_SIZE; - klog_length = klog_size / sizeof(wchar_t); - - klog = (wchar_t *) as_get_mappable_page(klog_size); - if (klog == NULL) { - printf("%s: Error allocating memory area\n", NAME); - return -1; + uintptr_t faddr; + rc = sysinfo_get_value("klog.faddr", &faddr); + if (rc != EOK) { + fprintf(stderr, "%s: Unable to get klog physical address\n", + NAME); + return rc; } - int res = async_share_in_start_1_0(PHONE_NS, (void *) klog, - klog_size, SERVICE_MEM_KLOG); - if (res != EOK) { - printf("%s: Error initializing memory area\n", NAME); - return -1; + size_t size = pages * PAGE_SIZE; + klog_length = size / sizeof(wchar_t); + + klog = (wchar_t *) as_get_mappable_page(size); + if (klog == NULL) { + fprintf(stderr, "%s: Unable to allocate virtual memory area\n", + NAME); + return ENOMEM; } - if (event_subscribe(EVENT_KLOG, 0) != EOK) { - printf("%s: Error registering klog notifications\n", NAME); - return -1; + rc = physmem_map((void *) faddr, (void *) klog, pages, + AS_AREA_READ | AS_AREA_CACHEABLE); + if (rc != EOK) { + fprintf(stderr, "%s: Unable to map klog\n", NAME); + return rc; + } + + rc = event_subscribe(EVENT_KLOG, 0); + if (rc != EOK) { + fprintf(stderr, "%s: Unable to register klog notifications\n", + NAME); + return rc; } @@ -109,5 +121,4 @@ * Mode "a" would be definitively much better here, but it is * not well supported by the FAT driver. - * */ log = fopen(LOG_FNAME, "w"); Index: uspace/app/ping/ping.c =================================================================== --- uspace/app/ping/ping.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/ping/ping.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -35,9 +35,9 @@ */ +#include #include #include #include #include -#include #include #include @@ -355,5 +355,5 @@ str_error(ret)); - ipc_hangup(icmp_phone); + async_hangup(icmp_phone); return ret; } @@ -370,5 +370,5 @@ str_error(ret)); - ipc_hangup(icmp_phone); + async_hangup(icmp_phone); return ret; } @@ -390,5 +390,5 @@ } - ipc_hangup(icmp_phone); + async_hangup(icmp_phone); return 0; Index: uspace/app/taskdump/taskdump.c =================================================================== --- uspace/app/taskdump/taskdump.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/taskdump/taskdump.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -33,8 +33,8 @@ */ +#include #include #include #include -#include #include #include @@ -105,5 +105,5 @@ udebug_end(phoneid); - ipc_hangup(phoneid); + async_hangup(phoneid); return 0; @@ -114,5 +114,5 @@ int rc; - rc = ipc_connect_kbox(task_id); + rc = async_connect_kbox(task_id); if (rc == ENOTSUP) { @@ -126,5 +126,5 @@ if (rc < 0) { printf("Error connecting\n"); - printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc); + printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, rc); return rc; } Index: uspace/app/tester/hw/misc/virtchar1.c =================================================================== --- uspace/app/tester/hw/misc/virtchar1.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/tester/hw/misc/virtchar1.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -89,5 +89,5 @@ /* Clean-up. */ TPRINTF(" Closing phones and file descriptors\n"); - ipc_hangup(phone); + async_hangup(phone); close(fd); Index: uspace/app/tester/hw/serial/serial1.c =================================================================== --- uspace/app/tester/hw/serial/serial1.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/tester/hw/serial/serial1.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -88,5 +87,5 @@ char *buf = (char *) malloc(cnt + 1); if (buf == NULL) { - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); return "Failed to allocate input buffer"; @@ -98,18 +97,18 @@ sysarg_t old_word_size; - res = ipc_call_sync_0_4(phone, SERIAL_GET_COM_PROPS, &old_baud, + res = async_req_0_4(phone, SERIAL_GET_COM_PROPS, &old_baud, &old_par, &old_word_size, &old_stop); if (res != EOK) { free(buf); - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); return "Failed to get old serial communication parameters"; } - res = ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, 1200, + res = async_req_4_0(phone, SERIAL_SET_COM_PROPS, 1200, SERIAL_NO_PARITY, 8, 1); if (EOK != res) { free(buf); - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); return "Failed to set serial communication parameters"; @@ -124,8 +123,8 @@ if (read < 0) { - ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, + async_req_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par, old_word_size, old_stop); free(buf); - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); return "Failed read from serial device"; @@ -133,8 +132,8 @@ if ((size_t) read > cnt - total) { - ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, + async_req_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par, old_word_size, old_stop); free(buf); - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); return "Read more data than expected"; @@ -155,8 +154,8 @@ if (written < 0) { - ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, + async_req_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par, old_word_size, old_stop); free(buf); - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); return "Failed write to serial device"; @@ -164,8 +163,8 @@ if (written != read) { - ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, + async_req_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par, old_word_size, old_stop); free(buf); - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); return "Written less data than read from serial device"; @@ -183,8 +182,8 @@ ssize_t written = char_dev_write(phone, (void *) EOT, eot_size); - ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, + async_req_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par, old_word_size, old_stop); free(buf); - ipc_hangup(phone); + async_hangup(phone); devman_hangup_phone(DEVMAN_CLIENT); Index: uspace/app/tester/tester.h =================================================================== --- uspace/app/tester/tester.h (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/tester/tester.h (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -38,5 +38,4 @@ #include #include -#include #define IPC_TEST_SERVICE 10240 Index: uspace/app/tetris/screen.h =================================================================== --- uspace/app/tetris/screen.h (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/tetris/screen.h (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -48,5 +48,4 @@ #include -#include #include #include Index: uspace/app/top/screen.c =================================================================== --- uspace/app/top/screen.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/top/screen.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -37,5 +37,4 @@ #include -#include #include #include Index: uspace/app/trace/ipc_desc.c =================================================================== --- uspace/app/trace/ipc_desc.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/trace/ipc_desc.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -33,6 +33,6 @@ */ +#include #include -#include #include "ipc_desc.h" Index: uspace/app/trace/ipcp.h =================================================================== --- uspace/app/trace/ipcp.h (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/trace/ipcp.h (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -36,5 +36,4 @@ #define IPCP_H_ -#include #include "proto.h" Index: uspace/app/trace/proto.c =================================================================== --- uspace/app/trace/proto.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/trace/proto.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -35,5 +35,4 @@ #include #include -#include #include Index: uspace/app/trace/proto.h =================================================================== --- uspace/app/trace/proto.h (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/trace/proto.h (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -36,6 +36,6 @@ #define PROTO_H_ +#include #include -#include #include "trace.h" Index: uspace/app/trace/syscalls.c =================================================================== --- uspace/app/trace/syscalls.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/trace/syscalls.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -64,6 +64,4 @@ [SYS_IPC_POKE] = { "ipc_poke", 0, V_ERRNO }, [SYS_IPC_HANGUP] = { "ipc_hangup", 1, V_ERRNO }, - [SYS_IPC_REGISTER_IRQ] = { "ipc_register_irq", 4, V_ERRNO }, - [SYS_IPC_UNREGISTER_IRQ] = { "ipc_unregister_irq", 2, V_ERRNO }, [SYS_EVENT_SUBSCRIBE] = { "event_subscribe", 2, V_ERRNO }, @@ -73,4 +71,6 @@ [SYS_PHYSMEM_MAP] = { "physmem_map", 4, V_ERRNO }, [SYS_IOSPACE_ENABLE] = { "iospace_enable", 1, V_ERRNO }, + [SYS_REGISTER_IRQ] = { "register_irq", 4, V_ERRNO }, + [SYS_UNREGISTER_IRQ] = { "unregister_irq", 2, V_ERRNO }, [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag", 2, V_INTEGER }, Index: uspace/app/trace/trace.c =================================================================== --- uspace/app/trace/trace.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/trace/trace.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -36,5 +36,4 @@ #include #include -#include #include #include @@ -149,5 +148,5 @@ int rc; - rc = ipc_connect_kbox(task_id); + rc = async_connect_kbox(task_id); if (rc == ENOTSUP) { @@ -745,5 +744,5 @@ abort_trace = true; udebug_end(phoneid); - ipc_hangup(phoneid); + async_hangup(phoneid); ipcp_cleanup(); Index: uspace/app/usbinfo/info.c =================================================================== --- uspace/app/usbinfo/info.c (revision e778543f4755da04d0813045d56c3cf431812035) +++ uspace/app/usbinfo/info.c (revision 0a6fa9fe59b6049f04024724a7889d8ad48bf28f) @@ -141,5 +141,5 @@ leave: /* Ignoring errors here. */ - ipc_hangup(hc_phone); + async_hangup(hc_phone); usb_endpoint_pipe_end_session(&ctrl_pipe);