Changeset 7633b109 in mainline for genarch

Timestamp:

2006-05-19T13:14:37Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5ca586a1

Parents:

c0bc189

Message:

Change the way the framebuffer is mapped so that sparc64 is usable again.

Location:

genarch

Files:

• Makefile.inc (modified) (1 diff)
• include/fb/fb.h (modified) (1 diff)
• src/fb/fb.c (modified) (2 diffs)
• src/fb/fb_map.c (added)

genarch/Makefile.inc

@@ -68 +68 @@
                 genarch/src/fb/fb.c
         DEFS += -DCONFIG_FB
+        ifneq ($(CONFIG_FB_MAP_ARCH),y)
+                GENARCH_SOURCES += \
+                        genarch/src/fb/fb_map.c
+        endif
 endif
 

genarch/include/fb/fb.h

@@ -36 +36 @@
 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

genarch/src/fb/fb.c

@@ -33 +33 @@
 #include <sysinfo/sysinfo.h>
 #include <mm/slab.h>
-#include <mm/as.h>
 #include <bitops.h>
 #include <align.h>
@@ -361 +360 @@
         fbaddress = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(fborder, FRAME_KA)));
         
-        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);
+        fb_map_arch((__address) fbaddress, (__address) addr, fbsize);
         
         xres = x;