From 8344866509b0aea4f540b2812e2d6c8397d79897 Mon Sep 17 00:00:00 2001 From: wilkie Date: Mon, 23 Mar 2009 08:30:46 +0800 Subject: [PATCH] Changed the name of the archimport module to something more intuitive. You can now include all modules for the architecture by using: import architecture; This is shown in kmain.d. Signed-off-by: The XOmB Overlord --- build/dsss.conf | 4 ++-- build/dsss_imports/{archimport.d => architecture.d} | 4 ++-- kernel/arch/x86/imports/{archimport.d => architecture.d} | 4 ++-- kernel/arch/x86_64/imports/{archimport.d => architecture.d} | 4 ++-- kernel/core/kmain.d | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) rename build/dsss_imports/{archimport.d => architecture.d} (82%) rename kernel/arch/x86/imports/{archimport.d => architecture.d} (82%) rename kernel/arch/x86_64/imports/{archimport.d => architecture.d} (82%) diff --git a/build/dsss.conf b/build/dsss.conf index 83c0a67..783ac8b 100644 --- a/build/dsss.conf +++ b/build/dsss.conf @@ -17,9 +17,9 @@ prebuild= \ \ echo ; \ echo Setting up Architecture Dependence: x86_64; \ -echo '--> archimport.d';\ +echo '--> architecture.d';\ mkdir -p dsss_imports;\ -cp ../kernel/arch/x86_64/imports/archimport.d dsss_imports/.;\ +cp ../kernel/arch/x86_64/imports/architecture.d dsss_imports/.;\ echo ; \ echo Compiling Assembly for target: x86_64 ;\ echo '--> boot.S';\ diff --git a/build/dsss_imports/archimport.d b/build/dsss_imports/architecture.d similarity index 82% rename from build/dsss_imports/archimport.d rename to build/dsss_imports/architecture.d index 9cf2949..d9d92d9 100644 --- a/build/dsss_imports/archimport.d +++ b/build/dsss_imports/architecture.d @@ -1,12 +1,12 @@ /* - * archimport.d + * architecture.d * * This file will publically import all modules used to define * the architecture interfaces provided by this architecture. * */ -module archimport; +module architecture; // Example: // import kernel.arch.x86.main; diff --git a/kernel/arch/x86/imports/archimport.d b/kernel/arch/x86/imports/architecture.d similarity index 82% rename from kernel/arch/x86/imports/archimport.d rename to kernel/arch/x86/imports/architecture.d index 9cf2949..d9d92d9 100644 --- a/kernel/arch/x86/imports/archimport.d +++ b/kernel/arch/x86/imports/architecture.d @@ -1,12 +1,12 @@ /* - * archimport.d + * architecture.d * * This file will publically import all modules used to define * the architecture interfaces provided by this architecture. * */ -module archimport; +module architecture; // Example: // import kernel.arch.x86.main; diff --git a/kernel/arch/x86_64/imports/archimport.d b/kernel/arch/x86_64/imports/architecture.d similarity index 82% rename from kernel/arch/x86_64/imports/archimport.d rename to kernel/arch/x86_64/imports/architecture.d index 9cf2949..d9d92d9 100644 --- a/kernel/arch/x86_64/imports/archimport.d +++ b/kernel/arch/x86_64/imports/architecture.d @@ -1,12 +1,12 @@ /* - * archimport.d + * architecture.d * * This file will publically import all modules used to define * the architecture interfaces provided by this architecture. * */ -module archimport; +module architecture; // Example: // import kernel.arch.x86.main; diff --git a/kernel/core/kmain.d b/kernel/core/kmain.d index 48487a4..264e44f 100644 --- a/kernel/core/kmain.d +++ b/kernel/core/kmain.d @@ -12,7 +12,8 @@ module kernel.core.kmain; // This module contains our powerful kprintf function import kernel.core.kprintf; - +// This module contains the architecture specific modules +import architecture;