//kernel/trunk/arch/ppc32/include/exception.h |
---|
78,7 → 78,7 |
static inline void istate_set_retaddr(istate_t *istate, __address retaddr) |
{ |
/* TODO */ |
istate->pc = retaddr; |
} |
#endif |
//kernel/trunk/arch/ppc32/Makefile.inc |
---|
61,7 → 61,6 |
CONFIG_SOFTINT = y |
ARCH_SOURCES = \ |
arch/$(ARCH)/src/console.c \ |
arch/$(ARCH)/src/context.S \ |
arch/$(ARCH)/src/debug/panic.s \ |
arch/$(ARCH)/src/fpu_context.S \ |
//kernel/trunk/arch/ppc32/src/console.c |
---|
File deleted |
//kernel/trunk/arch/ppc32/src/ppc32.c |
---|
57,8 → 57,6 |
/* Start decrementer */ |
start_decrementer(); |
ppc32_console_init(); |
cuda_init(); |
} |
65,6 → 63,8 |
void arch_post_mm_init(void) |
{ |
if (config.cpu_active == 1) { |
fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline); |
/* Merge all zones to 1 big zone */ |
zone_merge_all(); |
//kernel/trunk/arch/ia32/src/drivers/vesa.c |
---|
58,30 → 58,9 |
return false; |
} |
static count_t vesa_frame_order(void) |
{ |
__u32 x = vesa_scanline*vesa_height; |
if (x <= FRAME_SIZE) |
return 0; |
return (fnzb32(x - 1) + 1) - FRAME_WIDTH; |
} |
void vesa_init(void) |
{ |
int a; |
__address vram_lin_addr; |
vram_lin_addr = PA2KA(PFN2ADDR(frame_alloc(vesa_frame_order(), FRAME_KA))); |
/* Map videoram */ |
for (a = 0; a < ((vesa_scanline * vesa_height + PAGE_SIZE - 1) >> PAGE_WIDTH); a++) |
page_mapping_insert(AS_KERNEL, vram_lin_addr + a*PAGE_SIZE, vesa_ph_addr + a*FRAME_SIZE, |
PAGE_NOT_CACHEABLE); |
fb_init(vram_lin_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline); |
fb_register(); |
sysinfo_set_item_val("fb.address.physical", NULL, vesa_ph_addr); |
fb_init(vesa_ph_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline); |
} |
#endif |