Changeset 57b4f46 in mainline

Timestamp:

2008-08-06T18:09:09Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ade06b4

Parents:

30b3ddb

Message:

cstyle

Files:

• kernel/generic/src/lib/rd.c (modified) (4 diffs)
• uspace/lib/libc/generic/vfs/vfs.c (modified) (2 diffs)

kernel/generic/src/lib/rd.c

@@ -49 +49 @@
 /**
  * RAM disk initialization routine. At this point, the RAM disk memory is shared
- * and information about the share is provided as sysinfo values to the userspace
- * tasks.
+ * and information about the share is provided as sysinfo values to the
+ * userspace tasks.
  */  
 int init_rd(rd_header_t *header, size_t size)
@@ -56 +56 @@
         /* Identify RAM disk */
         if ((header->magic[0] != RD_MAG0) || (header->magic[1] != RD_MAG1) ||
-                (header->magic[2] != RD_MAG2) || (header->magic[3] != RD_MAG3))
+            (header->magic[2] != RD_MAG2) || (header->magic[3] != RD_MAG3))
                 return RE_INVALID;
         
@@ -87 +87 @@
                 dsize = size - hsize;
         
-        rd_parea.pbase = ALIGN_DOWN((uintptr_t) KA2PA((void *) header + hsize), FRAME_SIZE);
+        rd_parea.pbase = ALIGN_DOWN((uintptr_t) KA2PA((void *) header + hsize),
+            FRAME_SIZE);
         rd_parea.vbase = (uintptr_t) ((void *) header + hsize);
         rd_parea.frames = SIZE2FRAMES(dsize);
@@ -96 +97 @@
         sysinfo_set_item_val("rd.header_size", NULL, hsize);    
         sysinfo_set_item_val("rd.size", NULL, dsize);
-        sysinfo_set_item_val("rd.address.physical", NULL, (unative_t)
-                KA2PA((void *) header + hsize));
+        sysinfo_set_item_val("rd.address.physical", NULL,
+            (unative_t) KA2PA((void *) header + hsize));
 
         return RE_OK;

uspace/lib/libc/generic/vfs/vfs.c

@@ -106 +106 @@
 static int device_get_handle(char *name, dev_handle_t *handle)
 {
-        int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+        int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT,
+            0);
         if (phone < 0)
                 return phone;
@@ -224 +225 @@
         free(pa);
 
-        if (rc != EOK) return (int) rc;
+        if (rc != EOK)
+            return (int) rc;
         return (int) IPC_GET_ARG1(answer);
 }