Changeset 8e7c9fe in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/vfs/vfs.c (modified) (4 diffs)

uspace/srv/vfs/vfs.c

@@ -38 +38 @@
 #include <vfs/vfs.h>
 #include <ipc/services.h>
-#include <abi/ipc/event.h>
-#include <event.h>
 #include <ns.h>
 #include <async.h>
@@ -53 +51 @@
 #define NAME  "vfs"
 
-enum {
-        VFS_TASK_STATE_CHANGE
-};
-
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -145 +139 @@
 }
 
-static void notification_received(ipc_callid_t callid, ipc_call_t *call)
+static void notification_handler(ipc_callid_t callid, ipc_call_t *call, void *arg)
 {
-        switch (IPC_GET_IMETHOD(*call)) {
-        case VFS_TASK_STATE_CHANGE:
-                if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
-                        vfs_pass_handle(
-                            (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
-                            IPC_GET_ARG5(*call)), call->in_task_id,
-                            (int) IPC_GET_ARG2(*call));
-                break;
-        default:
-                break;
-        }
+        if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
+                vfs_pass_handle(
+                    (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
+                    IPC_GET_ARG5(*call)), call->in_task_id,
+                    (int) IPC_GET_ARG2(*call));
 }
 
@@ -196 +184 @@
 
         /*
-         * Set notification handler and subscribe to notifications.
-         */
-        async_set_interrupt_received(notification_received);
-        event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE);
+         * Subscribe to notifications.
+         */
+        async_event_task_subscribe(EVENT_TASK_STATE_CHANGE, notification_handler,
+            NULL);
         
         /*