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

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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:

• devman.h (modified) (1 diff)
• inet.h (modified) (1 diff)
• loc.h (modified) (1 diff)
• logger.h (modified) (1 diff)
• services.h (modified) (2 diffs)

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

@@ -141 +141 @@
 
 typedef enum {
-        DEVMAN_DRIVER = 1,
-        DEVMAN_CLIENT,
-        DEVMAN_CONNECT_TO_DEVICE,
-        DEVMAN_CONNECT_FROM_LOC,
-        DEVMAN_CONNECT_TO_PARENTS_DEVICE
-} devman_interface_t;
-
-typedef enum {
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
         DEVMAN_ADD_FUNCTION,

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

@@ -37 +37 @@
 
 #include <ipc/common.h>
-
-/** Inet ports */
-typedef enum {
-        /** Default port */
-        INET_PORT_DEFAULT = 1,
-        /** Configuration port */
-        INET_PORT_CFG,
-        /** Ping service port */
-        INET_PORT_PING,
-        /** Ping6 service port */
-        INET_PORT_PING6
-} inet_port_t;
 
 /** Requests on Inet default port */

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

@@ -76 +76 @@
 } loc_event_t;
 
-/** Ports provided by location service.
- *
- * Every process that connects to loc must ask one of following
- * ports, otherwise connection will be refused.
- *
- */
-typedef enum {
-        /** Service supplier (server) port */
-        LOC_PORT_SUPPLIER = 1,
-        /** Service consumer (client) port */
-        LOC_PORT_CONSUMER,
-        /** Create new connection to instance of device that
-            is specified by second argument of call. */
-        LOC_CONNECT_TO_SERVICE
-} loc_interface_t;
-
 typedef struct {
         service_id_t id;

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

@@ -69 +69 @@
 } logger_writer_request_t;
 
-typedef enum {
-        /** Interface for controlling logger behavior. */
-        LOGGER_INTERFACE_CONTROL,
-        /** Interface for servers writing to the log. */
-        LOGGER_INTERFACE_WRITER
-} logger_interface_t;
-
 #endif
 

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

@@ -38 +38 @@
 #define LIBC_SERVICES_H_
 
-#include <fourcc.h>
+#include <sys/types.h>
+#include <abi/fourcc.h>
 
 typedef enum {
         SERVICE_NONE       = 0,
-        SERVICE_LOAD       = FOURCC('l', 'o', 'a', 'd'),
+        SERVICE_LOADER     = FOURCC('l', 'o', 'a', 'd'),
         SERVICE_VFS        = FOURCC('v', 'f', 's', ' '),
         SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),
@@ -49 +50 @@
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
         SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
-} services_t;
+} service_t;
 
-#define SERVICE_NAME_CORECFG    "corecfg"
-#define SERVICE_NAME_DHCP       "net/dhcp"
-#define SERVICE_NAME_DNSR       "net/dnsr"
-#define SERVICE_NAME_INET       "net/inet"
-#define SERVICE_NAME_INETCFG    "net/inetcfg"
-#define SERVICE_NAME_INETPING   "net/inetping"
-#define SERVICE_NAME_INETPING6  "net/inetping6"
-#define SERVICE_NAME_NETCONF    "net/netconf"
-#define SERVICE_NAME_UDP        "net/udp"
-#define SERVICE_NAME_TCP        "net/tcp"
-#define SERVICE_NAME_VBD        "vbd"
-#define SERVICE_NAME_VOLSRV     "volsrv"
+#define SERVICE_NAME_CORECFG  "corecfg"
+#define SERVICE_NAME_DHCP     "net/dhcp"
+#define SERVICE_NAME_DNSR     "net/dnsr"
+#define SERVICE_NAME_INET     "net/inet"
+#define SERVICE_NAME_NETCONF  "net/netconf"
+#define SERVICE_NAME_UDP      "net/udp"
+#define SERVICE_NAME_TCP      "net/tcp"
+#define SERVICE_NAME_VBD      "vbd"
+#define SERVICE_NAME_VOLSRV   "volsrv"
 
 #endif