Changes in kernel/generic/src/cpu/cpu.c [f651e80:7e752b2] in mainline

File:

• kernel/generic/src/cpu/cpu.c (modified) (7 diffs)

kernel/generic/src/cpu/cpu.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       CPU subsystem initialization and listing.
+ * @brief CPU subsystem initialization and listing.
  */
- 
+
 #include <cpu.h>
 #include <arch.h>
@@ -42 +42 @@
 #include <mm/page.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <panic.h>
@@ -48 +48 @@
 #include <adt/list.h>
 #include <print.h>
+#include <sysinfo/sysinfo.h>
+#include <arch/cycle.h>
 
 cpu_t *cpus;
@@ -57 +59 @@
  */
 void cpu_init(void) {
-        unsigned int i, j;
-        
 #ifdef CONFIG_SMP
         if (config.cpu_active == 1) {
 #endif /* CONFIG_SMP */
+                
                 cpus = (cpu_t *) malloc(sizeof(cpu_t) * config.cpu_count,
-                                        FRAME_ATOMIC);
+                    FRAME_ATOMIC);
                 if (!cpus)
                         panic("Cannot allocate CPU structures.");
-
-                /* initialize everything */
+                
+                /* Initialize everything */
                 memsetb(cpus, sizeof(cpu_t) * config.cpu_count, 0);
-
+                
+                size_t i;
                 for (i = 0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | FRAME_ATOMIC);
-                        
+                        cpus[i].stack = (uint8_t *) frame_alloc(STACK_FRAMES,
+                            FRAME_KA | FRAME_ATOMIC);
                         cpus[i].id = i;
                         
-                        spinlock_initialize(&cpus[i].lock, "cpu_t.lock");
-
+                        irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock");
+                        
+                        unsigned int j;
                         for (j = 0; j < RQ_COUNT; j++) {
-                                spinlock_initialize(&cpus[i].rq[j].lock, "rq_t.lock");
+                                irq_spinlock_initialize(&cpus[i].rq[j].lock, "cpus[].rq[].lock");
                                 list_initialize(&cpus[i].rq[j].rq_head);
                         }
@@ -86 +89 @@
         }
 #endif /* CONFIG_SMP */
-
+        
         CPU = &cpus[config.cpu_active - 1];
         
-        CPU->active = 1;
-        CPU->tlb_active = 1;
+        CPU->active = true;
+        CPU->tlb_active = true;
+        
+        CPU->idle = false;
+        CPU->last_cycle = get_cycle();
+        CPU->idle_cycles = 0;
+        CPU->busy_cycles = 0;
         
         cpu_identify();
@@ -100 +108 @@
 {
         unsigned int i;
-
+        
         for (i = 0; i < config.cpu_count; i++) {
                 if (cpus[i].active)
@@ -111 +119 @@
 /** @}
  */
-