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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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 (moved) (moved from uspace/lib/packet/include/packet_local.h ) (2 diffs)

uspace/drv/test1/char.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libpacket
- * @{
- */
-
 /** @file
  */
 
-#ifndef LIBPACKET_PACKET_LOCAL_H_
-#define LIBPACKET_PACKET_LOCAL_H_
+#include <assert.h>
+#include <errno.h>
+#include <mem.h>
+#include <ops/char_dev.h>
 
-#include <net/packet.h>
+#include "test1.h"
 
-/** @name Packet local interface
- */
-/*@{*/
+static int impl_char_read(ddf_fun_t *fun, char *buf, size_t count) {
+        memset(buf, 0, count);
+        return count;
+}
 
-extern int packet_translate_local(int, packet_ref, packet_id_t);
-extern packet_t packet_get_4_local(int, size_t, size_t, size_t, size_t);
-extern packet_t packet_get_1_local(int, size_t);
-extern void pq_release_local(int, packet_id_t);
+static int imp_char_write(ddf_fun_t *fun, char *buf, size_t count) {
+        return count;
+}
 
-/*@}*/
+static char_dev_ops_t char_dev_ops = {
+        .read = &impl_char_read,
+        .write = &imp_char_write
+};
 
-#endif
+ddf_dev_ops_t char_device_ops = {
+        .interfaces[CHAR_DEV_IFACE] = &char_dev_ops
+};
 
-/** @}
- */