Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2359 → Rev 2360

/branches/arm/kernel/arch/arm32/include/drivers/gxemul.h
53,7 → 53,6
uintptr_t irqc;
uintptr_t irqc_mask;
uintptr_t irqc_unmask;
uintptr_t fb;
} gxemul_hw_map_t;
 
 
/branches/arm/kernel/arch/arm32/src/arm32.c
86,9 → 86,9
console_init(device_assign_devno());
 
//#ifdef CONFIG_FB
// fb_init(machine_get_fb_address(), 640, 480, 1920, VISUAL_RGB_8_8_8);
//#endif
#ifdef CONFIG_FB
fb_init(machine_get_fb_address(), 640, 480, 1920, VISUAL_RGB_8_8_8);
#endif
}
 
 
/branches/arm/kernel/arch/arm32/src/drivers/gxemul.c
118,7 → 118,6
gxemul_hw_map.kbd = hw_map(GXEMUL_KBD, PAGE_SIZE);
gxemul_hw_map.rtc = hw_map(GXEMUL_RTC, PAGE_SIZE);
gxemul_hw_map.irqc = hw_map(GXEMUL_IRQC, PAGE_SIZE);
gxemul_hw_map.fb = hw_map(GXEMUL_FB, PAGE_SIZE);
 
gxemul_hw_map.rtc_freq = gxemul_hw_map.rtc + GXEMUL_RTC_FREQ_OFFSET;
gxemul_hw_map.rtc_ack = gxemul_hw_map.rtc + GXEMUL_RTC_ACK_OFFSET;
391,7 → 390,7
 
uintptr_t gxemul_get_fb_address(void)
{
return gxemul_hw_map.fb;
return (uintptr_t) GXEMUL_FB;
}
 
/** @}