Changeset 7719958 in mainline for uspace/lib/c/include/ipc

Timestamp:

2012-04-23T22:51:36Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6a3808e

Parents:

3293a94 (diff), 32fef47 (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

Location:

uspace/lib/c/include/ipc

Files:

• icmp.h (deleted)
• il.h (deleted)
• inet.h (moved) (moved from uspace/srv/net/net/packet_server.h ) (2 diffs)
• ip.h (deleted)
• ipc.h (modified) (1 diff)
• iplink.h (moved) (moved from uspace/lib/c/include/ipc/tl.h ) (2 diffs)
• net.h (deleted)
• net_net.h (deleted)
• netif.h (deleted)
• nil.h (deleted)
• packet.h (deleted)
• services.h (modified) (1 diff)
• socket.h (modified) (1 diff)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
- * Copyright (c) 2011 Radim Vansa
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup libpacket
+/** @addtogroup libcipc
  * @{
  */
-
 /** @file
- * Packet server.
- * The hosting module has to be compiled with both the packet.c and the
- * packet_server.c source files. To function correctly, initialization of the
- * packet map by the pm_init() function has to happen at the first place. Then
- * the packet messages have to be processed by the packet_server_message()
- * function. The packet map should be released by the pm_destroy() function
- * during the module termination.
- * @see IS_NET_PACKET_MESSAGE()
  */
 
-#ifndef NET_PACKET_SERVER_H_
-#define NET_PACKET_SERVER_H_
+#ifndef LIBC_IPC_INET_H_
+#define LIBC_IPC_INET_H_
 
 #include <ipc/common.h>
 
-extern int packet_server_init(void);
-extern int packet_server_message(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    size_t *);
+/** Inet ports */
+typedef enum {
+        /** Default port */
+        INET_PORT_DEFAULT = 1,
+        /** Configuration port */
+        INET_PORT_CFG,
+        /** Ping service port */
+        INET_PORT_PING
+} inet_port_t;
+
+/** Requests on Inet default port */
+typedef enum {
+        INET_CALLBACK_CREATE = IPC_FIRST_USER_METHOD,
+        INET_GET_SRCADDR,
+        INET_SEND,
+        INET_SET_PROTO
+} inet_request_t;
+
+/** Events on Inet default port */
+typedef enum {
+        INET_EV_RECV = IPC_FIRST_USER_METHOD
+} inet_event_t;
+
+/** Requests on Inet configuration port */
+typedef enum {
+        INETCFG_ADDR_CREATE_STATIC = IPC_FIRST_USER_METHOD,
+        INETCFG_ADDR_DELETE,
+        INETCFG_ADDR_GET,
+        INETCFG_ADDR_GET_ID,
+        INETCFG_GET_ADDR_LIST,
+        INETCFG_GET_LINK_LIST,
+        INETCFG_GET_SROUTE_LIST,
+        INETCFG_LINK_GET,
+        INETCFG_SROUTE_CREATE,
+        INETCFG_SROUTE_DELETE,
+        INETCFG_SROUTE_GET,
+        INETCFG_SROUTE_GET_ID
+} inetcfg_request_t;
+
+/** Events on Inet ping port */
+typedef enum {
+        INETPING_EV_RECV = IPC_FIRST_USER_METHOD
+} inetping_event_t;
+
+/** Requests on Inet ping port */
+typedef enum {
+        INETPING_SEND = IPC_FIRST_USER_METHOD,
+        INETPING_GET_SRCADDR
+} inetping_request_t;
 
 #endif
 
-/** @}
+/**
+ * @}
  */

uspace/lib/c/include/ipc/ipc.h

@@ -254 +254 @@
     sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
 
+extern int ipc_clone_establish(int);
 extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, task_id_t *,
     sysarg_t *);
-extern int ipc_connect_me(int);
 extern int ipc_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
 extern int ipc_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);

uspace/lib/c/include/ipc/iplink.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libcipc
  * @{
  */
-
 /** @file
- * Transport layer modules messages.
- * @see tl_interface.h
  */
 
-#ifndef LIBC_TL_MESSAGES_H_
-#define LIBC_TL_MESSAGES_H_
+#ifndef LIBC_IPC_IPLINK_H_
+#define LIBC_IPC_IPLINK_H_
 
-#include <ipc/net.h>
+#include <ipc/common.h>
 
-/** Transport layer modules messages. */
 typedef enum {
-        /** Packet received message.
-         * @see tl_received_msg()
-         */
-        NET_TL_RECEIVED = NET_TL_FIRST
-} tl_messages;
+        IPLINK_GET_MTU = IPC_FIRST_USER_METHOD,
+        IPLINK_SEND,
+        IPLINK_ADDR_ADD,
+        IPLINK_ADDR_REMOVE
+} iplink_request_t;
+
+typedef enum {
+        IPLINK_EV_RECV = IPC_FIRST_USER_METHOD
+} iplink_event_t;
 
 #endif
 
-/** @}
+/**
+ * @}
  */

uspace/lib/c/include/ipc/services.h

@@ -48 +48 @@
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
         SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
-        SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '),
-        SERVICE_ETHERNET   = FOURCC('e', 't', 'h', ' '),
-        SERVICE_NILDUMMY   = FOURCC('n', 'i', 'l', 'd'),
-        SERVICE_IP         = FOURCC('i', 'p', 'v', '4'),
-        SERVICE_ARP        = FOURCC('a', 'r', 'p', ' '),
-        SERVICE_ICMP       = FOURCC('i', 'c', 'm', 'p'),
         SERVICE_UDP        = FOURCC('u', 'd', 'p', ' '),
         SERVICE_TCP        = FOURCC('t', 'c', 'p', ' ')
 } services_t;
+
+#define SERVICE_NAME_INET     "net/inet"
+#define SERVICE_NAME_INETCFG  "net/inetcfg"
+#define SERVICE_NAME_INETPING "net/inetping"
 
 #endif

uspace/lib/c/include/ipc/socket.h

@@ -38 +38 @@
 #define LIBC_SOCKET_MESSAGES_H_
 
-#include <ipc/net.h>
-
 /** Socket client messages. */
 typedef enum {
         /** Creates a new socket. @see socket() */
-        NET_SOCKET = NET_SOCKET_FIRST,
+        NET_SOCKET = IPC_FIRST_USER_METHOD,
         /** Binds the socket. @see bind() */
         NET_SOCKET_BIND,