From 33fa38c894b50f751f4295a23d8f3ef4ec4c2e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 12 Oct 2008 21:34:31 +0000 Subject: [PATCH] Avoid using the first physical page. The first 2kB are supposedly protected by the hardware (though it should be accessible by supervisor...) This fixes an segfault. Now the kernel panics in M68KAtari::InitTimer()... "WRITEME" :) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28008 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/platform/atari_m68k/atari_memory_map.h | 4 +++- src/system/boot/platform/atari_m68k/mmu.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/system/boot/platform/atari_m68k/atari_memory_map.h b/src/system/boot/platform/atari_m68k/atari_memory_map.h index 881450a898..2235fc276c 100644 --- a/src/system/boot/platform/atari_m68k/atari_memory_map.h +++ b/src/system/boot/platform/atari_m68k/atari_memory_map.h @@ -6,7 +6,9 @@ #define ATARI_MEMORY_MAP_H /* the DMA-accessible RAM */ -#define ATARI_CHIPRAM_BASE 0x00000000 +/*#define ATARI_CHIPRAM_BASE 0x00000000*/ +/* actually, the first 2kB aren't usable */ +#define ATARI_CHIPRAM_BASE 0x00001000 #define ATARI_CHIPRAM_MAX 0x00e00000 #define ATARI_CHIPRAM_LAST \ (ATARI_CHIPRAM_BASE + (ATARI_CHIPRAM_MAX - 1)) diff --git a/src/system/boot/platform/atari_m68k/mmu.cpp b/src/system/boot/platform/atari_m68k/mmu.cpp index e3dfbd872a..b4631f1940 100644 --- a/src/system/boot/platform/atari_m68k/mmu.cpp +++ b/src/system/boot/platform/atari_m68k/mmu.cpp @@ -625,7 +625,7 @@ mmu_init(void) // st ram as 1st range gKernelArgs.physical_memory_range[0].start = ATARI_CHIPRAM_BASE; - gKernelArgs.physical_memory_range[0].size = *TOSVARphystop; + gKernelArgs.physical_memory_range[0].size = *TOSVARphystop - ATARI_CHIPRAM_BASE; gKernelArgs.num_physical_memory_ranges = 1; // fast ram as 2nd range