Changeset 6f4495f5 in mainline for kernel/generic/src/main

Timestamp:

2007-01-27T17:32:13Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ba41c5

Parents:

51baa8a

Message:

Indentaion and formatting changes even Martin will like

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (4 diffs)
• main.c (modified) (7 diffs)
• uinit.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -99 +99 @@
                  * Just a beautification.
                  */
-                if ((t = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true))) {
+                if ((t = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED,
+                    "kmp", true))) {
                         spinlock_lock(&t->lock);
                         t->cpu = &cpus[0];
@@ -124 +125 @@
                 for (i = 0; i < config.cpu_count; i++) {
 
-                        if ((t = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true))) {
+                        if ((t = thread_create(kcpulb, NULL, TASK,
+                            THREAD_FLAG_WIRED, "kcpulb", true))) {
                                 spinlock_lock(&t->lock);                        
                                 t->cpu = &cpus[i];
@@ -144 +146 @@
          * Create kernel console.
          */
-        if ((t = thread_create(kconsole, "kconsole", TASK, 0, "kconsole", false)))
+        t = thread_create(kconsole, "kconsole", TASK, 0, "kconsole", false);
+        if (t)
                 thread_ready(t);
         else
@@ -162 +165 @@
                 }
 
-                task_t *utask = task_run_program((void *) init.tasks[i].addr, "uspace");
+                task_t *utask = task_run_program((void *) init.tasks[i].addr,
+                    "uspace");
                 if (utask) {
                         /*
                          * Set capabilities to init userspace tasks.
                          */
-                        cap_set(utask, CAP_CAP | CAP_MEM_MANAGER | CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
+                        cap_set(utask, CAP_CAP | CAP_MEM_MANAGER |
+                            CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
                         
                         if (!ipc_phone_0) 
                                 ipc_phone_0 = &utask->answerbox;
                 } else {
-                        int rd = init_rd((rd_header *) init.tasks[i].addr, init.tasks[i].size);
+                        int rd = init_rd((rd_header *) init.tasks[i].addr,
+                            init.tasks[i].size);
                         
                         if (rd != RE_OK)

kernel/generic/src/main/main.c

@@ -147 +147 @@
         
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
-                hardcoded_kdata_size, PAGE_SIZE);
+            hardcoded_kdata_size, PAGE_SIZE);
         config.stack_size = CONFIG_STACK_SIZE;
         
@@ -157 +157 @@
         for (i = 0; i < init.cnt; i++) {
                 if (PA_overlaps(config.stack_base, config.stack_size,
-                        init.tasks[i].addr, init.tasks[i].size))
+                    init.tasks[i].addr, init.tasks[i].size))
                         config.stack_base = ALIGN_UP(init.tasks[i].addr +
-                                init.tasks[i].size, config.stack_size);
+                            init.tasks[i].size, config.stack_size);
         }
 
@@ -165 +165 @@
         if (ballocs.size) {
                 if (PA_overlaps(config.stack_base, config.stack_size,
-                        ballocs.base, ballocs.size))
+                    ballocs.base, ballocs.size))
                         config.stack_base = ALIGN_UP(ballocs.base +
-                                ballocs.size, PAGE_SIZE);
+                            ballocs.size, PAGE_SIZE);
         }
         
@@ -175 +175 @@
         context_save(&ctx);
         context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base,
-                THREAD_STACK_SIZE);
+            THREAD_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -223 +223 @@
         version_print();
         printf("kernel: %.*p hardcoded_ktext_size=%zdK, "
-                "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
-                config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >>
-                10);
+            "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
+            config.base, hardcoded_ktext_size >> 10,
+            hardcoded_kdata_size >> 10);
         printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2,
-                config.stack_base, config.stack_size >> 10);
+            config.stack_base, config.stack_size >> 10);
 
         arch_pre_smp_init();
@@ -250 +250 @@
                 for (i = 0; i < init.cnt; i++)
                         printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i,
-                                sizeof(uintptr_t) * 2, init.tasks[i].addr, i,
-                                init.tasks[i].size);
+                            sizeof(uintptr_t) * 2, init.tasks[i].addr, i,
+                            init.tasks[i].size);
         } else
                 printf("No init binaries found\n");
@@ -324 +324 @@
          */
         context_set(&CPU->saved_context, FADDR(main_ap_separated_stack),
-                (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+            (uintptr_t) CPU->stack, CPU_STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */

kernel/generic/src/main/uinit.c

@@ -49 +49 @@
 /** Thread used to bring up userspace thread.
  *
- * @param arg Pointer to structure containing userspace entry and stack addresses.
+ * @param arg Pointer to structure containing userspace entry and stack
+ *     addresses.
  */
 void uinit(void *arg)