Changeset ea28272 in mainline for contrib/arch/uspace/srv/devmap/devmap.adl

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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.

File:

• contrib/arch/uspace/srv/devmap/devmap.adl (modified) (2 diffs)

contrib/arch/uspace/srv/devmap/devmap.adl

@@ -1 +1 @@
 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 +29 @@
 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]