Changeset ed0dd65 in mainline for src

Timestamp:

2005-04-30T16:47:17Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

30ef8ce

Parents:

10a2e22

Message:

More ACPI work.
Initial MADT table parsing.

SMP renaming and reorganization to reflect there are more ways to bring SMP up.

Location:

src

Files:

• Makefile (modified) (1 diff)
• Makefile.config (modified) (1 diff)
• main/kinit.c (modified) (3 diffs)
• main/main.c (modified) (2 diffs)

src/Makefile

@@ -30 +30 @@
 ifdef DEBUG_SPINLOCK
 CFLAGS+=-D$(DEBUG_SPINLOCK)
+endif
+
+ifdef USERSPACE
+CFLAGS+=-D$(USERSPACE)
 endif
 

src/Makefile.config

@@ -14 +14 @@
 DEBUG_SPINLOCK=DEBUG_SPINLOCK
 
+# Uncomment if you want to compile in userspace support
+#USERSPACE=__USERSPACE__
+
 # Uncomment if you want to run in the test mode
-TEST=__TEST__
+#TEST=__TEST__
 
 TEST_FILE=test.c

src/main/kinit.c

@@ -43 +43 @@
 
 #ifdef __SMP__
-#include <arch/smp/mp.h>
+#include <arch/smp/mps.h>
 #endif /* __SMP__ */
 
@@ -115 +115 @@
         cpu_priority_low();
 
+#ifdef __USERSPACE__
         /*
          * Create the first user task.
@@ -139 +140 @@
         
         thread_ready(t);
+#endif /* __USERSPACE__ */
 
 #ifdef __TEST__

src/main/main.c

@@ -42 +42 @@
 #ifdef __SMP__
 #include <arch/smp/apic.h>
-#include <arch/smp/mp.h>
+#include <arch/smp/mps.h>
 #endif /* __SMP__ */
+
+#include <smp/smp.h>
 
 #include <mm/frame.h>
@@ -118 +120 @@
         arch_late_init();
         
+        smp_init();
         printf("config.cpu_count=%d\n", config.cpu_count);