Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the initializing of the memory map for reactos.

Browse source 
svn path=/trunk/; revision=3634
This commit is contained in:
Hartmut Birr 2002-10-16 16:39:15 +00:00
parent 96dce91abb
commit 50d4270639
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
freeldr/freeldr/include/multiboot.h
View file

@ -99,11 +99,16 @@ typedef struct multiboot_info
unsigned long cmdline; unsigned long cmdline;
unsigned long mods_count; unsigned long mods_count;
unsigned long mods_addr; unsigned long mods_addr;
#if 0
/* reactos and loadros define this entry with a size of 12 byte but the union is 16 byte */
union union
{ {
aout_symbol_table_t aout_sym; aout_symbol_table_t aout_sym;
elf_section_header_table_t elf_sec; elf_section_header_table_t elf_sec;
} u; } u;
#else
char syms[12];
#endif
unsigned long mmap_length; unsigned long mmap_length;
unsigned long mmap_addr; unsigned long mmap_addr;
} multiboot_info_t; } multiboot_info_t;
@ -137,7 +142,7 @@ char multiboot_kernel_cmdline[255]; // Command line passed to kernel
module_t multiboot_modules[64]; // Array to hold boot module info loaded for the kernel module_t multiboot_modules[64]; // Array to hold boot module info loaded for the kernel
char multiboot_module_strings[64][256]; // Array to hold module names char multiboot_module_strings[64][256]; // Array to hold module names
unsigned long multiboot_memory_map_descriptor_size; unsigned long multiboot_memory_map_descriptor_size;
memory_map_t multiboot_memory_map; // Memory map memory_map_t multiboot_memory_map[32]; // Memory map
void boot_reactos(void); void boot_reactos(void);

26
freeldr/freeldr/reactos/reactos.c
View file

@ -432,7 +432,7 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
char szHalName[1024]; char szHalName[1024];
char szFileName[1024]; char szFileName[1024];
char szBootPath[256]; char szBootPath[256];
// int i; int i;
// int nNumDriverFiles=0; // int nNumDriverFiles=0;
// int nNumFilesLoaded=0; // int nNumFilesLoaded=0;
char MsgBuffer[256]; char MsgBuffer[256];
@ -463,22 +463,24 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
mb_info.cmdline = (unsigned long)multiboot_kernel_cmdline; mb_info.cmdline = (unsigned long)multiboot_kernel_cmdline;
mb_info.mods_count = 0; mb_info.mods_count = 0;
mb_info.mods_addr = (unsigned long)multiboot_modules; mb_info.mods_addr = (unsigned long)multiboot_modules;
mb_info.mmap_length = (unsigned long)GetBiosMemoryMap((PBIOS_MEMORY_MAP_ARRAY)&multiboot_memory_map); mb_info.mmap_length = (unsigned long)GetBiosMemoryMap((PBIOS_MEMORY_MAP_ARRAY)&multiboot_memory_map) * sizeof(memory_map_t);
if (mb_info.mmap_length) if (mb_info.mmap_length)
{ {
mb_info.mmap_addr = (unsigned long)&multiboot_memory_map; mb_info.mmap_addr = (unsigned long)&multiboot_memory_map;
mb_info.flags |= MB_INFO_FLAG_MEMORY_MAP; mb_info.flags |= MB_INFO_FLAG_MEMORY_MAP;
//printf("memory map length: %d\n", mb_info.mmap_length); multiboot_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
//printf("dumping memory map:\n"); DbgPrint((DPRINT_REACTOS, "memory map length: %d\n", mb_info.mmap_length));
//for (i=0; i<(mb_info.mmap_length / 4); i++) DbgPrint((DPRINT_REACTOS, "dumping memory map:\n"));
//{ for (i=0; i<(mb_info.mmap_length/sizeof(memory_map_t)); i++)
// printf("0x%x\n", ((unsigned long *)&multiboot_memory_map)[i]); {
//} DbgPrint((DPRINT_REACTOS, "start: %x\t size: %x\t type %d\n",
//getch(); multiboot_memory_map[i].base_addr_low,
multiboot_memory_map[i].length_low,
multiboot_memory_map[i].type));
}
} }
//printf("low_mem = %d\n", mb_info.mem_lower); DbgPrint((DPRINT_REACTOS, "low_mem = %d\n", mb_info.mem_lower));
//printf("high_mem = %d\n", mb_info.mem_upper); DbgPrint((DPRINT_REACTOS, "high_mem = %d\n", mb_info.mem_upper));
//getch();
/* /*
* Make sure the system path is set in the .ini file * Make sure the system path is set in the .ini file