i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/tos/ami/g;s/ATARI/AMIGA/g

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38924 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2010-10-10 11:27:52 +00:00
parent 2231a4e6a3
commit acb1d6c8e0
3 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/amiga_m68k/console.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <SupportDefs.h> #include <SupportDefs.h>
#include <string.h> #include <string.h>
#include "toscalls.h" #include "amicalls.h"
#include <util/kernel_cpp.h> #include <util/kernel_cpp.h>
#include "Handle.h" #include "Handle.h"
src/system/boot/platform/amiga_m68k/mmu.cpp
+9 -12
View File
@@ -6,8 +6,8 @@
*/ */
#include "atari_memory_map.h" #include "amiga_memory_map.h"
#include "toscalls.h" #include "amicalls.h"
#include "mmu.h" #include "mmu.h"
#include <boot/platform.h> #include <boot/platform.h>
@@ -565,7 +565,7 @@ mmu_init(void)
fastram_top = *TOSVARramtop; fastram_top = *TOSVARramtop;
if (fastram_top) { if (fastram_top) {
// we have some fastram, use it first // we have some fastram, use it first
sNextPhysicalAddress = ATARI_FASTRAM_BASE; sNextPhysicalAddress = AMIGA_FASTRAM_BASE;
} }
gKernelArgs.physical_allocated_range[0].start = sNextPhysicalAddress; gKernelArgs.physical_allocated_range[0].start = sNextPhysicalAddress;
@@ -574,9 +574,9 @@ mmu_init(void)
// remember the start of the allocated physical pages // remember the start of the allocated physical pages
// enable transparent translation of the first 256 MB // 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 // 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(); init_page_directory();
#if 0//XXX:HOLE #if 0//XXX:HOLE
@@ -606,16 +606,16 @@ mmu_init(void)
gKernelArgs.cpu_kstack[0].start + gKernelArgs.cpu_kstack[0].size)); gKernelArgs.cpu_kstack[0].start + gKernelArgs.cpu_kstack[0].size));
// st ram as 1st range // st ram as 1st range
gKernelArgs.physical_memory_range[0].start = ATARI_CHIPRAM_BASE; gKernelArgs.physical_memory_range[0].start = AMIGA_CHIPRAM_BASE;
gKernelArgs.physical_memory_range[0].size = *TOSVARphystop - ATARI_CHIPRAM_BASE; gKernelArgs.physical_memory_range[0].size = *TOSVARphystop - AMIGA_CHIPRAM_BASE;
gKernelArgs.num_physical_memory_ranges = 1; gKernelArgs.num_physical_memory_ranges = 1;
// fast ram as 2nd range // fast ram as 2nd range
if (fastram_top) { if (fastram_top) {
gKernelArgs.physical_memory_range[1].start = gKernelArgs.physical_memory_range[1].start =
ATARI_FASTRAM_BASE; AMIGA_FASTRAM_BASE;
gKernelArgs.physical_memory_range[1].size = gKernelArgs.physical_memory_range[1].size =
fastram_top - ATARI_FASTRAM_BASE; fastram_top - AMIGA_FASTRAM_BASE;
gKernelArgs.num_physical_memory_ranges++; gKernelArgs.num_physical_memory_ranges++;
} }
@@ -628,9 +628,6 @@ mmu_init(void)
gKernelArgs.num_physical_allocated_ranges++; gKernelArgs.num_physical_allocated_ranges++;
gKernelArgs.arch_args.plat_args.atari.nat_feat.nf_page =
get_next_physical_page() /*| 0xff000000*/;
} }
src/system/boot/platform/amiga_m68k/shell.S
+7 -10
View File
@@ -257,7 +257,7 @@ load_sectors:
move.w #0,%d5 // trackno move.w #0,%d5 // trackno
move.w #1,%d4 // sectno move.w #1,%d4 // sectno
move.w sNumSectors,%d3 // remainder move.w sNumSectors,%d3 // remainder
move.l #ATARI_ZBEOS_BASE,%a5 move.l #AMIGA_ZBEOS_BASE,%a5
read_sectors_loop: read_sectors_loop:
bsr.s read_sect bsr.s read_sect
bne read_sectors_fail bne read_sectors_fail
@@ -516,7 +516,7 @@ prg_start:
//or.w #0x0700,%sr //or.w #0x0700,%sr
// setup stack // setup stack
move.l #ATARI_ZBEOS_STACK_END,%sp move.l #AMIGA_ZBEOS_STACK_END,%sp
lea h5,%a0 lea h5,%a0
bsr puts bsr puts
@@ -532,7 +532,7 @@ prg_start:
sub.w #1,%d0 sub.w #1,%d0
// load addresses // load addresses
lea _bs_entry,%a0 lea _bs_entry,%a0
move.l #ATARI_ZBEOS_BASE,%a1 move.l #AMIGA_ZBEOS_BASE,%a1
nextsect: nextsect:
@@ -548,13 +548,13 @@ copysect_loop:
// all done // all done
super_done: super_done:
// XXX: copy the rest ! // XXX: copy the rest !
move.b #ATARI_BOOT_DRVAPI_FLOPPY,ATARI_ZBEOS_BASE + gBootDriveAPI - _bs_entry move.b #AMIGA_BOOT_DRVAPI_FLOPPY,AMIGA_ZBEOS_BASE + gBootDriveAPI - _bs_entry
move.b #0,ATARI_ZBEOS_BASE + gBootDriveID - _bs_entry move.b #0,AMIGA_ZBEOS_BASE + gBootDriveID - _bs_entry
move.b #1,ATARI_ZBEOS_BASE + gBootedFromImage - _bs_entry move.b #1,AMIGA_ZBEOS_BASE + gBootedFromImage - _bs_entry
move.l #0,%d0 move.l #0,%d0
//jmp ATARI_ZBEOS_BASE+512 //jmp AMIGA_ZBEOS_BASE+512
jmp _start jmp _start
saved_super_stack: saved_super_stack:
@@ -563,9 +563,6 @@ saved_super_stack:
GLOBAL(gBootedFromImage): GLOBAL(gBootedFromImage):
.byte 0 .byte 0
GLOBAL(gBootDriveAPI):
.byte ATARI_BOOT_DRVAPI_UNKNOWN
GLOBAL(gBootDriveID): GLOBAL(gBootDriveID):
.byte 0 .byte 0