Changeset 8e7c9fe in mainline for uspace/lib/c/generic/io/chardev.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/lib/c/generic/io/chardev.c (moved) (moved from uspace/drv/char/ps2mouse/chardev.c ) (3 diffs)

uspace/lib/c/generic/io/chardev.c

@@ -29 +29 @@
 #include <errno.h>
 #include <mem.h>
-#include <ipc/dev_iface.h>
-#include <ddf/log.h>
-
-#include "chardev.h"
-
-// TODO make this shared
-enum {
-        IPC_CHAR_READ = DEV_FIRST_CUSTOM_METHOD,
-        IPC_CHAR_WRITE,
-};
+#include <io/chardev.h>
+#include <ipc/chardev.h>
 
 ssize_t chardev_read(async_exch_t *exch, void *data, size_t size)
@@ -48 +40 @@
 
         sysarg_t message[4] = { 0 };
-        const ssize_t ret = async_req_1_4(exch, IPC_CHAR_READ, size,
+        const ssize_t ret = async_req_1_4(exch, CHARDEV_READ, size,
             &message[0], &message[1], &message[2], &message[3]);
         if (ret > 0 && (size_t)ret <= size)
@@ -64 +56 @@
         sysarg_t message[3] = { 0 };
         memcpy(message, data, size);
-        return async_req_4_0(exch, IPC_CHAR_WRITE, size,
+        return async_req_4_0(exch, CHARDEV_WRITE, size,
             message[0], message[1], message[2]);
 }