Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2025-08-07 15:25:04 +00:00
Code Issues Projects Releases Wiki Activity

move call to get_memory_mep() to memory.c

Browse Source
This commit is contained in:
Laurent Vivier
2004-02-17 10:26:46 +00:00
parent df44431502
commit 7201e9b32e
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
second/bootinfo.c
View File

@@ -234,7 +234,6 @@ MacHasHardware(unsigned long gestaltBit)
void bootinfo_init() void bootinfo_init()
{ {
long proc, fpu, mmu, mach, ram; long proc, fpu, mmu, mach, ram;
memory_map_t map;
int i; int i;
/* I'm a macintosh, I know, I'm sure */ /* I'm a macintosh, I know, I'm sure */
@@ -322,12 +321,10 @@ void bootinfo_init()
/* memory structure */ /* memory structure */
get_memory_map(&map); for (i = 0; i < memory_map.bank_number; i++)
for (i = 0; i < map.bank_number; i++)
{ {
boot_info.memory[i].addr = map.bank[i].address; boot_info.memory[i].addr = memory_map.bank[i].address;
boot_info.memory[i].size = map.bank[i].size; boot_info.memory[i].size = memory_map.bank[i].size;
} }
boot_info.num_memory = i; boot_info.num_memory = i;

10
second/main.c
View File

@@ -26,7 +26,6 @@ int main(int argc, char** argv)
char* kernel_image_start = &_kernel_start; char* kernel_image_start = &_kernel_start;
unsigned long kernel_image_size = &_kernel_end - &_kernel_start; unsigned long kernel_image_size = &_kernel_end - &_kernel_start;
unsigned long kernel_size = (unsigned long)&_KERNEL_SIZE; unsigned long kernel_size = (unsigned long)&_KERNEL_SIZE;
memory_map_t map;
int i; int i;
printf("Early Macintosh Image LoadEr\n"); printf("Early Macintosh Image LoadEr\n");
@@ -37,13 +36,14 @@ int main(int argc, char** argv)
printf("Kernel image size is %ld Bytes\n", kernel_image_size); printf("Kernel image size is %ld Bytes\n", kernel_image_size);
printf("Physical memory map:\n"); printf("Physical memory map:\n");
get_memory_map(&map); for (i = 0; i < memory_map.bank_number; i++)
for (i = 0; i < map.bank_number; i++)
{ {
printf("%d: 0x%08lx -> 0x%08lx\n", i, map.bank[i].address printf("%d: 0x%08lx -> 0x%08lx\n", i,
, map.bank[i].address + map.bank[i].size); memory_map.bank[i].address,
memory_map.bank[i].address + memory_map.bank[i].size);
} }
while(1);
if (kernel_image_size != 0) if (kernel_image_size != 0)
{ {
/* add KERNEL_ALIGN if we have to align /* add KERNEL_ALIGN if we have to align