Changeset 903bac0a in mainline for uspace/lib/c/include

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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

Files:

• devman.h (modified) (3 diffs)
• ipc/devman.h (modified) (3 diffs)
• ipc/loc.h (moved) (moved from uspace/lib/c/include/ipc/devmap.h ) (2 diffs)
• ipc/services.h (modified) (1 diff)
• loc.h (moved) (moved from uspace/lib/c/include/devmap.h ) (1 diff)
• sys/stat.h (modified) (2 diffs)
• vfs/vfs.h (modified) (1 diff)

uspace/lib/c/include/devman.h

@@ -38 +38 @@
 
 #include <ipc/devman.h>
+#include <ipc/loc.h>
 #include <async.h>
 #include <bool.h>
@@ -48 +49 @@
 extern int devman_add_function(const char *, fun_type_t, match_id_list_t *,
     devman_handle_t, devman_handle_t *);
+extern int devman_remove_function(devman_handle_t);
 
 extern async_sess_t *devman_device_connect(exch_mgmt_t, devman_handle_t,
@@ -56 +58 @@
 extern int devman_device_get_handle(const char *, devman_handle_t *,
     unsigned int);
-extern int devman_device_get_handle_by_class(const char *, const char *,
-    devman_handle_t *, unsigned int);
 extern int devman_get_device_path(devman_handle_t, char *, size_t);
 
-extern int devman_add_device_to_class(devman_handle_t, const char *);
+extern int devman_add_device_to_category(devman_handle_t, const char *);
+extern int devman_fun_sid_to_handle(service_id_t, devman_handle_t *);
 
 #endif

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

@@ -130 +130 @@
         DEVMAN_CLIENT,
         DEVMAN_CONNECT_TO_DEVICE,
-        DEVMAN_CONNECT_FROM_DEVMAP,
+        DEVMAN_CONNECT_FROM_LOC,
         DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;
@@ -138 +138 @@
         DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
-        DEVMAN_ADD_DEVICE_TO_CLASS
-
+        DEVMAN_ADD_DEVICE_TO_CATEGORY,
+        DEVMAN_REMOVE_FUNCTION
 } driver_to_devman_t;
 
@@ -149 +149 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
-        DEVMAN_DEVICE_GET_DEVICE_PATH
+        DEVMAN_DEVICE_GET_DEVICE_PATH,
+        DEVMAN_FUN_SID_TO_HANDLE
 } client_to_devman_t;
 

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2007 Josef Cejka
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup devmap
+/** @addtogroup loc
  * @{
  */
 
-#ifndef LIBC_IPC_DEVMAP_H_
-#define LIBC_IPC_DEVMAP_H_
+#ifndef LIBC_IPC_LOC_H_
+#define LIBC_IPC_LOC_H_
 
 #include <ipc/common.h>
 
-#define DEVMAP_NAME_MAXLEN  255
+#define LOC_NAME_MAXLEN  255
 
-typedef sysarg_t devmap_handle_t;
+typedef sysarg_t service_id_t;
+typedef sysarg_t category_id_t;
 
 typedef enum {
-        DEV_HANDLE_NONE,
-        DEV_HANDLE_NAMESPACE,
-        DEV_HANDLE_DEVICE
-} devmap_handle_type_t;
+        LOC_OBJECT_NONE,
+        LOC_OBJECT_NAMESPACE,
+        LOC_OBJECT_SERVICE
+} loc_object_type_t;
 
 typedef enum {
-        DEVMAP_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
-        DEVMAP_DRIVER_UNREGISTER,
-        DEVMAP_DEVICE_REGISTER,
-        DEVMAP_DEVICE_UNREGISTER,
-        DEVMAP_DEVICE_GET_HANDLE,
-        DEVMAP_NAMESPACE_GET_HANDLE,
-        DEVMAP_HANDLE_PROBE,
-        DEVMAP_NULL_CREATE,
-        DEVMAP_NULL_DESTROY,
-        DEVMAP_GET_NAMESPACE_COUNT,
-        DEVMAP_GET_DEVICE_COUNT,
-        DEVMAP_GET_NAMESPACES,
-        DEVMAP_GET_DEVICES
-} devmap_request_t;
+        LOC_SERVER_REGISTER = IPC_FIRST_USER_METHOD,
+        LOC_SERVER_UNREGISTER,
+        LOC_SERVICE_ADD_TO_CAT,
+        LOC_SERVICE_REGISTER,
+        LOC_SERVICE_UNREGISTER,
+        LOC_SERVICE_GET_ID,
+        LOC_SERVICE_GET_NAME,
+        LOC_NAMESPACE_GET_ID,
+        LOC_CALLBACK_CREATE,
+        LOC_CATEGORY_GET_ID,
+        LOC_CATEGORY_GET_NAME,
+        LOC_CATEGORY_GET_SVCS,
+        LOC_ID_PROBE,
+        LOC_NULL_CREATE,
+        LOC_NULL_DESTROY,
+        LOC_GET_NAMESPACE_COUNT,
+        LOC_GET_SERVICE_COUNT,
+        LOC_GET_CATEGORIES,
+        LOC_GET_NAMESPACES,
+        LOC_GET_SERVICES
+} loc_request_t;
 
