Changeset 807d2d4 in mainline

Timestamp:

2005-10-26T09:12:45Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b9b103d3

Parents:

34d9ab28

Message:

Move ACPI code to genarch.
Enable it for ia32, amd64 and ia64.
For now, ia64 support is commented out.

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia32/src/smp/smp.c (modified) (1 diff)
• build.amd64 (modified) (2 diffs)
• genarch/Makefile.inc (modified) (2 diffs)
• genarch/include/firmware/acpi/acpi.h (moved) (moved from arch/ia32/include/acpi/acpi.h )
• genarch/include/firmware/acpi/madt.h (moved) (moved from arch/ia32/include/acpi/madt.h ) (1 diff)
• genarch/src/firmware/acpi/acpi.c (moved) (moved from arch/ia32/src/acpi/acpi.c ) (1 diff)
• genarch/src/firmware/acpi/madt.c (moved) (moved from arch/ia32/src/acpi/madt.c ) (1 diff)

arch/amd64/Makefile.inc

@@ -51 +51 @@
         src/arch/cpu/cpu.c \
         src/arch/proc/scheduler.c \
-        src/arch/userspace.c \
-        src/arch/acpi/acpi.c \
-        src/arch/acpi/madt.c
+        src/arch/userspace.c
 
 ifdef SMP

arch/amd64/src/amd64.c

@@ -43 +43 @@
 #include <print.h>
 #include <arch/cpuid.h>
-#include <arch/acpi/acpi.h>
+#include <genarch/firmware/acpi/acpi.h>
 #include <panic.h>
 

arch/ia32/Makefile.inc

@@ -44 +44 @@
         src/arch/asm.S \
         src/arch/proc/scheduler.c \
-        src/arch/acpi/acpi.c \
-        src/arch/acpi/madt.c \
         src/arch/bios/bios.c \
         src/arch/smp/ap.S \

arch/ia32/src/ia32.c

@@ -45 +45 @@
 #include <arch/interrupt.h>
 #include <arch/asm.h>
-#include <arch/acpi/acpi.h>
+#include <genarch/firmware/acpi/acpi.h>
 
 #include <arch/bios/bios.h>

arch/ia32/src/smp/smp.c

@@ -31 +31 @@
 #include <arch/smp/mps.h>
 #include <arch/smp/ap.h>
-#include <arch/acpi/acpi.h>
-#include <arch/acpi/madt.h>
+#include <genarch/firmware/acpi/acpi.h>
+#include <genarch/firmware/acpi/madt.h>
 #include <config.h>
 #include <synch/waitq.h>

build.amd64

@@ -9 +9 @@
 set -e
 cd arch
-for a in drivers bios fmath.c mm/frame.c mm/tlb.c mm/memory_init.c boot/memmap.S smp/apic.c smp/ipi.c smp/mps.c smp/smp.c acpi; do
+for a in drivers bios fmath.c mm/frame.c mm/tlb.c mm/memory_init.c boot/memmap.S smp/apic.c smp/ipi.c smp/mps.c smp/smp.c; do
   if [ \! -e amd64/src/$a ]; then
     echo ln -sf `pwd`/ia32/src/$a amd64/src/$a
@@ -16 +16 @@
 done
 
-for a in atomic.h ega.h fpu_context.h i8042.h i8259.h i8254.h interrupt.h bios mm/memory_init.h boot/memmap.h boot/memmapasm.h smp acpi barrier.h; do
+for a in atomic.h ega.h fpu_context.h i8042.h i8259.h i8254.h interrupt.h bios mm/memory_init.h boot/memmap.h boot/memmapasm.h smp barrier.h; do
   if [ \! -e amd64/include/$a ]; then
     echo ln -sf `pwd`/ia32/include/$a amd64/include/$a

genarch/Makefile.inc

@@ +1 @@
+#
 # Open Firmware
+#
 OFW=no
 
@@ -10 +12 @@
 endif
 
+#
+# Advanced Configuration and Power Interface (ACPI)
+#
+ACPI=no
+
+ifeq ($(ARCH),ia32)
+ACPI=yes
+endif
+
+ifeq ($(ARCH),amd64)
+ACPI=yes
+endif
+
+ifeq ($(ARCH),ia64)
+#ACPI=yes
+endif
+
+
 ifeq ($(OFW),yes)
 genarch_sources+=src/genarch/firmware/ofw/ofw.c
 endif
+
+ifeq ($(ACPI),yes)
+genarch_sources+=src/genarch/firmware/acpi/acpi.c \
+                 src/genarch/firmware/acpi/madt.c
+endif

genarch/include/firmware/acpi/madt.h

@@ -30 +30 @@
 #define __MADT_H__
 
-#include <arch/acpi/acpi.h>
+#include <genarch/firmware/acpi/acpi.h>
 #include <arch/smp/apic.h>
 #include <arch/smp/smp.h>

genarch/src/firmware/acpi/acpi.c

@@ -27 +27 @@
  */
 
-#include <arch/acpi/acpi.h>
-#include <arch/acpi/madt.h>
+#include <genarch/firmware/acpi/acpi.h>
+#include <genarch/firmware/acpi/madt.h>
 #include <arch/bios/bios.h>
 

genarch/src/firmware/acpi/madt.c

@@ -29 +29 @@
 #include <arch/types.h>
 #include <typedefs.h>
-#include <arch/acpi/acpi.h>
-#include <arch/acpi/madt.h>
+#include <genarch/firmware/acpi/acpi.h>
+#include <genarch/firmware/acpi/madt.h>
 #include <arch/smp/apic.h>
 #include <arch/smp/smp.h>