Changeset 92574f4 in mainline for uspace/lib/drv/include/ops/char_dev.h

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/drv/include/ops/char_dev.h (modified) (1 diff)

uspace/lib/drv/include/ops/char_dev.h

@@ -36 +36 @@
 #define LIBDRV_OPS_CHAR_DEV_H_
 
-#include "../driver.h"
+#include "../ddf/driver.h"
 
 typedef struct {
-        int (*read)(device_t *, char *, size_t);
-        int (*write)(device_t *, char *, size_t);
+        int (*read)(ddf_fun_t *, char *, size_t);
+        int (*write)(ddf_fun_t *, char *, size_t);
 } char_dev_ops_t;