Changeset 0773396 in mainline for uspace/lib/c/include/types/inet.h

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/lib/c/include/types/inet.h (moved) (moved from uspace/lib/c/include/net/device.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-
 /** @file
- * Network device.
  */
 
-#ifndef LIBC_NET_DEVICE_H_
-#define LIBC_NET_DEVICE_H_
+#ifndef LIBC_TYPES_INET_H_
+#define LIBC_TYPES_INET_H_
 
-#include <adt/int_map.h>
-#include <nic/nic.h>
+#include <inet/addr.h>
+#include <ipc/loc.h>
+#include <sys/types.h>
 
-/** Device identifier to generic type map declaration. */
-#define DEVICE_MAP_DECLARE  INT_MAP_DECLARE
+#define INET_TTL_MAX 255
 
-/** Device identifier to generic type map implementation. */
-#define DEVICE_MAP_IMPLEMENT  INT_MAP_IMPLEMENT
+typedef struct {
+        /** Local IP link service ID (optional) */
+        service_id_t iplink;
+        inet_addr_t src;
+        inet_addr_t dest;
+        uint8_t tos;
+        void *data;
+        size_t size;
+} inet_dgram_t;
 
-/** Device identifier type. */
-typedef int nic_device_id_t;
+typedef struct {
+        int (*recv)(inet_dgram_t *);
+} inet_ev_ops_t;
 
-/** Invalid device identifier. */
-#define NIC_DEVICE_INVALID_ID  (-1)
+typedef enum {
+        INET_DF = 1
+} inet_df_t;
 
 #endif