Changeset db71e2a in mainline for uspace/lib/c/include/inet/iplink_srv.h

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/lib/c/include/inet/iplink_srv.h (modified) (3 diffs)

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

@@ -40 +40 @@
 #include <stdbool.h>
 #include <sys/types.h>
+#include <inet/addr.h>
+#include <inet/iplink.h>
 
 struct iplink_ops;
@@ -51 +53 @@
 } iplink_srv_t;
 
-typedef struct {
-        uint32_t ipv4;
-} iplink_srv_addr_t;
-
-/** IP link Service Data Unit */
-typedef struct {
-        /** Local source address */
-        iplink_srv_addr_t lsrc;
-        /** Local destination address */
-        iplink_srv_addr_t ldest;
-        /** Serialized IP packet */
-        void *data;
-        /** Size of @c data in bytes */
-        size_t size;
-} iplink_srv_sdu_t;
-
 typedef struct iplink_ops {
         int (*open)(iplink_srv_t *);
         int (*close)(iplink_srv_t *);
-        int (*send)(iplink_srv_t *, iplink_srv_sdu_t *);
+        int (*send)(iplink_srv_t *, iplink_sdu_t *);
+        int (*send6)(iplink_srv_t *, iplink_sdu6_t *);
         int (*get_mtu)(iplink_srv_t *, size_t *);
-        int (*addr_add)(iplink_srv_t *, iplink_srv_addr_t *);
-        int (*addr_remove)(iplink_srv_t *, iplink_srv_addr_t *);
+        int (*get_mac48)(iplink_srv_t *, addr48_t *);
+        int (*addr_add)(iplink_srv_t *, inet_addr_t *);
+        int (*addr_remove)(iplink_srv_t *, inet_addr_t *);
 } iplink_ops_t;
 
@@ -79 +67 @@
 
 extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *);
-extern int iplink_ev_recv(iplink_srv_t *, iplink_srv_sdu_t *);
+extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, uint16_t);
 
 #endif