Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3529 → Rev 3528

/branches/arm/kernel/arch/arm32/include/drivers/qemu.h
74,7 → 74,8
extern void qemu_icp_irq_exception(int exc_no, istate_t *istate);
extern size_t qemu_icp_get_memory_size(void);
extern uintptr_t qemu_icp_get_fb_address(void);
extern void qemu_icp_fb_init(void);
extern void icp_vga_init();
 
#endif
 
/** @}
/branches/arm/kernel/arch/arm32/include/drivers/gxemul.h
72,7 → 72,6
extern void gxemul_irq_exception(int exc_no, istate_t *istate);
extern size_t gxemul_get_memory_size(void);
extern uintptr_t gxemul_get_fb_address(void);
extern void gxemul_fb_init(void);
 
#endif
 
/branches/arm/kernel/arch/arm32/include/machine.h
91,12 → 91,7
*/
extern void machine_debug_putc(char ch);
 
/** Initializes the Frame Buffer
*
*/
extern void machine_fb_init(void);
 
 
/** Interrupt exception handler.
*
* @param exc_no Interrupt exception number.
124,7 → 119,6
#define machine_irq_exception(exc_no, istate) \
gxemul_irq_exception(exc_no, istate)
#define machine_get_fb_address gxemul_get_fb_address
#define machine_fb_init gxemul_fb_init
#endif
 
#ifdef MACHINE_QEMU_ICP
139,7 → 133,6
#define machine_irq_exception(exc_no, istate) \
qemu_icp_irq_exception(exc_no, istate)
#define machine_get_fb_address qemu_icp_get_fb_address
#define machine_fb_init qemu_icp_fb_init
#endif
#endif
 
/branches/arm/kernel/arch/arm32/src/arm32.c
86,7 → 86,7
console_init(device_assign_devno());
 
#ifdef CONFIG_FB
machine_fb_init();
fb_init(machine_get_fb_address(), 640, 480, 2560, VISUAL_BGR_8_8_8_0);
#endif
}
 
/branches/arm/kernel/arch/arm32/src/drivers/qemu.c
44,8 → 44,6
#include <mm/page.h>
#include <arch/machine.h>
#include <arch/debug/print.h>
#include <genarch/fb/fb.h>
#include <genarch/fb/visuals.h>
 
/* Addresses of devices. */
#define QEMU_ICP_VIDEORAM 0x16000000
131,11 → 129,6
*((uint32_t *) qemu_icp_hw_map.irqc_unmask) = irq;
}
 
/** Initializes the icp frame buffer */
void qemu_icp_fb_init(void)
{
fb_init(qemu_icp_get_fb_address(), 640, 480, 2560, VISUAL_BGR_8_8_8_0);
}
 
/** Initializes #qemu_icp_hw_map. */
void qemu_icp_hw_map_init(void)
/branches/arm/kernel/arch/arm32/src/drivers/gxemul.c
44,8 → 44,6
#include <mm/page.h>
#include <arch/machine.h>
#include <arch/debug/print.h>
#include <genarch/fb/fb.h>
#include <genarch/fb/visuals.h>
 
/* Addresses of devices. */
#define GXEMUL_VIDEORAM 0x10000000
111,11 → 109,6
*((uint32_t *) gxemul_hw_map.irqc_unmask) = irq;
}
 
/** Initializes the gxemul testarm frame buffer */
void gxemul_fb_init(void)
{
fb_init(gxemul_get_fb_address(), 640, 480, 1920, VISUAL_RGB_8_8_8);
}
 
/** Initializes #gxemul_hw_map. */
void gxemul_hw_map_init(void)