//kernel/trunk/genarch/include/fb/fb.h |
---|
35,7 → 35,4 |
extern spinlock_t fb_lock; |
void fb_init(__address addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan); |
/* To be implemented by architecture. */ |
void fb_map_arch(__address virtaddr, __address physaddr, size_t size); |
#endif |
//kernel/trunk/genarch/Makefile.inc |
---|
67,10 → 67,6 |
genarch/src/fb/font-8x16.c \ |
genarch/src/fb/fb.c |
DEFS += -DCONFIG_FB |
ifneq ($(CONFIG_FB_MAP_ARCH),y) |
GENARCH_SOURCES += \ |
genarch/src/fb/fb_map.c |
endif |
endif |
## i8042 controller |
//kernel/trunk/genarch/src/fb/fb_map.c |
---|
File deleted |
//kernel/trunk/genarch/src/fb/fb.c |
---|
32,7 → 32,6 |
#include <console/console.h> |
#include <sysinfo/sysinfo.h> |
#include <mm/slab.h> |
#include <bitops.h> |
#include <align.h> |
#include <panic.h> |
#include <memstr.h> |
349,18 → 348,10 |
} |
unsigned int fbsize = scan * y; |
unsigned int fborder; |
if (fbsize <= FRAME_SIZE) |
fborder = 0; |
else |
fborder = (fnzb32(fbsize - 1) + 1) - FRAME_WIDTH; |
/* Map the framebuffer */ |
fbaddress = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(fborder, FRAME_KA))); |
fbaddress = (__u8 *) hw_map((__address) addr, fbsize); |
fb_map_arch((__address) fbaddress, (__address) addr, fbsize); |
xres = x; |
yres = y; |
bitspp = bpp; |