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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/drv/test1/char.c (moved) (moved from uspace/srv/net/il/arp/arp_oc.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 arp
- *  @{
+/** @file
  */
 
-/** @file
- * ARP operation codes according to the on-line IANA - Address Resolution
- * Protocol (ARP) Parameters
- * http://www.iana.org/assignments/arp-parameters/arp-parameters.xml
- * cited January 14 2009.
- */
+#include <assert.h>
+#include <errno.h>
+#include <mem.h>
+#include <ops/char_dev.h>
 
-#ifndef NET_ARP_ARPOP_H_
-#define NET_ARP_ARPOP_H_
+#include "test1.h"
 
-/** @name ARP operation codes definitions */
-/*@{*/
+static int impl_char_read(device_t *dev, char *buf, size_t count) {
+        memset(buf, 0, count);
+        return count;
+}
 
-/** REQUEST operation code. */
-#define ARPOP_REQUEST   1
+static int imp_char_write(device_t *dev, char *buf, size_t count) {
+        return count;
+}
 
-/** REPLY operation code. */
-#define ARPOP_REPLY     2
+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_dev_ops
+};
 
-#endif
-
-/** @}
- */