From acb1d6c8e0f7738ab05ffea577935ba8d31c838b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 10 Oct 2010 11:27:52 +0000
Subject: [PATCH] s/tos/ami/g;s/ATARI/AMIGA/g

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38924 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../boot/platform/amiga_m68k/console.cpp      |  2 +-
 src/system/boot/platform/amiga_m68k/mmu.cpp   | 21 ++++++++-----------
 src/system/boot/platform/amiga_m68k/shell.S   | 17 +++++++--------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/system/boot/platform/amiga_m68k/console.cpp b/src/system/boot/platform/amiga_m68k/console.cpp
index 98375b61f2..5072d72456 100644
--- a/src/system/boot/platform/amiga_m68k/console.cpp
+++ b/src/system/boot/platform/amiga_m68k/console.cpp
@@ -8,7 +8,7 @@
 
 #include <SupportDefs.h>
 #include <string.h>
-#include "toscalls.h"
+#include "amicalls.h"
 #include <util/kernel_cpp.h>
 
 #include "Handle.h"
diff --git a/src/system/boot/platform/amiga_m68k/mmu.cpp b/src/system/boot/platform/amiga_m68k/mmu.cpp
index 9c459b1e88..f4fb5e84eb 100644
--- a/src/system/boot/platform/amiga_m68k/mmu.cpp
+++ b/src/system/boot/platform/amiga_m68k/mmu.cpp
@@ -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 @@ mmu_init(void)
 		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 @@ mmu_init(void)
 		// 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 @@ mmu_init(void)
 		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 @@ mmu_init(void)
 	gKernelArgs.num_physical_allocated_ranges++;
 
 
-	gKernelArgs.arch_args.plat_args.atari.nat_feat.nf_page =
-		get_next_physical_page() /*| 0xff000000*/;
-
 }
 
 
diff --git a/src/system/boot/platform/amiga_m68k/shell.S b/src/system/boot/platform/amiga_m68k/shell.S
index 95058d5f4d..874cb14be7 100644
--- a/src/system/boot/platform/amiga_m68k/shell.S
+++ b/src/system/boot/platform/amiga_m68k/shell.S
@@ -257,7 +257,7 @@ load_sectors:
 	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 @@ prg_start:
 	//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 @@ prg_start:
 	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 @@ copysect_loop:
 	// 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 @@ saved_super_stack:
 GLOBAL(gBootedFromImage):
 	.byte	0
 
-GLOBAL(gBootDriveAPI):
-	.byte	ATARI_BOOT_DRVAPI_UNKNOWN
-
 GLOBAL(gBootDriveID):
 	.byte	0