Changeset ad7a6c9 in mainline for uspace/drv/test1/char.c

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/drv/test1/char.c (modified) (1 diff)

uspace/drv/test1/char.c

@@ -33 +33 @@
 #include <errno.h>
 #include <mem.h>
-#include <char.h>
+#include <ops/char_dev.h>
 
 #include "test1.h"
 
-static int impl_char_read(device_t *dev, char *buf, size_t count) {
+static int impl_char_read(ddf_fun_t *fun, char *buf, size_t count) {
         memset(buf, 0, count);
         return count;
 }
 
-static int imp_char_write(device_t *dev, char *buf, size_t count) {
+static int imp_char_write(ddf_fun_t *fun, char *buf, size_t count) {
         return count;
 }
 
-static char_iface_t char_interface = {
+static char_dev_ops_t char_dev_ops = {
         .read = &impl_char_read,
         .write = &imp_char_write
 };
 
-device_ops_t char_device_ops = {
-        .interfaces[CHAR_DEV_IFACE] = &char_interface
+ddf_dev_ops_t char_device_ops = {
+        .interfaces[CHAR_DEV_IFACE] = &char_dev_ops
 };