Changeset 6843a9c in mainline for uspace/lib/c/include/inet/inetping.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/include/inet/inetping.h (moved) (moved from uspace/srv/hw/char/i8042/i8042.h ) (2 diffs)

uspace/lib/c/include/inet/inetping.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbd_port
- * @ingroup  kbd
+/** @addtogroup libc
  * @{
  */
-
 /** @file
- * @brief i8042 port driver.
  */
 
-#ifndef i8042_H_
-#define i8042_H_
+#ifndef LIBC_INET_INETPING_H_
+#define LIBC_INET_INETPING_H_
 
+#include <inet/inet.h>
 #include <sys/types.h>
-#include <libarch/ddi.h>
-#include <async.h>
 
-/** i8042 HW I/O interface */
-struct i8042 {
-        ioport8_t data;
-        uint8_t pad[3];
-        ioport8_t status;
-} __attribute__ ((packed));
-typedef struct i8042 i8042_t;
+typedef struct {
+        inet_addr_t src;
+        inet_addr_t dest;
+        uint16_t seq_no;
+        void *data;
+        size_t size;
+} inetping_sdu_t;
 
-/** Softstate structure, one for each serial port (primary and aux). */
-typedef struct {
-        service_id_t service_id;
-        async_sess_t *client_sess;
-} i8042_port_t;
+typedef struct inetping_ev_ops {
+        int (*recv)(inetping_sdu_t *);
+} inetping_ev_ops_t;
+
+extern int inetping_init(inetping_ev_ops_t *);
+extern int inetping_send(inetping_sdu_t *);
+extern int inetping_get_srcaddr(inet_addr_t *, inet_addr_t *);
+
 
 #endif
 
-/**
- * @}
+/** @}
  */