WebSVN – HelenOS – Path Comparison – / – /trunk/uspace/lib Rev 4415 and /trunk/uspace/lib/ Rev 4416

Ignore whitespace Rev 4415 → Rev 4416

 /trunk/uspace/lib/libc/include/devmap.h
 ,14 → 38,18
 #include <ipc/devmap.h>
 #include <async.h>
-typedef int dev_handle_t;
+extern int devmap_get_phone(devmap_interface_t, unsigned int);
+extern void devmap_hangup_phone(devmap_interface_t iface);
 extern int devmap_driver_register(const char *, async_client_conn_t);
-extern int devmap_device_get_handle(const char *, dev_handle_t *,
-    unsigned int);
+extern int devmap_device_register(const char *, dev_handle_t *);
+extern int devmap_device_get_handle(const char *, dev_handle_t *, unsigned int);
 extern int devmap_device_connect(dev_handle_t, unsigned int);
-extern int devmap_device_register(int, const char *, int *);
+extern ipcarg_t devmap_device_get_count(void);
+extern ipcarg_t devmap_device_get_devices(ipcarg_t, dev_desc_t *);
 #endif
 /** @}

 /trunk/uspace/lib/libc/include/ipc/devmap.h
 ,8 → 37,10
 #include <ipc/ipc.h>
 #include <libadt/list.h>
-#define DEVMAP_NAME_MAXLEN 512
+#define DEVMAP_NAME_MAXLEN  255
+typedef ipcarg_t dev_handle_t;
 typedef enum {
     DEVMAP_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
     DEVMAP_DRIVER_UNREGISTER,
 ,56 → 47,30
     DEVMAP_DEVICE_REGISTER,
     DEVMAP_DEVICE_UNREGISTER,
     DEVMAP_DEVICE_GET_NAME,
-    DEVMAP_DEVICE_GET_HANDLE
+    DEVMAP_DEVICE_GET_HANDLE,
+    DEVMAP_DEVICE_GET_COUNT,
+    DEVMAP_DEVICE_GET_DEVICES
 } devmap_request_t;
-/** Representation of device driver.
- * Each driver is responsible for a set of devices.
- */
-typedef struct {
-        /** Pointers to previous and next drivers in linked list */
-    link_t drivers;
-        /** Pointer to the linked list of devices controlled by
-         * this driver */
-    link_t devices;
-        /** Phone asociated with this driver */
-    ipcarg_t phone;
-        /** Device driver name */
-    char *name;
-        /** Futex for list of devices owned by this driver */
-    atomic_t devices_futex;
-} devmap_driver_t;
-/** Info about registered device
+/** Interface provided by devmap.
  *
- */
-typedef struct {
-        /** Pointer to the previous and next device in the list of all devices */
-    link_t devices;
-        /** Pointer to the previous and next device in the list of devices
-         owned by one driver */
-    link_t driver_devices;
-        /** Unique device identifier  */
-    int handle;
-        /** Device name */
-    char *name;
-        /** Device driver handling this device */
-    devmap_driver_t *driver;
-} devmap_device_t;
-/** Interface provided by devmap.
  * Every process that connects to devmap must ask one of following
  * interfaces otherwise connection will be refused.
+ *
  */
 typedef enum {
-        /** Connect as device driver */
-    DEVMAP_DRIVER = 1,
-        /** Connect as client */
+    /** Connect as device driver */
+    DEVMAP_DRIVER = 1,
+    /** Connect as client */
     DEVMAP_CLIENT,
-        /** Create new connection to instance of device that
-         * is specified by second argument of call. */
+    /** Create new connection to instance of device that
+        is specified by second argument of call. */
     DEVMAP_CONNECT_TO_DEVICE
 } devmap_interface_t;
+typedef struct {
+    dev_handle_t handle;
+    char name[DEVMAP_NAME_MAXLEN + 1];
+} dev_desc_t;
 #endif

 /trunk/uspace/lib/libc/generic/devmap.c
 ,97 → 35,156
 #include <async.h>
 #include <errno.h>
-static int devmap_phone = -1;
+static int devmap_phone_driver = -1;
+static int devmap_phone_client = -1;
 /** Get phone to device mapper task. */
