Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 367 → Rev 368

/SPARTAN/trunk/arch/ia32/src/smp/mps.c
187,8 → 187,6
fs_found:
printf("%P: MPS Floating Pointer Structure\n", fs);
 
frame_not_free((__address) fs);
 
if (fs->config_type == 0 && fs->configuration_table) {
if (fs->mpfib2 >> 7) {
printf("%s: PIC mode not supported\n", __FUNCTION__);
196,7 → 194,6
}
 
ct = (struct mps_ct *)PA2KA((__address)fs->configuration_table);
frame_not_free((__address) ct);
config.cpu_count = configure_via_ct();
}
else
/SPARTAN/trunk/arch/ia32/src/mm/frame.c
32,6 → 32,7
#include <config.h>
#include <arch/boot/boot.h>
#include <arch/boot/memmap.h>
#include <panic.h>
 
size_t hardcoded_unmapped_ktext_size = 0;
size_t hardcoded_unmapped_kdata_size = 0;
38,23 → 39,23
 
void frame_arch_init(void)
{
zone_t *z;
__u8 i;
if (config.cpu_active == 1) {
/* Reserve the NULL frame */
frame_not_free(0x0);
/* Reserve well-known memory regions */
frame_region_not_free(0xa0000,0xff000);
frame_region_not_free(0xfec00000,0xffffffff);
/* Reserve real mode bootstrap memory */
frame_region_not_free(BOOTSTRAP_OFFSET, BOOTSTRAP_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size);
for (i=e820counter;i>0;i--) {
if (e820table[i-1].type!=MEMMAP_MEMORY_AVAILABLE) {
frame_region_not_free(e820table[i-1].base_address, e820table[i-1].base_address+e820table[i-1].size);
if (e820table[i-1].type==MEMMAP_MEMORY_AVAILABLE) {
z = zone_create(e820table[i-1].base_address, e820table[i-1].size & ~(FRAME_SIZE-1), 0);
if (!z) {
panic("Cannot allocate zone (%dB).\n", e820table[i-1].size & ~(FRAME_SIZE-1));
}
zone_attach(z);
}
}
frame_not_free(0);
 
/* Reserve real mode bootstrap memory */
frame_region_not_free(BOOTSTRAP_OFFSET, BOOTSTRAP_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size);
}
}
/SPARTAN/trunk/arch/ia32/src/mm/page.c
55,7 → 55,7
/*
* PA2KA(identity) mapping for all frames.
*/
for (i = 0; i < frames; i++)
for (i = 0; i < config.memory_size/PAGE_SIZE; i++)
map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
 
trap_register(14, page_fault);