Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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.
Message:

Merge mainline changes

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/arch/uspace/srv/devmap/devmap.adl

    r37f7cfe ra9b6bec  
    11interface devmap_driver {
    22                /* Establish connection (iface is DEVMAP_DRIVER) */
    3                 ipcarg_t ipc_m_connect_me_to(in ipcarg_t iface);
     3                sysarg_t ipc_m_connect_me_to(in sysarg_t iface);
    44               
    55                /* Register as a new driver */
    6                 ipcarg_t driver_register(in_copy string name);
     6                sysarg_t driver_register(in_copy string name);
    77               
    88                /* Unregister all devices and the driver itself */
    9                 ipcarg_t driver_unregister(void);
     9                sysarg_t driver_unregister(void);
    1010               
    1111                /* Register new device and return handle */
    12                 ipcarg_t device_register(in_copy string name, out ipcarg_t handle);
     12                sysarg_t device_register(in_copy string name, out sysarg_t handle);
    1313               
    1414                /* Unregister device */
    15                 ipcarg_t device_unregister(in ipcarg_t handle);
     15                sysarg_t device_unregister(in sysarg_t handle);
    1616               
    1717                /* Resolve device name to handle */
    18                 ipcarg_t device_get_handle(in ipcarg_t flags, in_copy string name);
     18                sysarg_t device_get_handle(in sysarg_t flags, in_copy string name);
    1919               
    2020                /* Get device name for a given handle */
    21                 ipcarg_t device_get_name(in ipcarg_t handle);
     21                sysarg_t device_get_name(in sysarg_t handle);
    2222               
    2323                /* Close connection */
    24                 ipcarg_t ipc_m_phone_hungup(void);
     24                sysarg_t ipc_m_phone_hungup(void);
    2525        protocol:
    2626                [devmap_driver.bp]
     
    2929interface devmap_client {
    3030                /* Establish connection (iface is DEVMAP_CLIENT) or forward to device (iface is DEVMAP_CONNECT_TO_DEVICE) */
    31                 ipcarg_t ipc_m_connect_me_to(in ipcarg_t iface, in ipcarg_t handle);
     31                sysarg_t ipc_m_connect_me_to(in sysarg_t iface, in sysarg_t handle);
    3232               
    3333                /* Resolve device name to handle */
    34                 ipcarg_t device_get_handle(in ipcarg_t flags, in_copy string name);
     34                sysarg_t device_get_handle(in sysarg_t flags, in_copy string name);
    3535               
    3636                /* Get device name for a given handle */
    37                 ipcarg_t device_get_name(in ipcarg_t handle);
     37                sysarg_t device_get_name(in sysarg_t handle);
    3838               
    3939                /* Clone NULL device */
    40                 ipcarg_t device_null_create(out ipcarg_t index);
     40                sysarg_t device_null_create(out sysarg_t index);
    4141               
    4242                /* Destroy NULL device */
    43                 ipcarg_t device_null_destroy(in ipcarg_t index);
     43                sysarg_t device_null_destroy(in sysarg_t index);
    4444               
    4545                /* Get number of devices */
    46                 ipcarg_t device_get_count(out ipcarg_t count);
     46                sysarg_t device_get_count(out sysarg_t count);
    4747               
    4848                /* Get an array of (device_name, handle) pairs */
    49                 ipcarg_t device_get_devices(out_copy stream data);
     49                sysarg_t device_get_devices(out_copy stream data);
    5050               
    5151                /* Close connection */
    52                 ipcarg_t ipc_m_phone_hungup(void);
     52                sysarg_t ipc_m_phone_hungup(void);
    5353        protocol:
    5454                [devmap_client.bp]
Note: See TracChangeset for help on using the changeset viewer.