Index: contrib/arch/hadlbppp.py =================================================================== --- contrib/arch/hadlbppp.py (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/hadlbppp.py (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1151,5 +1151,5 @@ continue - if ((token == "ipcarg_t") or (token == "unative_t")): + if (token == "sysarg_t"): output += "\n%s%s " % (tabs(indent), token) context.add(PROTOTYPE) Index: contrib/arch/kernel/kernel.adl =================================================================== --- contrib/arch/kernel/kernel.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/kernel/kernel.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -5,5 +5,5 @@ interface sys_klog { /* Print using kernel facility */ - unative_t sys_klog(int fd, const void *buf, size_t size); + sysarg_t sys_klog(int fd, const void *buf, size_t size); protocol: ?sys_klog* @@ -12,8 +12,8 @@ interface sys_console { /* Enable kernel console */ - unative_t sys_debug_enable_console(void); + sysarg_t sys_debug_enable_console(void); /* Disable kernel console */ - unative_t sys_debug_disable_console(void); + sysarg_t sys_debug_disable_console(void); protocol: ( @@ -25,5 +25,5 @@ interface sys_tls { /* Set thread-local storage pointer (on architectures where kernel mode is required) */ - unative_t sys_tls_set(unative_t addr); + sysarg_t sys_tls_set(sysarg_t addr); protocol: ?sys_tls_set* @@ -32,11 +32,11 @@ interface sys_thread { /* Create new thread */ - unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name, size_t name_len, thread_id_t *uspace_thread_id); + sysarg_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name, size_t name_len, thread_id_t *uspace_thread_id); /* Terminate current thread */ - unative_t sys_thread_exit(int uspace_status); + sysarg_t sys_thread_exit(int uspace_status); /* Get current thread id */ - unative_t sys_thread_get_id(thread_id_t *uspace_thread_id); + sysarg_t sys_thread_get_id(thread_id_t *uspace_thread_id); protocol: ( @@ -49,8 +49,8 @@ interface sys_task { /* Set name fo the current task */ - unative_t sys_task_set_name(const char *uspace_name, size_t name_len); + sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len); /* Get current task id */ - unative_t sys_task_get_id(task_id_t *uspace_task_id); + sysarg_t sys_task_get_id(task_id_t *uspace_task_id); protocol: ( @@ -62,5 +62,5 @@ interface sys_program { /* Spawn a new instance of clonable loader service */ - unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len); + sysarg_t sys_program_spawn_loader(char *uspace_name, size_t name_len); protocol: ?sys_program_spawn_loader* @@ -69,8 +69,8 @@ interface sys_futex { /* Sleep in a futex wait queue */ - unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags); + sysarg_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags); /* Wakeup one thread waiting in futex wait queue */ - unative_t sys_futex_wakeup(uintptr_t uaddr); + sysarg_t sys_futex_wakeup(uintptr_t uaddr); protocol: ( @@ -82,5 +82,5 @@ interface sys_smc { /* Enforce self-modifying code cache coherency */ - unative_t sys_smc_coherence(uintptr_t va, size_t size); + sysarg_t sys_smc_coherence(uintptr_t va, size_t size); protocol: ?sys_smc_coherence* @@ -89,14 +89,14 @@ interface sys_as { /* Create new address space area */ - unative_t sys_as_area_create(uintptr_t address, size_t size, int flags); + sysarg_t sys_as_area_create(uintptr_t address, size_t size, int flags); /* Resize an address space area */ - unative_t sys_as_area_resize(uinptr_t address, size_t size, int flags); + sysarg_t sys_as_area_resize(uinptr_t address, size_t size, int flags); /* Change flags of an address space area */ - unative_t sys_as_area_change_flags(uintptr_t address, int flags); + sysarg_t sys_as_area_change_flags(uintptr_t address, int flags); /* Destroy an address space area */ - unative_t sys_as_area_destroy(uintptr_t address); + sysarg_t sys_as_area_destroy(uintptr_t address); protocol: ( @@ -110,35 +110,35 @@ interface sys_ipc { /* Fast synchronous IPC call */ - unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data); + sysarg_t sys_ipc_call_sync_fast(sysarg_t phoneid, sysarg_t method, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_data_t *data); /* Slow synchronous IPC call */ - unative_t sys_ipc_call_sync_slow(unative_t phoneid, ipc_data_t *question, ipc_data_t *answer); + sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *question, ipc_data_t *answer); /* Fast asynchronous IPC call */ - unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method, unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4); + sysarg_t sys_ipc_call_async_fast(sysarg_t phoneid, sysarg_t method, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4); /* Slow asynchronous IPC call */ - unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data); + sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data); /* Fast forward a received IPC call to another destination */ - unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid, unative_t method, unative_t arg1, unative_t arg2, int mode); + sysarg_t sys_ipc_forward_fast(sysarg_t callid, sysarg_t phoneid, sysarg_t method, sysarg_t arg1, sysarg_t arg2, int mode); /* Slow forward a received IPC call to another destination */ - unative_t sys_ipc_forward_slow(unative_t callid, unative_t phoneid, ipc_data_t *data, int mode); + sysarg_t sys_ipc_forward_slow(sysarg_t callid, sysarg_t phoneid, ipc_data_t *data, int mode); /* Fast answer an IPC call */ - unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4); + sysarg_t sys_ipc_answer_fast(sysarg_t callid, sysarg_t retval, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4); /* Slow answer an IPC call */ - unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data); + sysarg_t sys_ipc_answer_slow(sysarg_t callid, ipc_data_t *data); /* Hang up a phone */ - unative_t sys_ipc_hangup(int phoneid); + sysarg_t sys_ipc_hangup(int phoneid); /* Wait for an incoming IPC call or answer */ - unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec, int flags); + sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec, int flags); /* Interrupt one thread of the current task from waiting on IPC call */ - unative_t sys_ipc_poke(void); + sysarg_t sys_ipc_poke(void); protocol: ( @@ -159,5 +159,5 @@ interface sys_event { /* Subscribe to kernel event notifications */ - unative_t sys_event_subscribe(unative_t evno, unative_t method); + sysarg_t sys_event_subscribe(sysarg_t evno, sysarg_t method); protocol: ?sys_event_subscribe* @@ -166,8 +166,8 @@ interface sys_cap { /* Grant capabilities to a task */ - unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps); + sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps); /* Revoke capabilities from a task */ - unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps); + sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps); protocol: ( @@ -179,20 +179,20 @@ interface sys_ddi { /* Enable access I/O address space for the current task */ - unative_t sys_enable_iospace(ddi_ioarg_t *uspace_io_arg); + sysarg_t sys_enable_iospace(ddi_ioarg_t *uspace_io_arg); /* Map physical memory to the current task's address space */ - unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base, unative_t pages, unative_t flags); + sysarg_t sys_physmem_map(sysarg_t phys_base, sysarg_t virt_base, sysarg_t pages, sysarg_t flags); /* Enable or disable preemption */ - unative_t sys_preempt_control(int enable); + sysarg_t sys_preempt_control(int enable); /* Assign unique device number */ - unative_t sys_device_assign_devno(void); + sysarg_t sys_device_assign_devno(void); /* Connect an IRQ handler to the current task */ - unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method, irq_code_t *ucode); + sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t method, irq_code_t *ucode); /* Disconnect an IRQ handler from the current task */ - unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno); + sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno); protocol: ( @@ -208,8 +208,8 @@ interface sys_sysinfo { /* Check for sysinfo key validity */ - unative_t sys_sysinfo_valid(unative_t ptr, unative_t len); + sysarg_t sys_sysinfo_valid(sysarg_t ptr, sysarg_t len); /* Get sysinfo key value */ - unative_t sys_sysinfo_value(unatice_t ptr, unative_t len); + sysarg_t sys_sysinfo_value(unatice_t ptr, sysarg_t len); protocol: ( @@ -221,5 +221,5 @@ interface sys_debug { /* Connect to the kernel debugging answerbox of a given task */ - unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg); + sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg); protocol: ?sys_ipc_connect_kbox* Index: contrib/arch/uspace/srv/bd/bd.adl =================================================================== --- contrib/arch/uspace/srv/bd/bd.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/bd/bd.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,14 +1,14 @@ interface bd extends service { /* Share out data buffer */ - ipcarg_t ipc_m_share_out(in ipcarg_t as_area_base, in ipcarg_t as_area_size, in ipcarg_t flags, out ipcarg_t dst_as_area_base); + sysarg_t ipc_m_share_out(in sysarg_t as_area_base, in sysarg_t as_area_size, in sysarg_t flags, out sysarg_t dst_as_area_base); /* Get block size */ - ipcarg_t get_block_size(out ipcarg_t block_size); + sysarg_t get_block_size(out sysarg_t block_size); /* Read blocks via shared data buffer */ - ipcarg_t read_blocks(in ipcarg_t index_lower, in ipcarg_t index_upper, in ipcarg_t count); + sysarg_t read_blocks(in sysarg_t index_lower, in sysarg_t index_upper, in sysarg_t count); /* Write blocks via shared data buffer */ - ipcarg_t write_blocks(in ipcarg_t index_lower, in ipcarg_t index_upper, in ipcarg_t count); + sysarg_t write_blocks(in sysarg_t index_lower, in sysarg_t index_upper, in sysarg_t count); protocol: [bd.bp] Index: contrib/arch/uspace/srv/console/console.adl =================================================================== --- contrib/arch/uspace/srv/console/console.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/console/console.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,41 +1,41 @@ interface console extends service { /* Read characters from console */ - ipcarg_t read(out_copy stream data); + sysarg_t read(out_copy stream data); /* Write characters to console */ - ipcarg_t write(in_copy stream data); + sysarg_t write(in_copy stream data); /* Get last event from event queue */ - ipcarg_t get_event(out ipcarg_t type, out ipcarg_t key, out ipcarg_t mods, out ipcarg_t char); + sysarg_t get_event(out sysarg_t type, out sysarg_t key, out sysarg_t mods, out sysarg_t char); /* Flush output buffer */ - ipcarg_t sync(void); + sysarg_t sync(void); /* Clear console */ - ipcarg_t clear(void); + sysarg_t clear(void); /* Move cursor to given position */ - ipcarg_t goto(in ipcarg_t col, in ipcarg_t row); + sysarg_t goto(in sysarg_t col, in sysarg_t row); /* Get console dimensions (in character cells) */ - ipcarg_t get_size(out ipcarg_t cols, in ipcarg_t rows); + sysarg_t get_size(out sysarg_t cols, in sysarg_t rows); /* Get color capabilities */ - ipcarg_t get_color_cap(void); + sysarg_t get_color_cap(void); /* Set abstract text style */ - ipcarg_t set_style(in ipcarg_t style); + sysarg_t set_style(in sysarg_t style); /* Set EGA-based text color */ - ipcarg_t set_color(in ipcarg_t fb_color, in ipcarg_t bg_color, in ipcarg_t attr); + sysarg_t set_color(in sysarg_t fb_color, in sysarg_t bg_color, in sysarg_t attr); /* Set RGB-based text color */ - ipcarg_t set_rgb_color(in ipcarg_t fb_color, in ipcarg_t bg_color); + sysarg_t set_rgb_color(in sysarg_t fb_color, in sysarg_t bg_color); /* Set cursor visibility */ - ipcarg_t cursor_visibility(in ipcarg_t visible); + sysarg_t cursor_visibility(in sysarg_t visible); /* Switch to kernel debugging console (if available) */ - ipcarg_t kcon_enable(void); + sysarg_t kcon_enable(void); protocol: [console.bp] Index: contrib/arch/uspace/srv/devmap/devmap.adl =================================================================== --- contrib/arch/uspace/srv/devmap/devmap.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/devmap/devmap.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,26 +1,26 @@ interface devmap_driver { /* Establish connection (iface is DEVMAP_DRIVER) */ - ipcarg_t ipc_m_connect_me_to(in ipcarg_t iface); + sysarg_t ipc_m_connect_me_to(in sysarg_t iface); /* Register as a new driver */ - ipcarg_t driver_register(in_copy string name); + sysarg_t driver_register(in_copy string name); /* Unregister all devices and the driver itself */ - ipcarg_t driver_unregister(void); + sysarg_t driver_unregister(void); /* Register new device and return handle */ - ipcarg_t device_register(in_copy string name, out ipcarg_t handle); + sysarg_t device_register(in_copy string name, out sysarg_t handle); /* Unregister device */ - ipcarg_t device_unregister(in ipcarg_t handle); + sysarg_t device_unregister(in sysarg_t handle); /* Resolve device name to handle */ - ipcarg_t device_get_handle(in ipcarg_t flags, in_copy string name); + sysarg_t device_get_handle(in sysarg_t flags, in_copy string name); /* Get device name for a given handle */ - ipcarg_t device_get_name(in ipcarg_t handle); + sysarg_t device_get_name(in sysarg_t handle); /* Close connection */ - ipcarg_t ipc_m_phone_hungup(void); + sysarg_t ipc_m_phone_hungup(void); protocol: [devmap_driver.bp] @@ -29,26 +29,26 @@ interface devmap_client { /* Establish connection (iface is DEVMAP_CLIENT) or forward to device (iface is DEVMAP_CONNECT_TO_DEVICE) */ - ipcarg_t ipc_m_connect_me_to(in ipcarg_t iface, in ipcarg_t handle); + sysarg_t ipc_m_connect_me_to(in sysarg_t iface, in sysarg_t handle); /* Resolve device name to handle */ - ipcarg_t device_get_handle(in ipcarg_t flags, in_copy string name); + sysarg_t device_get_handle(in sysarg_t flags, in_copy string name); /* Get device name for a given handle */ - ipcarg_t device_get_name(in ipcarg_t handle); + sysarg_t device_get_name(in sysarg_t handle); /* Clone NULL device */ - ipcarg_t device_null_create(out ipcarg_t index); + sysarg_t device_null_create(out sysarg_t index); /* Destroy NULL device */ - ipcarg_t device_null_destroy(in ipcarg_t index); + sysarg_t device_null_destroy(in sysarg_t index); /* Get number of devices */ - ipcarg_t device_get_count(out ipcarg_t count); + sysarg_t device_get_count(out sysarg_t count); /* Get an array of (device_name, handle) pairs */ - ipcarg_t device_get_devices(out_copy stream data); + sysarg_t device_get_devices(out_copy stream data); /* Close connection */ - ipcarg_t ipc_m_phone_hungup(void); + sysarg_t ipc_m_phone_hungup(void); protocol: [devmap_client.bp] Index: contrib/arch/uspace/srv/fb/fb.adl =================================================================== --- contrib/arch/uspace/srv/fb/fb.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/fb/fb.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,98 +1,98 @@ interface fb extends service { /* Get screen resolution */ - ipcarg_t get_resolution(out ipcarg_t width, out ipcarg_t height); + sysarg_t get_resolution(out sysarg_t width, out sysarg_t height); /* Yield screen */ - ipcarg_t screen_yield(void); + sysarg_t screen_yield(void); /* Reclaim screen */ - ipcarg_t screen_reclaim(void); + sysarg_t screen_reclaim(void); /* Set mouse cursor position on screen */ - ipcarg_t pointer_move(in ipcarg_t x, in ipcarg_t y); + sysarg_t pointer_move(in sysarg_t x, in sysarg_t y); /* Create new viewport */ - ipcarg_t viewport_create(in ipcarg_t origin, in ipcarg_t dimension); + sysarg_t viewport_create(in sysarg_t origin, in sysarg_t dimension); /* Get viewport size in character cells */ - ipcarg_t get_csize(out ipcarg_t width, out ipcarg_t height); + sysarg_t get_csize(out sysarg_t width, out sysarg_t height); /* Clear viewport character buffer */ - ipcarg_t clear(void); + sysarg_t clear(void); /* Scroll viewport character buffer */ - ipcarg_t scroll(in ipcarg_t lines); + sysarg_t scroll(in sysarg_t lines); /* Set active viewport */ - ipcarg_t viewport_switch(in ipcarg_t index); + sysarg_t viewport_switch(in sysarg_t index); /* Delete viewport */ - ipcarg_t viewport_delete(in ipcarg_t index); + sysarg_t viewport_delete(in sysarg_t index); /* Get color capabilities of the screen */ - ipcarg_t get_color_cap(void); + sysarg_t get_color_cap(void); /* Set abstract text style */ - ipcarg_t set_style(in ipcarg_t style); + sysarg_t set_style(in sysarg_t style); /* Set EGA-based text color */ - ipcarg_t set_color(in ipcarg_t fg_color, in ipcarg_t bg_color, in ipcarg_t atrr); + sysarg_t set_color(in sysarg_t fg_color, in sysarg_t bg_color, in sysarg_t atrr); /* Set RGB-based text color */ - ipcarg_t set_rgb_color(in ipcarg_t fg_color, in ipcarg_t bg_color); + sysarg_t set_rgb_color(in sysarg_t fg_color, in sysarg_t bg_color); /* Put a character to a given position in viewport character buffer */ - ipcarg_t putchar(in ipcarg_t char, in ipcarg_t col, in ipcarg_t row); + sysarg_t putchar(in sysarg_t char, in sysarg_t col, in sysarg_t row); /* Set character cursor visibility in viewport */ - ipcarg_t cursor_visibility(in ipcarg_t visible); + sysarg_t cursor_visibility(in sysarg_t visible); /* Set character cursor position in viewport */ - ipcarg_t cursor_goto(in ipcarg_t col, in ipcarg_t row); + sysarg_t cursor_goto(in sysarg_t col, in sysarg_t row); /* Prepare memory sharing of bitmaps */ - ipcarg_t prepare_shm(in ipcarg_t as_area_base); + sysarg_t prepare_shm(in sysarg_t as_area_base); /* Share bitmap or text data */ - ipcarg_t ipc_m_share_out(in ipcarg_t as_area_base, in ipcarg_t as_area_size, out ipcarg_t dst_as_area); + sysarg_t ipc_m_share_out(in sysarg_t as_area_base, in sysarg_t as_area_size, out sysarg_t dst_as_area); /* Drop memory sharing */ - ipcarg_t drop_shm(void); + sysarg_t drop_shm(void); /* Draw PPM data from shared memory to viewport */ - ipcarg_t draw_ppm(in ipcarg_t x, in ipcarg_t y); + sysarg_t draw_ppm(in sysarg_t x, in sysarg_t y); /* Put characters from shared memory to viewport */ - ipcarg_t draw_text_data(in ipcarg_t x, in ipcarg_t y, in ipcarg_t width, in ipcarg_t height); + sysarg_t draw_text_data(in sysarg_t x, in sysarg_t y, in sysarg_t width, in sysarg_t height); /* Convert PPM data from shared memory to pixmap */ - ipcarg_t shm2pixmap(void); + sysarg_t shm2pixmap(void); /* Save viewport contents to a pixmap */ - ipcarg_t vp2pixmap(in ipcarg_t vp_index); + sysarg_t vp2pixmap(in sysarg_t vp_index); /* Draw pixmap to viewport */ - ipcarg_t vp_draw_pixmap(in ipcarg_t vp_index, in ipcarg_t pm_index); + sysarg_t vp_draw_pixmap(in sysarg_t vp_index, in sysarg_t pm_index); /* Discard pixmap */ - ipcarg_t drop_pixmap(in ipcarg_t pm_index); + sysarg_t drop_pixmap(in sysarg_t pm_index); /* Create new (empty) animation for a viewport */ - ipcarg_t anim_create(in ipcarg_t vp_index); + sysarg_t anim_create(in sysarg_t vp_index); /* Append a pixmap to an animation */ - ipcarg_t anim_addpixmap(in ipcarg_t anim_index, in ipcarg_t pm_index); + sysarg_t anim_addpixmap(in sysarg_t anim_index, in sysarg_t pm_index); /* Change a viewport associated with an animation */ - ipcarg_t anim_chgvp(in ipcarg_t anim_index, in ipcarg_t vp_index); + sysarg_t anim_chgvp(in sysarg_t anim_index, in sysarg_t vp_index); /* Start animation playback */ - ipcarg_t anim_start(in ipcarg_t anim_index); + sysarg_t anim_start(in sysarg_t anim_index); /* Stop animation playback */ - ipcarg_t anim_stop(in ipcarg_t anim_index); + sysarg_t anim_stop(in sysarg_t anim_index); /* Delete animation */ - ipcarg_t anim_drop(in ipcarg_t anim_index); + sysarg_t anim_drop(in sysarg_t anim_index); protocol: [fb.bp] Index: contrib/arch/uspace/srv/kbd/kbd.adl =================================================================== --- contrib/arch/uspace/srv/kbd/kbd.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/kbd/kbd.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,11 +1,11 @@ interface kbd extends service { /* Callback connection */ - ipcarg_t ipc_m_connect_to_me(void); + sysarg_t ipc_m_connect_to_me(void); /* Yield hardware */ - ipcarg_t yield(void); + sysarg_t yield(void); /* Reclaim hardware */ - ipcarg_t reclaim(void); + sysarg_t reclaim(void); protocol: [kbd.bp] @@ -14,5 +14,5 @@ interface event { /* Send keyboard event */ - ipcarg_t event(in ipcarg_t type, in ipcarg_t key, in ipcarg_t mods, in ipcarg_t char); + sysarg_t event(in sysarg_t type, in sysarg_t key, in sysarg_t mods, in sysarg_t char); protocol: [event.bp] Index: contrib/arch/uspace/srv/loader/loader.adl =================================================================== --- contrib/arch/uspace/srv/loader/loader.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/loader/loader.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,20 +1,20 @@ interface loader extends service { /* Set task pathname */ - ipcarg_t set_pathname(in_copy string pathname); + sysarg_t set_pathname(in_copy string pathname); /* Set task arguments */ - ipcarg_t set_args(in_copy stream args); + sysarg_t set_args(in_copy stream args); /* Set task initial files */ - ipcarg_t set_files(in_copy stream files); + sysarg_t set_files(in_copy stream files); /* Get task ID */ - ipcarg_t get_taskid(out_copy stream id); + sysarg_t get_taskid(out_copy stream id); /* Load binary */ - ipcarg_t load(void); + sysarg_t load(void); /* Run binary */ - ipcarg_t run(void); + sysarg_t run(void); protocol: [loader.bp] Index: contrib/arch/uspace/srv/ns/ns.adl =================================================================== --- contrib/arch/uspace/srv/ns/ns.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/ns/ns.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,26 +1,26 @@ interface ns { /* Register a clonable service or a generic service */ - ipcarg_t ipc_m_connect_to_me(in ipcarg_t service); + sysarg_t ipc_m_connect_to_me(in sysarg_t service); /* Connect to a clonable service or a generic service */ - ipcarg_t ipc_m_connect_me_to(in ipcarg_t service, in ipcarg_t arg2, in ipcarg_t arg3, in ipcarg_t flags); + sysarg_t ipc_m_connect_me_to(in sysarg_t service, in sysarg_t arg2, in sysarg_t arg3, in sysarg_t flags); /* Share real-time clock page or klog page */ - ipcarg_t ipc_m_share_in(in ipcarg_t as_area_base, in ipcarg_t as_area_size, in ipcarg_t service); + sysarg_t ipc_m_share_in(in sysarg_t as_area_base, in sysarg_t as_area_size, in sysarg_t service); /* For IPC testing purposes */ - ipcarg_t ping(void); + sysarg_t ping(void); /* Wait for task exit and get exit status and return value */ - ipcarg_t task_wait(in ipcarg_t id_lower, in ipcarg_t id_upper, out ipcarg_t status, out ipcarg_t retval); + sysarg_t task_wait(in sysarg_t id_lower, in sysarg_t id_upper, out sysarg_t status, out sysarg_t retval); /* Introduce a new loader task id in such a way it cannot be spoofed */ - ipcarg_t id_intro(in ipcarg_t id_lower, in ipcarg_t id_upper); + sysarg_t id_intro(in sysarg_t id_lower, in sysarg_t id_upper); /* Set task return value */ - ipcarg_t retval(in ipcarg_t retval); + sysarg_t retval(in sysarg_t retval); /* Implicit connection close */ - ipcarg_t ipc_m_phone_hungup(void); + sysarg_t ipc_m_phone_hungup(void); protocol: [ns.bp] Index: contrib/arch/uspace/srv/ns/service.adl =================================================================== --- contrib/arch/uspace/srv/ns/service.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/ns/service.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -2,7 +2,7 @@ /* Establish connection with the service (this call is forwarded from Naming Service or Device Mapper) */ - ipcarg_t ipc_m_connect_me_to(void); + sysarg_t ipc_m_connect_me_to(void); /* Close connection */ - ipcarg_t ipc_m_phone_hungup(void); + sysarg_t ipc_m_phone_hungup(void); }; Index: contrib/arch/uspace/srv/vfs/vfs.adl =================================================================== --- contrib/arch/uspace/srv/vfs/vfs.adl (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/arch/uspace/srv/vfs/vfs.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -1,50 +1,50 @@ interface vfs extends service { /* Register a filesystem driver */ - ipcarg_t register(in_copy string name); + sysarg_t register(in_copy string name); /* Mount filesystem */ - ipcarg_t mount(in ipcarg_t device, in ipcarg_t flags, in_copy string point, in_copy string opts, in_copy string fs); + sysarg_t mount(in sysarg_t device, in sysarg_t flags, in_copy string point, in_copy string opts, in_copy string fs); /* Open file */ - ipcarg_t open(in ipcarg_t lflag, in ipcarg_t oflag, in ipcarg_t mode, in_copy string path, out ipcarg_t fd); + sysarg_t open(in sysarg_t lflag, in sysarg_t oflag, in sysarg_t mode, in_copy string path, out sysarg_t fd); /* Open file using node */ - ipcarg_t open_node(in ipcarg_t fs_handle, in ipcarg_t dev_handle, in ipcarg_t index, in ipcarg_t oflag, out ipcarg_t fd); + sysarg_t open_node(in sysarg_t fs_handle, in sysarg_t dev_handle, in sysarg_t index, in sysarg_t oflag, out sysarg_t fd); /* Read data from file */ - ipcarg_t read(in ipcarg_t fd, out_copy stream data); + sysarg_t read(in sysarg_t fd, out_copy stream data); /* Write data to file */ - ipcarg_t write(in ipcarg_t fd, in_copy stream data); + sysarg_t write(in sysarg_t fd, in_copy stream data); /* Seek in file */ - ipcarg_t seek(in ipcarg_t fd, in ipcarg_t offset, in ipcarg_t whence); + sysarg_t seek(in sysarg_t fd, in sysarg_t offset, in sysarg_t whence); /* Truncate file */ - ipcarg_t truncate(in ipcarg_t fd, in ipcarg_t size); + sysarg_t truncate(in sysarg_t fd, in sysarg_t size); /* Get file metadata */ - ipcarg_t fstat(in ipcarg_t fd, out_copy stream stat); + sysarg_t fstat(in sysarg_t fd, out_copy stream stat); /* Get directory entry metadata */ - ipcarg_t stat(in_copy string path, out_copy stream stat); + sysarg_t stat(in_copy string path, out_copy stream stat); /* Create directory */ - ipcarg_t mkdir(in ipcarg_t mode, in_copy string path); + sysarg_t mkdir(in sysarg_t mode, in_copy string path); /* Delete directory entry */ - ipcarg_t unlink(in ipcarg_t lflag, in_copy string path); + sysarg_t unlink(in sysarg_t lflag, in_copy string path); /* Rename directory entry */ - ipcarg_t rename(in_copy string old, in_copy string new); + sysarg_t rename(in_copy string old, in_copy string new); /* Flush file buffers */ - ipcarg_t sync(in ipcarg_t fd); + sysarg_t sync(in sysarg_t fd); /* In-protocol status value */ - ipcarg_t ipc_m_ping(void); + sysarg_t ipc_m_ping(void); /* Close connection */ - ipcarg_t ipc_m_phone_hungup(void); + sysarg_t ipc_m_phone_hungup(void); protocol: [vfs.bp] @@ -53,32 +53,32 @@ interface fs extends service { /* Notify filesystem that it was mounted */ - ipcarg_t mounted(in ipcarg_t dev_handle, in_copy string opts); + sysarg_t mounted(in sysarg_t dev_handle, in_copy string opts); /* Mount filesystem */ - ipcarg_t mount(in ipcarg_t device, in ipcarg_t flags, in_copy string point, in_copy string opts, ...); + sysarg_t mount(in sysarg_t device, in sysarg_t flags, in_copy string point, in_copy string opts, ...); /* Open file by node */ - ipcarg_t open_node(in ipcarg_t lflag, in ipcarg_t oflag, in ipcarg_t mode, ...); + sysarg_t open_node(in sysarg_t lflag, in sysarg_t oflag, in sysarg_t mode, ...); /* Lookup file */ - ipcarg_t lookup(in ipcarg_t lflag, in ipcarg_t oflag, in ipcarg_t mode, ...); + sysarg_t lookup(in sysarg_t lflag, in sysarg_t oflag, in sysarg_t mode, ...); /* Read data from file */ - ipcarg_t read(in ipcarg_t dev_handle, in ipcarg_t fs_index, in ipcarg_t offset, out_copy stream data); + sysarg_t read(in sysarg_t dev_handle, in sysarg_t fs_index, in sysarg_t offset, out_copy stream data); /* Write data to file */ - ipcarg_t write(in ipcarg_t dev_handle, in ipcarg_t fs_index, in ipcarg_t offset, in_copy stream data); + sysarg_t write(in sysarg_t dev_handle, in sysarg_t fs_index, in sysarg_t offset, in_copy stream data); /* Truncate file */ - ipcarg_t truncate(in ipcarg_t dev_handle, in ipcarg_t fs_index, in ipcarg_t size); + sysarg_t truncate(in sysarg_t dev_handle, in sysarg_t fs_index, in sysarg_t size); /* Get directory entry metadata */ - ipcarg_t stat(in ipcarg_t dev_handle, in ipcarg_t fs_index, out_copy stream stat); + sysarg_t stat(in sysarg_t dev_handle, in sysarg_t fs_index, out_copy stream stat); /* Flush file buffers */ - ipcarg_t sync(in ipcarg_t dev_handle, in ipcarg_t fs_index); + sysarg_t sync(in sysarg_t dev_handle, in sysarg_t fs_index); /* Notify on file close */ - ipcarg_t close(in ipcarg_t dev_handle, in ipcarg_t fs_index); + sysarg_t close(in sysarg_t dev_handle, in sysarg_t fs_index); }; Index: contrib/highlight/adl.syntax =================================================================== --- contrib/highlight/adl.syntax (revision 3e94678ca4b8661fc8aff4add4d6da0203d31718) +++ contrib/highlight/adl.syntax (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -17,5 +17,5 @@ keyword whole delegate yellow - keyword whole ipcarg_t yellow + keyword whole sysarg_t yellow keyword whole string yellow keyword whole stream yellow