Changeset 8e7c9fe in mainline for uspace/app/kio/kio.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/app/kio/kio.c (modified) (7 diffs)

uspace/app/kio/kio.c

@@ -39 +39 @@
 #include <as.h>
 #include <ddi.h>
-#include <event.h>
 #include <errno.h>
 #include <str_error.h>
@@ -63 +62 @@
 
 /* Pointer to kio area */
-static wchar_t *kio;
+static wchar_t *kio = (wchar_t *) AS_AREA_ANY;
 static size_t kio_length;
 
@@ -149 +148 @@
  *
  */
-static void notification_received(ipc_callid_t callid, ipc_call_t *call)
+static void kio_notification_handler(ipc_callid_t callid, ipc_call_t *call,
+    void *arg)
 {
         /*
@@ -181 +181 @@
                 producer(kio_stored, kio + offset);
         
-        event_unmask(EVENT_KIO);
+        async_event_unmask(EVENT_KIO);
         fibril_mutex_unlock(&mtx);
 }
@@ -214 +214 @@
         
         prodcons_initialize(&pc);
-        async_set_interrupt_received(notification_received);
-        rc = event_subscribe(EVENT_KIO, 0);
+        rc = async_event_subscribe(EVENT_KIO, kio_notification_handler, NULL);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to register kio notifications\n",
@@ -233 +232 @@
                 fprintf(stderr, "%s: Could not create input\n", NAME);
                 return ENOMEM;
-        }       
+        }
 
         fibril_add_ready(fid);
-        event_unmask(EVENT_KIO);
+        async_event_unmask(EVENT_KIO);
         kio_update();
         
@@ -251 +250 @@
                 free(str);
         }
- 
+
         if (rc == ENOENT)
-                rc = EOK;       
+                rc = EOK;
 
         return EOK;