-/** Interface provided by devmap.
+typedef enum {
+        LOC_EVENT_CAT_CHANGE = IPC_FIRST_USER_METHOD
+} loc_event_t;
+
+/** Ports provided by location service.
  *
- * Every process that connects to devmap must ask one of following
- * interfaces otherwise connection will be refused.
+ * Every process that connects to loc must ask one of following
+ * ports, otherwise connection will be refused.
  *
  */
 typedef enum {
-        /** Connect as device driver */
-        DEVMAP_DRIVER = 1,
-        /** Connect as client */
-        DEVMAP_CLIENT,
+        /** 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. */
-        DEVMAP_CONNECT_TO_DEVICE
-} devmap_interface_t;
+        LOC_CONNECT_TO_SERVICE
+} loc_interface_t;
 
 typedef struct {
-        devmap_handle_t handle;
-        char name[DEVMAP_NAME_MAXLEN + 1];
-} dev_desc_t;
+        service_id_t id;
+        char name[LOC_NAME_MAXLEN + 1];
+} loc_sdesc_t;
 
 #endif

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

@@ -45 +45 @@
         SERVICE_VIDEO      = FOURCC('v', 'i', 'd', ' '),
         SERVICE_VFS        = FOURCC('v', 'f', 's', ' '),
-        SERVICE_DEVMAP     = FOURCC('d', 'e', 'v', 'p'),
+        SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),
         SERVICE_DEVMAN     = FOURCC('d', 'e', 'v', 'n'),
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),

uspace/lib/c/include/loc.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_DEVMAP_H_
-#define LIBC_DEVMAP_H_
+#ifndef LIBC_LOC_H_
+#define LIBC_LOC_H_
 
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <async.h>
 #include <bool.h>
 
-extern async_exch_t *devmap_exchange_begin_blocking(devmap_interface_t);
-extern async_exch_t *devmap_exchange_begin(devmap_interface_t);
-extern void devmap_exchange_end(async_exch_t *);
+typedef void (*loc_cat_change_cb_t)(void);
 
-extern int devmap_driver_register(const char *, async_client_conn_t);
-extern int devmap_device_register(const char *, devmap_handle_t *);
-extern int devmap_device_register_with_iface(const char *, devmap_handle_t *,
+extern async_exch_t *loc_exchange_begin_blocking(loc_interface_t);
+extern async_exch_t *loc_exchange_begin(loc_interface_t);
+extern void loc_exchange_end(async_exch_t *);
+
+extern int loc_server_register(const char *, async_client_conn_t);
+extern int loc_service_register(const char *, service_id_t *);
+extern int loc_service_register_with_iface(const char *, service_id_t *,
     sysarg_t);
+extern int loc_service_unregister(service_id_t);
+extern int loc_service_add_to_cat(service_id_t, category_id_t);
 
-extern int devmap_device_get_handle(const char *, devmap_handle_t *,
+extern int loc_service_get_id(const char *, service_id_t *,
     unsigned int);
-extern int devmap_namespace_get_handle(const char *, devmap_handle_t *,
+extern int loc_service_get_name(service_id_t, char **);
+extern int loc_namespace_get_id(const char *, service_id_t *,
     unsigned int);
-extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
+extern int loc_category_get_id(const char *, category_id_t *,
+    unsigned int);
+extern int loc_category_get_name(category_id_t, char **);
+extern int loc_category_get_svcs(category_id_t, category_id_t **, size_t *);
+extern loc_object_type_t loc_id_probe(service_id_t);
 
-extern async_sess_t *devmap_device_connect(exch_mgmt_t, devmap_handle_t,
+extern async_sess_t *loc_service_connect(exch_mgmt_t, service_id_t,
     unsigned int);
 
-extern int devmap_null_create(void);
-extern void devmap_null_destroy(int);
+extern int loc_null_create(void);
+extern void loc_null_destroy(int);
 
-extern size_t devmap_count_namespaces(void);
-extern size_t devmap_count_devices(devmap_handle_t);
+extern size_t loc_count_namespaces(void);
+extern size_t loc_count_services(service_id_t);
 
-extern size_t devmap_get_namespaces(dev_desc_t **);
-extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
+extern size_t loc_get_namespaces(loc_sdesc_t **);
+extern size_t loc_get_services(service_id_t, loc_sdesc_t **);
+extern int loc_get_categories(category_id_t **, size_t *);
+extern int loc_register_cat_change_cb(loc_cat_change_cb_t);
+
 
 #endif

uspace/lib/c/include/sys/stat.h

@@ -39 +39 @@
 #include <bool.h>
 #include <ipc/vfs.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 
 struct stat {
         fs_handle_t fs_handle;
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
         fs_index_t index;
         unsigned int lnkcnt;
@@ -49 +49 @@
         bool is_directory;
         aoff64_t size;
-        devmap_handle_t device;
+        service_id_t service;
 };
 

uspace/lib/c/include/vfs/vfs.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <ipc/vfs.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <stdio.h>
 #include <async.h>