-static int devmap_get_phone(unsigned int flags)
+int devmap_get_phone(devmap_interface_t iface, unsigned int flags)
 {
-    int phone;
+    switch (iface) {
+    case DEVMAP_DRIVER:
+        if (devmap_phone_driver >= 0)
+            return devmap_phone_driver;
+        if (flags & IPC_FLAG_BLOCKING)
+            devmap_phone_driver = ipc_connect_me_to_blocking(PHONE_NS,
+                SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
+        else
+            devmap_phone_driver = ipc_connect_me_to(PHONE_NS,
+                SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
+        return devmap_phone_driver;
+    case DEVMAP_CLIENT:
+        if (devmap_phone_client >= 0)
+            return devmap_phone_client;
+        if (flags & IPC_FLAG_BLOCKING)
+            devmap_phone_client = ipc_connect_me_to_blocking(PHONE_NS,
+                SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+        else
+            devmap_phone_client = ipc_connect_me_to(PHONE_NS,
+                SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+        return devmap_phone_client;
+    default:
+        return -1;
+    }
+}
-    if (devmap_phone >= 0)
-        return devmap_phone;
-    if (flags & IPC_FLAG_BLOCKING) {
-        phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
-            DEVMAP_CLIENT, 0);
-    } else {
-        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
-            DEVMAP_CLIENT, 0);
+void devmap_hangup_phone(devmap_interface_t iface)
+{
+    switch (iface) {
+    case DEVMAP_DRIVER:
+        if (devmap_phone_driver >= 0) {
+            ipc_hangup(devmap_phone_driver);
+            devmap_phone_driver = -1;
+        }
+        break;
+    case DEVMAP_CLIENT:
+        if (devmap_phone_client >= 0) {
+            ipc_hangup(devmap_phone_client);
+            devmap_phone_client = -1;
+        }
+        break;
+    default:
+        break;
     }
-    if (phone < 0)
-        return phone;
-    devmap_phone = phone;
-    return phone;
 }
 /** Register new driver with devmap. */
 int devmap_driver_register(const char *name, async_client_conn_t conn)
 {
-    ipcarg_t retval;
-    aid_t req;
-    ipc_call_t answer;
-    int phone;
-    ipcarg_t callback_phonehash;
-    phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
-        DEVMAP_DRIVER, 0);
-    if (phone < 0) {
+    int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
+    if (phone < 0)
         return phone;
-    }
-    req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
-    retval = ipc_data_write_start(phone, name, str_size(name) + 1);
+    ipc_call_t answer;
+    aid_t req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
+    ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1);
     if (retval != EOK) {
         async_wait_for(req, NULL);
-        ipc_hangup(phone);
         return -1;
     }
     async_set_client_connection(conn);
+    ipcarg_t callback_phonehash;
     ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
     async_wait_for(req, &retval);
-    return phone;
+    return retval;
 }
-int devmap_device_get_handle(const char *name, dev_handle_t *handle,
-    unsigned int flags)
+/** Register new device.
+ *
+ * @param name   Device name.
+ * @param handle Output: Handle to the created instance of device.
+ *
+ */
+int devmap_device_register(const char *name, dev_handle_t *handle)
 {
-    ipcarg_t retval;
-    aid_t req;
+    int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
+    if (phone < 0)
+        return phone;
     ipc_call_t answer;
-    int phone;
+    aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, 0, 0,
+        &answer);
+    ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1);
+    if (retval != EOK) {
+        async_wait_for(req, NULL);
+        return retval;
+    }
+    async_wait_for(req, &retval);
+    if (retval != EOK) {
+        if (handle != NULL)
+            *handle = -1;
+        return retval;
+    }
+    if (handle != NULL)
+        *handle = (dev_handle_t) IPC_GET_ARG1(answer);
+    return retval;
+}
-    phone = devmap_get_phone(flags);
+int devmap_device_get_handle(const char *name, dev_handle_t *handle, unsigned int flags)
+{
+    int phone = devmap_get_phone(DEVMAP_CLIENT, flags);
     if (phone < 0)
         return phone;
-    req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0,
+    ipc_call_t answer;
+    aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0,
         &answer);
-    retval = ipc_data_write_start(phone, name, str_size(name) + 1);
+    ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1);
     if (retval != EOK) {
         async_wait_for(req, NULL);
         return retval;
     }
     async_wait_for(req, &retval);
     if (retval != EOK) {
         if (handle != NULL)
             *handle = -1;
         return retval;
     }
     if (handle != NULL)
-        *handle = (int) IPC_GET_ARG1(answer);
+        *handle = (dev_handle_t) IPC_GET_ARG1(answer);
     return retval;
 }
 ,7 → 191,7
 int devmap_device_connect(dev_handle_t handle, unsigned int flags)
 {
     int phone;
     if (flags & IPC_FLAG_BLOCKING) {
         phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
             DEVMAP_CONNECT_TO_DEVICE, handle);
 ,40 → 199,46
         phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
             DEVMAP_CONNECT_TO_DEVICE, handle);
     }
     return phone;
 }
-/** Register new device.
- *
- * @param driver_phone
- * @param name Device name.
- * @param handle Output: Handle to the created instance of device.
- */
-int devmap_device_register(int driver_phone, const char *name, int *handle)
+ipcarg_t devmap_device_get_count(void)
 {
-    ipcarg_t retval;
-    aid_t req;
+    int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
+    if (phone < 0)
+        return 0;
+    ipcarg_t count;
+    int retval = ipc_call_sync_0_1(phone, DEVMAP_DEVICE_GET_COUNT, &count);
+    if (retval != EOK)
+        return 0;
+    return count;
+}
+ipcarg_t devmap_device_get_devices(ipcarg_t count, dev_desc_t *data)
+{
+    int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
+    if (phone < 0)
+        return 0;
     ipc_call_t answer;
-    req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0,
-        &answer);
-    retval = ipc_data_write_start(driver_phone, name, str_size(name) + 1);
+    aid_t req = async_send_0(phone, DEVMAP_DEVICE_GET_DEVICES, &answer);
+    ipcarg_t retval = ipc_data_read_start(phone, data, count * sizeof(dev_desc_t));
     if (retval != EOK) {
         async_wait_for(req, NULL);
-        return retval;
+        return 0;
     }
     async_wait_for(req, &retval);
-    if (retval != EOK) {
-        if (handle != NULL)
-            *handle = -1;
-        return retval;
-    }
-    *handle = (int) IPC_GET_ARG1(answer);
-    return retval;
+    if (retval != EOK)
+        return 0;
+    return IPC_GET_ARG1(answer);
 }

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4415 → Rev 4416