Changeset 8fb1bf82 in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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) (8 diffs)

uspace/srv/devmap/devmap.c

@@ -75 +75 @@
         link_t namespaces;
         /** Unique namespace identifier */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         /** Namespace name */
         char *name;
@@ -92 +92 @@
         link_t driver_devices;
         /** Unique device identifier */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         /** Device namespace */
         devmap_namespace_t *namespace;
@@ -118 +118 @@
 static FIBRIL_MUTEX_INITIALIZE(null_devices_mutex);
 
-static dev_handle_t last_handle = 0;
+static devmap_handle_t last_handle = 0;
 static devmap_device_t *null_devices[NULL_DEVICES];
 
-static dev_handle_t devmap_create_handle(void)
+static devmap_handle_t devmap_create_handle(void)
 {
         /* TODO: allow reusing old handles after their unregistration
@@ -233 +233 @@
  *
  */
-static devmap_namespace_t *devmap_namespace_find_handle(dev_handle_t handle)
+static devmap_namespace_t *devmap_namespace_find_handle(devmap_handle_t handle)
 {
         link_t *item;
@@ -275 +275 @@
  *
  */
-static devmap_device_t *devmap_device_find_handle(dev_handle_t handle)
+static devmap_device_t *devmap_device_find_handle(devmap_handle_t handle)
 {
         link_t *item;
@@ -608 +608 @@
          * Get handle from request
          */
-        dev_handle_t handle = IPC_GET_ARG2(*call);
+        devmap_handle_t handle = IPC_GET_ARG2(*call);
         devmap_device_t *dev = devmap_device_find_handle(handle);
         
@@ -1052 +1052 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -1111 +1110 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }