WebSVN – HelenOS – Path Comparison – / – /trunk/ Rev 4675 and /trunk/ Rev 4674

Ignore whitespace Rev 4675 → Rev 4674

 /trunk/boot/arch/arm32/loader/print/print.c
 ,12 → 40,11
 /** Address where characters to be printed are expected. */
-#ifdef MACHINE_testarm
-    #define PUTC_ADDRESS  0x10000000
+#ifdef MACHINE_GXEMUL_TESTARM
+#define PUTC_ADDRESS    0x10000000
 #endif
-#ifdef MACHINE_integratorcp
-    #define PUTC_ADDRESS  0x16000000
+#ifdef MACHINE_ICP
+#define  PUTC_ADDRESS    0x16000000
 #endif

 /trunk/boot/arch/arm32/loader/Makefile
 ,6 → 41,15
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
+ifeq ($(MACHINE), testarm)
+    DMACHINE = MACHINE_GXEMUL_TESTARM
+endif
+ifeq ($(MACHINE), integratorcp)
+    DMACHINE = MACHINE_ICP
+endif
 ifeq ($(COMPILER),gcc_native)
     CC = gcc
     AS = as
 ,7 → 102,7
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
     $(USPACEDIR)/srv/bd/file_bd/file_bd
-ifeq ($(MACHINE),testarm)
+ifeq ($(MACHINE), testarm)
     RD_SRVS += \
         $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
 endif
 ,4 → 160,4
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
 %.o: %.c
-    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+    $(CC) -D$(DMACHINE) $(DEFS) $(CFLAGS) -c $< -o $@

 /trunk/HelenOS.config
 ,7 → 56,7
 ! [PLATFORM=sparc64] MACHINE (choice)
 % Machine type
-@ "testarm" GXEmul Testarm
+@ "testarm" Gxemul Testarm
 @ "integratorcp" Integratorcp
 ! [PLATFORM=arm32] MACHINE (choice)

 /trunk/kernel/arch/arm32/include/mach/testarm/testarm.h
 ,8 → 36,8
  *  @brief GXemul peripheries drivers declarations.
  */
-#ifndef KERN_arm32_MACHINE_H_
-#define KERN_arm32_MACHINE_H_
+#ifndef KERN_arm32_GXEMUL_H_
+#define KERN_arm32_GXEMUL_H_
 #include <arch/machine_func.h>

 /trunk/kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
 ,8 → 35,8
  *  @brief Integratorcp peripheries drivers declarations.
  */
-#ifndef KERN_arm32_MACHINE_H_
-#define KERN_arm32_MACHINE_H_
+#ifndef KERN_arm32_ICP_H_
+#define KERN_arm32_ICP_H_
 #include <arch/machine_func.h>

 /trunk/kernel/arch/arm32/Makefile.inc
 ,16 → 60,12
     arch/$(KARCH)/src/mm/frame.c \
     arch/$(KARCH)/src/mm/page.c \
     arch/$(KARCH)/src/mm/tlb.c \
-    arch/$(KARCH)/src/mm/page_fault.c
-ifeq ($(MACHINE),testarm)
-    ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
+    arch/$(KARCH)/src/mm/page_fault.c
+ifeq ($(MACHINE), testarm)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
+else ifeq ($(MACHINE), integratorcp)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c
 endif
-ifeq ($(MACHINE),integratorcp)
-    ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c
-endif
-ifeq ($(CONFIG_PL050),y)
+ifeq ($(CONFIG_PL050), y)
     ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c
 endif

 /trunk/kernel/arch/arm32/src/exception.c
 ,17 → 39,10
 #include <interrupt.h>
 #include <arch/mm/page_fault.h>
 #include <arch/barrier.h>
+#include <arch/machine.h>
 #include <print.h>
 #include <syscall/syscall.h>
-#ifdef MACHINE_testarm
-    #include <arch/mach/testarm/testarm.h>
-#endif
-#ifdef MACHINE_integratorcp
-    #include <arch/mach/integratorcp/integratorcp.h>
-#endif
 /** Offset used in calculation of exception handler's relative address.
  *
  * @see install_handler()

 /trunk/kernel/arch/arm32/src/arm32.c
 ,6 → 40,7
 #include <sysinfo/sysinfo.h>
 #include <console/console.h>
 #include <ddi/irq.h>
+#include <arch/machine.h>
 #include <print.h>
 #include <config.h>
 #include <interrupt.h>
 ,15 → 49,6
 #include <macros.h>
 #include <string.h>
-#ifdef MACHINE_testarm
-    #include <arch/mach/testarm/testarm.h>
-#endif
-#ifdef MACHINE_integratorcp
-    #include <arch/mach/integratorcp/integratorcp.h>
-#endif
 /** Performs arm32-specific initialization before main_bsp() is called. */
 void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {

 /trunk/kernel/arch/arm32/src/mm/frame.c
 ,16 → 35,9
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
+#include <arch/machine.h>
 #include <config.h>
-#ifdef MACHINE_testarm
-    #include <arch/mach/testarm/testarm.h>
-#endif
-#ifdef MACHINE_integratorcp
-    #include <arch/mach/integratorcp/integratorcp.h>
-#endif
 /** Address of the last frame in the memory. */
 uintptr_t last_frame = 0;

 /trunk/kernel/arch/arm32/src/interrupt.c
 ,18 → 35,11
 #include <arch/asm.h>
 #include <arch/regutils.h>
+#include <arch/machine.h>
 #include <ddi/irq.h>
 #include <ddi/device.h>
 #include <interrupt.h>
-#ifdef MACHINE_testarm
-    #include <arch/mach/testarm/testarm.h>
-#endif
-#ifdef MACHINE_integratorcp
-    #include <arch/mach/integratorcp/integratorcp.h>
-#endif
 /** Initial size of a table holding interrupt handlers. */
 #define IRQ_COUNT 8
 ,6 → 96,7
 {
     irq_init(IRQ_COUNT, IRQ_COUNT);
     machine_timer_irq_start();
 }
 /** @}

 /trunk/kernel/Makefile
 ,6 → 343,9
 clean:
     -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend* generic/include/arch generic/include/genarch arch/$(KARCH)/_link.ld
     find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
+ifeq ($(PLATFORM),arm32)
+    rm -f arch/$(KARCH)/include/machine.h
+endif
     for arch in arch/* ; do \
         [ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null ; \
     done ; exit 0
 ,6 → 353,9
 archlinks:
     ln -sfn ../../arch/$(KARCH)/include/ generic/include/arch
     ln -sfn ../../genarch/include/ generic/include/genarch
+ifeq ($(PLATFORM),arm32)
+    ln -sfn mach/$(MACHINE)/$(MACHINE).h arch/$(KARCH)/include/machine.h
+endif
 depend: archlinks
     -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null