WebSVN – HelenOS – Diff – /trunk/uspace/srv/devmap/devmap.c

     futex_up(&devices_list_futex);
     return device;
+}
+/**
-/** Unregister device and free it. Its assumed that driver's device list
+ * Unregister device and free it. It's assumed that driver's device list is
- * is already locked.
+ * already locked.
- *
  */
 static int devmap_device_unregister_core(devmap_device_t *device)
+{
     list_remove(&(device->devices));
     return EOK;
+}
+/**
-/** Read info about new driver and add it into linked list of registered drivers.
+ * Read info about new driver and add it into linked list of registered
+ * drivers.
  */
 static void devmap_driver_register(devmap_driver_t **odriver)
+{
     size_t name_size;
     ipc_callid_t callid;
     if (IPC_GET_METHOD(icall) != DEVMAP_DRIVER_REGISTER) {
         ipc_answer_fast(iid, EREFUSED, 0, 0);
         return;
+    }
+    if (NULL ==
-    if (NULL == (driver = (devmap_driver_t *)malloc(sizeof(devmap_driver_t)))) {
+        (driver = (devmap_driver_t *)malloc(sizeof(devmap_driver_t)))) {
         ipc_answer_fast(iid, ENOMEM, 0, 0);
         return;
+    }
     /*
         ipc_answer_fast(iid, EREFUSED, 0, 0);
         return;
+    }
     if (name_size > DEVMAP_NAME_MAXLEN) {
-        printf("Too logn name: %u: maximum is %u.\n", name_size, DEVMAP_NAME_MAXLEN);
+        printf("Too logn name: %u: maximum is %u.\n", name_size,
+            DEVMAP_NAME_MAXLEN);
         free(driver);
         ipc_answer_fast(callid, EINVAL, 0, 0);
         ipc_answer_fast(iid, EREFUSED, 0, 0);
         return;
+    }
     driver->name[name_size] = 0;
     printf("Read driver name: '%s'.\n", driver->name);
     /* Initialize futex for list of devices owned by this driver */
-    futex_initialize(&(driver->devices_futex) ,1);
+    futex_initialize(&(driver->devices_futex), 1);
     /*
      * Initialize list of asociated devices
      */
     list_initialize(&(driver->devices));
      * Create connection to the driver
      */
     callid = async_get_call(&call);
     if (IPC_M_CONNECT_TO_ME != IPC_GET_METHOD(call)) {
-        printf("DevMap: Unexpected method: %u.\n", \
+        printf("DevMap: Unexpected method: %u.\n",
             IPC_GET_METHOD(call));
         ipc_answer_fast(callid, ENOTSUP, 0, 0);
         free(driver->name);
         free(driver);
         ipc_answer_fast(iid, ENOTSUP, 0, 0);
     list_initialize(&(driver->drivers));
     futex_down(&drivers_list_futex);
+    /* TODO:
-    /* TODO: check that no driver with name equals to driver->name is registered */
+     * check that no driver with name equal to driver->name is registered
+     */
     /*
      * Insert new driver into list of registered drivers
      */
     list_append(&(driver->drivers), &drivers_list);
     futex_down(&devices_list_futex);
     futex_down(&(driver->devices_futex));
     while (!list_empty(&(driver->devices))) {
-        device = list_get_instance(driver->devices.next, devmap_device_t, driver_devices);
+        device = list_get_instance(driver->devices.next,
+            devmap_device_t, driver_devices);
         printf("Unregister device '%s'.\n", device->name);
         devmap_device_unregister_core(device);
+    }
     futex_up(&(driver->devices_futex));
         ipc_answer_fast(iid, EREFUSED, 0, 0);
         return;
+    }
     /* Create new device entry */
+    if (NULL ==
-    if (NULL == (device = (devmap_device_t *)malloc(sizeof(devmap_device_t)))) {
+        (device = (devmap_device_t *)malloc(sizeof(devmap_device_t)))) {
         printf("Cannot allocate new device.\n");
         ipc_answer_fast(iid, ENOMEM, 0, 0);
         return;
+    }
      */
     handle = IPC_GET_ARG1(*call);
     dev = devmap_device_find_handle(handle);
     if (NULL == dev) {
-        printf("DevMap: No registered device with handle %d.\n", handle);
+        printf("DevMap: No registered device with handle %d.\n",
+            handle);
         ipc_answer_fast(callid, ENOENT, 0, 0);
         return;
+    }
-        /* FIXME: is this correct method how to pass argument on forwarding ?*/
+    /* FIXME: is this correct method how to pass argument on forwarding ?*/
-    ipc_forward_fast(callid, dev->driver->phone, (ipcarg_t)(dev->handle), 0);
+    ipc_forward_fast(callid, dev->driver->phone, (ipcarg_t)(dev->handle),
+);
     return;
+}
 /** Find handle for device instance identified by name.
  * In answer will be send EOK and device handle in arg1 or a error
+    }
     /*
      * Send confirmation to sender and get data into buffer.
      */
-    if (EOK != (retval = ipc_data_deliver(callid, &call, name, name_size))) {
+    if (EOK != (retval = ipc_data_deliver(callid, &call, name,
+        name_size))) {
         ipc_answer_fast(iid, EREFUSED, 0, 0);
         return;
+    }
     /*
             cont = false;
             continue; /* Exit thread */
         case DEVMAP_DEVICE_CONNECT_ME_TO:
             /* Connect client to selected device */
-            printf("DevMap: connect to device %d.\n", IPC_GET_ARG1(call));
+            printf("DevMap: connect to device %d.\n",
+                IPC_GET_ARG1(call));
             devmap_forward(callid, &call);
             break;
         case DEVMAP_DEVICE_GET_HANDLE:
             devmap_get_handle(callid, &call);
     printf("DevMap: new connection.\n");
         /* Select interface */
     switch ((ipcarg_t)(IPC_GET_ARG1(*icall))) {
-        case DEVMAP_DRIVER:
+    case DEVMAP_DRIVER:
-            devmap_connection_driver(iid, icall);
+        devmap_connection_driver(iid, icall);
-            break;
+        break;
-        case DEVMAP_CLIENT:
+    case DEVMAP_CLIENT:
-            devmap_connection_client(iid, icall);
+        devmap_connection_client(iid, icall);
-            break;
+        break;
-        default:
+    default:
-            ipc_answer_fast(iid, ENOENT, 0, 0); /* No such interface */
+        ipc_answer_fast(iid, ENOENT, 0, 0); /* No such interface */
-            printf("DevMap: Unknown interface %u.\n", \
+        printf("DevMap: Unknown interface %u.\n",
-                (ipcarg_t)(IPC_GET_ARG1(*icall)));
+            (ipcarg_t)(IPC_GET_ARG1(*icall)));
+    }
     /* Cleanup */
     printf("DevMap: connection closed.\n");
+    }
         /* Set a handler of incomming connections */
     async_set_client_connection(devmap_connection);
-        /* Register device mapper at naming service */
+    /* Register device mapper at naming service */
     if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, &phonead) != 0)
         return -1;
     async_manager();
     /* Never reached */

Subversion Repositories HelenOS

(root)/trunk/uspace/srv/devmap/devmap.c – Rev 2594 → 2598