Changeset 7bdcc45 in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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:

• uspace/srv/devmap/devmap.c (modified) (13 diffs)

uspace/srv/devmap/devmap.c

@@ -61 +61 @@
         link_t devices;
         /** Phone asociated with this driver */
-        ipcarg_t phone;
+        sysarg_t phone;
         /** Device driver name */
         char *name;
@@ -387 +387 @@
         ipc_callid_t iid = async_get_call(&icall);
         
-        if (IPC_GET_METHOD(icall) != DEVMAP_DRIVER_REGISTER) {
+        if (IPC_GET_IMETHOD(icall) != DEVMAP_DRIVER_REGISTER) {
                 ipc_answer_0(iid, EREFUSED);
                 return NULL;
@@ -416 +416 @@
         ipc_callid_t callid = async_get_call(&call);
         
-        if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
+        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
                 free(driver->name);
                 free(driver);
@@ -555 +555 @@
         if (devmap_device_find_name(namespace->name, device->name) != NULL) {
                 printf("%s: Device '%s/%s' already registered\n", NAME,
-                    device->namespace, device->name);
+                    device->namespace->name, device->name);
                 devmap_namespace_destroy(namespace);
                 fibril_mutex_unlock(&devices_list_mutex);
@@ -823 +823 @@
         }
         
-        ipcarg_t retval = async_data_read_finalize(callid, desc, size);
+        sysarg_t retval = async_data_read_finalize(callid, desc, size);
         
         free(desc);
@@ -890 +890 @@
         }
         
-        ipcarg_t retval = async_data_read_finalize(callid, desc, size);
+        sysarg_t retval = async_data_read_finalize(callid, desc, size);
         
         free(desc);
@@ -964 +964 @@
         fibril_mutex_unlock(&null_devices_mutex);
         
-        ipc_answer_1(iid, EOK, (ipcarg_t) i);
+        ipc_answer_1(iid, EOK, (sysarg_t) i);
 }
 
 static void devmap_null_destroy(ipc_callid_t iid, ipc_call_t *icall)
 {
-        ipcarg_t i = IPC_GET_ARG1(*icall);
+        sysarg_t i = IPC_GET_ARG1(*icall);
         if (i >= NULL_DEVICES) {
                 ipc_answer_0(iid, ELIMIT);
@@ -1027 +1027 @@
                 ipc_callid_t callid = async_get_call(&call);
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -1052 +1052 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -1079 +1078 @@
                 ipc_callid_t callid = async_get_call(&call);
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -1111 +1110 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -1123 +1121 @@
 {
         /* Select interface */
-        switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
+        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
         case DEVMAP_DRIVER:
                 devmap_connection_driver(iid, icall);
@@ -1156 +1154 @@
         
         /* Register device mapper at naming service */
-        ipcarg_t phonead;
+        sysarg_t phonead;
         if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, 0, &phonead) != 0) 
                 return -1;