| /kernel/trunk/arch/sparc64/src/console.c |
|---|
| 71,12 → 71,6 |
| ofw_console_active = 1; |
| } |
| void fb_map_arch(__address virtaddr, __address physaddr, size_t size) |
| { |
| dtlb_insert_mapping(virtaddr, physaddr, PAGESIZE_512K, true, false); |
| dtlb_insert_mapping(virtaddr + 512*1024, physaddr + 512*1024, PAGESIZE_512K, true, false); |
| } |
| /** Initialize kernel console to use framebuffer and keyboard directly. */ |
| void standalone_sparc64_console_init(void) |
| { |
| 83,9 → 77,10 |
| ofw_console_active = 0; |
| stdin = NULL; |
| dtlb_insert_mapping(FB_VIRT_ADDRESS, FB_PHYS_ADDRESS, PAGESIZE_4M, true, false); |
| dtlb_insert_mapping(KBD_VIRT_ADDRESS, KBD_PHYS_ADDRESS, PAGESIZE_8K, true, false); |
| fb_init(FB_PHYS_ADDRESS, FB_X_RES, FB_Y_RES, FB_COLOR_DEPTH, FB_X_RES * FB_COLOR_DEPTH / 8); |
| fb_init(FB_VIRT_ADDRESS, FB_X_RES, FB_Y_RES, FB_COLOR_DEPTH, FB_X_RES * FB_COLOR_DEPTH / 8); |
| i8042_init(); |
| } |
| /kernel/trunk/arch/sparc64/Makefile.inc |
|---|
| 61,11 → 61,9 |
| CONFIG_ASID_FIFO = y |
| ## Compile with support for framebuffer. |
| ## Mapping of the framebuffer is implemented by a sparc64-specific function. |
| # |
| CONFIG_FB = y |
| CONFIG_FB_MAP_ARCH = y |
| ## Compile with support for i8042 controller. |
| # |
| /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/src/fb/fb_map.c |
|---|
| File deleted |
| /kernel/trunk/genarch/src/fb/fb.c |
|---|
| 32,6 → 32,7 |
| #include <console/console.h> |
| #include <sysinfo/sysinfo.h> |
| #include <mm/slab.h> |
| #include <mm/as.h> |
| #include <bitops.h> |
| #include <align.h> |
| #include <panic.h> |
| 359,7 → 360,9 |
| /* Map the framebuffer */ |
| fbaddress = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(fborder, FRAME_KA))); |
| fb_map_arch((__address) fbaddress, (__address) addr, fbsize); |
| pfn_t i; |
| for (i = 0; i < ADDR2PFN(ALIGN_UP(fbsize, PAGE_SIZE)); i++) |
| page_mapping_insert(AS_KERNEL, (__address) fbaddress + PFN2ADDR(i), addr + PFN2ADDR(i), PAGE_NOT_CACHEABLE); |
| xres = x; |
| yres = y; |
| /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 |