Changeset 7fcb74c in mainline

Timestamp:

2009-06-29T16:02:32Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f49cf64

Parents:

bfd247f

Message:

add support for creating null devices on demand

Location:

uspace

Files:

• lib/libc/generic/devmap.c (modified) (1 diff)
• lib/libc/include/devmap.h (modified) (1 diff)
• lib/libc/include/ipc/devmap.h (modified) (2 diffs)
• srv/devmap/devmap.c (modified) (7 diffs)

uspace/lib/libc/generic/devmap.c

@@ -219 +219 @@
 }
 
+int devmap_null_create(void)
+{
+        int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
+        
+        if (phone < 0)
+                return -1;
+        
+        ipcarg_t null_id;
+        int retval = async_req_0_1(phone, DEVMAP_DEVICE_NULL_CREATE, &null_id);
+        if (retval != EOK)
+                return -1;
+        
+        return (int) null_id;
+}
+
+void devmap_null_destroy(int null_id)
+{
+        int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
+        
+        if (phone < 0)
+                return;
+        
+        async_req_1_0(phone, DEVMAP_DEVICE_NULL_DESTROY, (ipcarg_t) null_id);
+}
+
 ipcarg_t devmap_device_get_count(void)
 {

uspace/lib/libc/include/devmap.h

@@ -48 +48 @@
 extern int devmap_device_connect(dev_handle_t, unsigned int);
 
+extern int devmap_null_create(void);
+extern void devmap_null_destroy(int);
+
 extern ipcarg_t devmap_device_get_count(void);
 extern ipcarg_t devmap_device_get_devices(ipcarg_t, dev_desc_t *);

uspace/lib/libc/include/ipc/devmap.h

@@ -29 +29 @@
 /** @addtogroup devmap
  * @{
- */ 
+ */
 
 #ifndef DEVMAP_DEVMAP_H_
@@ -49 +49 @@
         DEVMAP_DEVICE_GET_NAME,
         DEVMAP_DEVICE_GET_HANDLE,
+        DEVMAP_DEVICE_NULL_CREATE,
+        DEVMAP_DEVICE_NULL_DESTROY,
         DEVMAP_DEVICE_GET_COUNT,
         DEVMAP_DEVICE_GET_DEVICES

uspace/srv/devmap/devmap.c

@@ -47 +47 @@
 #include <ipc/devmap.h>
 
-#define NAME  "devmap"
+#define NAME          "devmap"
+#define NULL_DEVICES  256
 
 /** Representation of device driver.
@@ -98 +99 @@
 static FIBRIL_MUTEX_INITIALIZE(drivers_list_mutex);
 static FIBRIL_MUTEX_INITIALIZE(create_handle_mutex);
+static FIBRIL_MUTEX_INITIALIZE(null_devices_mutex);
 
 static dev_handle_t last_handle = 0;
+static devmap_device_t *null_devices[NULL_DEVICES];
 
 static dev_handle_t devmap_create_handle(void)
@@ -619 +622 @@
 }
 
-/** Initialize device mapper.
- *
- *
- */
-static bool devmap_init(void)
-{
+static void devmap_null_create(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fibril_mutex_lock(&null_devices_mutex);
+        
+        unsigned int i;
+        bool fnd = false;
+        
+        for (i = 0; i < NULL_DEVICES; i++) {
+                if (null_devices[i] == NULL) {
+                        fnd = true;
+                        break;
+                }
+        }
+        
+        if (!fnd) {
+                fibril_mutex_unlock(&null_devices_mutex);
+                ipc_answer_0(iid, ENOMEM);
+                return;
+        }
+        
         /* Create NULL device entry */
         devmap_device_t *device = (devmap_device_t *) malloc(sizeof(devmap_device_t));
-        if (device == NULL)
-                return false;
-        
-        device->name = str_dup("null");
+        if (device == NULL) {
+                fibril_mutex_unlock(&null_devices_mutex);
+                ipc_answer_0(iid, ENOMEM);
+                return;
+        }
+        
+        char null[DEVMAP_NAME_MAXLEN];
+        snprintf(null, DEVMAP_NAME_MAXLEN, "null%u", i);
+        
+        device->name = str_dup(null);
         if (device->name == NULL) {
+                fibril_mutex_unlock(&null_devices_mutex);
                 free(device);
-                return false;
+                ipc_answer_0(iid, ENOMEM);
+                return;
         }
         
@@ -645 +670 @@
         device->driver = NULL;
         
-        /* Insert device into list of all devices  */
+        /* Insert device into list of all devices
+           and into null devices array */
         list_append(&device->devices, &devices_list);
+        null_devices[i] = device;
         
         fibril_mutex_unlock(&devices_list_mutex);
+        fibril_mutex_unlock(&null_devices_mutex);
+        
+        ipc_answer_1(iid, EOK, (ipcarg_t) i);
+}
+
+static void devmap_null_destroy(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fibril_mutex_lock(&null_devices_mutex);
+        
+        ipcarg_t i = IPC_GET_ARG1(*icall);
+        
+        if (null_devices[i] == NULL) {
+                ipc_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        devmap_device_unregister_core(null_devices[i]);
+        null_devices[i] = NULL;
+        
+        fibril_mutex_unlock(&null_devices_mutex);
+        
+        ipc_answer_0(iid, EOK);
+}
+
+/** Initialize device mapper.
+ *
+ *
+ */
+static bool devmap_init(void)
+{
+        fibril_mutex_lock(&null_devices_mutex);
+        
+        unsigned int i;
+        for (i = 0; i < NULL_DEVICES; i++)
+                null_devices[i] = NULL;
+        
+        fibril_mutex_unlock(&null_devices_mutex);
         
         return true;
@@ -702 +766 @@
         }
         
-        if (NULL != driver) {
+        if (driver != NULL) {
                 /*
                  * Unregister the device driver and all its devices.
@@ -733 +797 @@
                 case DEVMAP_DEVICE_GET_NAME:
                         devmap_get_name(callid, &call);
+                        break;
+                case DEVMAP_DEVICE_NULL_CREATE:
+                        devmap_null_create(callid, &call);
+                        break;
+                case DEVMAP_DEVICE_NULL_DESTROY:
+                        devmap_null_destroy(callid, &call);
                         break;
                 case DEVMAP_DEVICE_GET_COUNT:
@@ -784 +854 @@
         /* Set a handler of incomming connections */
         async_set_client_connection(devmap_connection);
-
+        
         /* Register device mapper at naming service */
         ipcarg_t phonead;