Changeset 977fcea in mainline for uspace/drv/test1/char.c

Timestamp:

2011-01-14T10:11:11Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f9dd44d

Parents:

0bd2879 (diff), 6610565b (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:

development branch merge

File:

• uspace/drv/test1/char.c (modified) (3 diffs)

uspace/drv/test1/char.c

@@ -33 +33 @@
 #include <errno.h>
 #include <mem.h>
-#include <char.h>
+#include <ops/char_dev.h>
 
 #include "test1.h"
@@ -46 +46 @@
 }
 
-static char_iface_t char_interface = {
+static char_dev_ops_t char_dev_ops = {
         .read = &impl_char_read,
         .write = &imp_char_write
@@ -52 +52 @@
 
 device_ops_t char_device_ops = {
-        .interfaces[CHAR_DEV_IFACE] = &char_interface
+        .interfaces[CHAR_DEV_IFACE] = &char_dev_ops
 };