Changeset 7f3e3e7 in mainline

Timestamp:

2007-11-09T09:08:52Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6c4ff8a

Parents:

44358c1

Message:

Cstyle fixes.

File:

• uspace/srv/devmap/devmap.c (modified) (14 diffs)

uspace/srv/devmap/devmap.c

@@ -155 +155 @@
 }
 
-/** Unregister device and free it. Its assumed that driver's device list 
- * is already locked.
- *
+/**
+ * Unregister device and free it. It's assumed that driver's device list is
+ * already locked.
  */
 static int devmap_device_unregister_core(devmap_device_t *device)
@@ -172 +172 @@
 }
 
-/** 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)
@@ -192 +194 @@
         } 
 
-        if (NULL == (driver = (devmap_driver_t *)malloc(sizeof(devmap_driver_t)))) {
+        if (NULL ==
+            (driver = (devmap_driver_t *)malloc(sizeof(devmap_driver_t)))) {
                 ipc_answer_fast(iid, ENOMEM, 0, 0);
                 return;
@@ -209 +212 @@
 
         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);
@@ -243 +247 @@
 
         /* Initialize futex for list of devices owned by this driver */
-        futex_initialize(&(driver->devices_futex) ,1);
+        futex_initialize(&(driver->devices_futex), 1);
 
         /* 
@@ -256 +260 @@
 
         if (IPC_M_CONNECT_TO_ME != IPC_GET_METHOD(call)) {
-                printf("DevMap: Unexpected method: %u.\n", \
-                        IPC_GET_METHOD(call));
+                printf("DevMap: Unexpected method: %u.\n",
+                    IPC_GET_METHOD(call));
                 ipc_answer_fast(callid, ENOTSUP, 0, 0);
                 
@@ -274 +278 @@
         futex_down(&drivers_list_futex);        
         
-        /* TODO: check that no driver with name equals to driver->name is registered */
+        /* TODO:
+         * check that no driver with name equal to driver->name is registered
+         */
 
         /* 
@@ -315 +321 @@
 
         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);
@@ -355 +362 @@
         
         /* Create new device entry */
-        if (NULL == (device = (devmap_device_t *)malloc(sizeof(devmap_device_t)))) {
+        if (NULL ==
+            (device = (devmap_device_t *)malloc(sizeof(devmap_device_t)))) {
                 printf("Cannot allocate new device.\n");
                 ipc_answer_fast(iid, ENOMEM, 0, 0);
@@ -457 +465 @@
 
         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 ?*/
-        ipc_forward_fast(callid, dev->driver->phone, (ipcarg_t)(dev->handle), 0);
+        /* FIXME: is this correct method how to pass argument on forwarding ?*/
+        ipc_forward_fast(callid, dev->driver->phone, (ipcarg_t)(dev->handle),
+            0);
         return;
 }
@@ -509 +519 @@
          * 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;
@@ -664 +675 @@
                 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;
@@ -695 +707 @@
                 /* Select interface */
         switch ((ipcarg_t)(IPC_GET_ARG1(*icall))) {
-                case DEVMAP_DRIVER:
-                        devmap_connection_driver(iid, icall);
-                        break;
-                case DEVMAP_CLIENT:
-                        devmap_connection_client(iid, icall);
-                        break;
-                default:
-                        ipc_answer_fast(iid, ENOENT, 0, 0); /* No such interface */
-                        printf("DevMap: Unknown interface %u.\n", \
-                                (ipcarg_t)(IPC_GET_ARG1(*icall)));
+        case DEVMAP_DRIVER:
+                devmap_connection_driver(iid, icall);
+                break;
+        case DEVMAP_CLIENT:
+                devmap_connection_client(iid, icall);
+                break;
+        default:
+                ipc_answer_fast(iid, ENOENT, 0, 0); /* No such interface */
+                printf("DevMap: Unknown interface %u.\n",
+                    (ipcarg_t)(IPC_GET_ARG1(*icall)));
         }
 
@@ -730 +742 @@
         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;