[haiku-commits] r38924 - haiku/trunk/src/system/boot/platform/amiga_m68k
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 10 Oct 2010 13:27:52 +0200 (CEST)
Author: mmu_man
Date: 2010-10-10 13:27:52 +0200 (Sun, 10 Oct 2010)
New Revision: 38924
Changeset: http://dev.haiku-os.org/changeset/38924
Modified:
haiku/trunk/src/system/boot/platform/amiga_m68k/console.cpp
haiku/trunk/src/system/boot/platform/amiga_m68k/mmu.cpp
haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S
Log:
s/tos/ami/g;s/ATARI/AMIGA/g
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/console.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/console.cpp 2010-10-10
11:22:50 UTC (rev 38923)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/console.cpp 2010-10-10
11:27:52 UTC (rev 38924)
@@ -8,7 +8,7 @@
#include <SupportDefs.h>
#include <string.h>
-#include "toscalls.h"
+#include "amicalls.h"
#include <util/kernel_cpp.h>
#include "Handle.h"
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/mmu.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/mmu.cpp 2010-10-10
11:22:50 UTC (rev 38923)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/mmu.cpp 2010-10-10
11:27:52 UTC (rev 38924)
@@ -6,8 +6,8 @@
*/
-#include "atari_memory_map.h"
-#include "toscalls.h"
+#include "amiga_memory_map.h"
+#include "amicalls.h"
#include "mmu.h"
#include <boot/platform.h>
@@ -565,7 +565,7 @@
fastram_top = *TOSVARramtop;
if (fastram_top) {
// we have some fastram, use it first
- sNextPhysicalAddress = ATARI_FASTRAM_BASE;
+ sNextPhysicalAddress = AMIGA_FASTRAM_BASE;
}
gKernelArgs.physical_allocated_range[0].start = sNextPhysicalAddress;
@@ -574,9 +574,9 @@
// remember the start of the allocated physical pages
// enable transparent translation of the first 256 MB
- gMMUOps->set_tt(0, ATARI_CHIPRAM_BASE, 0x10000000, 0);
+ gMMUOps->set_tt(0, AMIGA_CHIPRAM_BASE, 0x10000000, 0);
// enable transparent translation of the 16MB ST shadow range for I/O
- gMMUOps->set_tt(1, ATARI_SHADOW_BASE, 0x01000000, 0);
+ gMMUOps->set_tt(1, AMIGA_SHADOW_BASE, 0x01000000, 0);
init_page_directory();
#if 0//XXX:HOLE
@@ -606,16 +606,16 @@
gKernelArgs.cpu_kstack[0].start +
gKernelArgs.cpu_kstack[0].size));
// st ram as 1st range
- gKernelArgs.physical_memory_range[0].start = ATARI_CHIPRAM_BASE;
- gKernelArgs.physical_memory_range[0].size = *TOSVARphystop -
ATARI_CHIPRAM_BASE;
+ gKernelArgs.physical_memory_range[0].start = AMIGA_CHIPRAM_BASE;
+ gKernelArgs.physical_memory_range[0].size = *TOSVARphystop -
AMIGA_CHIPRAM_BASE;
gKernelArgs.num_physical_memory_ranges = 1;
// fast ram as 2nd range
if (fastram_top) {
gKernelArgs.physical_memory_range[1].start =
- ATARI_FASTRAM_BASE;
+ AMIGA_FASTRAM_BASE;
gKernelArgs.physical_memory_range[1].size =
- fastram_top - ATARI_FASTRAM_BASE;
+ fastram_top - AMIGA_FASTRAM_BASE;
gKernelArgs.num_physical_memory_ranges++;
}
@@ -628,9 +628,6 @@
gKernelArgs.num_physical_allocated_ranges++;
- gKernelArgs.arch_args.plat_args.atari.nat_feat.nf_page =
- get_next_physical_page() /*| 0xff000000*/;
-
}
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S 2010-10-10
11:22:50 UTC (rev 38923)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S 2010-10-10
11:27:52 UTC (rev 38924)
@@ -257,7 +257,7 @@
move.w #0,%d5 // trackno
move.w #1,%d4 // sectno
move.w sNumSectors,%d3 // remainder
- move.l #ATARI_ZBEOS_BASE,%a5
+ move.l #AMIGA_ZBEOS_BASE,%a5
read_sectors_loop:
bsr.s read_sect
bne read_sectors_fail
@@ -516,7 +516,7 @@
//or.w #0x0700,%sr
// setup stack
- move.l #ATARI_ZBEOS_STACK_END,%sp
+ move.l #AMIGA_ZBEOS_STACK_END,%sp
lea h5,%a0
bsr puts
@@ -532,7 +532,7 @@
sub.w #1,%d0
// load addresses
lea _bs_entry,%a0
- move.l #ATARI_ZBEOS_BASE,%a1
+ move.l #AMIGA_ZBEOS_BASE,%a1
nextsect:
@@ -548,13 +548,13 @@
// all done
super_done:
// XXX: copy the rest !
- move.b #ATARI_BOOT_DRVAPI_FLOPPY,ATARI_ZBEOS_BASE +
gBootDriveAPI - _bs_entry
- move.b #0,ATARI_ZBEOS_BASE + gBootDriveID - _bs_entry
- move.b #1,ATARI_ZBEOS_BASE + gBootedFromImage - _bs_entry
+ move.b #AMIGA_BOOT_DRVAPI_FLOPPY,AMIGA_ZBEOS_BASE +
gBootDriveAPI - _bs_entry
+ move.b #0,AMIGA_ZBEOS_BASE + gBootDriveID - _bs_entry
+ move.b #1,AMIGA_ZBEOS_BASE + gBootedFromImage - _bs_entry
move.l #0,%d0
- //jmp ATARI_ZBEOS_BASE+512
+ //jmp AMIGA_ZBEOS_BASE+512
jmp _start
saved_super_stack:
@@ -563,9 +563,6 @@
GLOBAL(gBootedFromImage):
.byte 0
-GLOBAL(gBootDriveAPI):
- .byte ATARI_BOOT_DRVAPI_UNKNOWN
-
GLOBAL(gBootDriveID):
.byte 0
Other related posts:
- » [haiku-commits] r38924 - haiku/trunk/src/system/boot/platform/amiga_m68k - revol
