Changeset c1982e45 in mainline for genarch

Timestamp:

2006-05-20T21:11:08Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

125e944

Parents:

1068f6a

Message:

make hardware memory mapping more generic

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 (deleted)

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 <bitops.h>
 #include <align.h>
 #include <panic.h>
@@ -350 +349 @@
         
         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)));
-        
-        fb_map_arch((__address) fbaddress, (__address) addr, fbsize);
+        fbaddress = (__u8 *) hw_map((__address) addr, fbsize);
         
         xres = x;