Changeset 8424198 in mainline for genarch

Timestamp:

2006-05-18T21:45:16Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

35f3b8c

Parents:

59477e3

Message:

unify the framebuffer API
use physical address as the base address for the framebuffer

Location:

genarch

Files:

• include/fb/fb.h (modified) (1 diff)
• src/fb/fb.c (modified) (4 diffs)

genarch/include/fb/fb.h

@@ -35 +35 @@
 extern spinlock_t fb_lock;
 void fb_init(__address addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan);
-void fb_register(void);
 
 #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>
 #include <panic.h>
 #include <memstr.h>
@@ -313 +316 @@
 /** Initialize framebuffer as a chardev output device
  *
- * @param addr Address of theframebuffer
+ * @param addr Physical address of the framebuffer
  * @param x    Screen width in pixels
  * @param y    Screen height in pixels
@@ -346 +349 @@
                         panic("Unsupported bpp");
         }
-                
-        fbaddress = (unsigned char *) addr;
+        
+        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)));
+        
+        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;
@@ -362 +379 @@
         chardev_initialize("fb", &framebuffer, &fb_ops);
         stdout = &framebuffer;
-}
-
-
-/** Register framebuffer in sysinfo
- *
- */
-void fb_register(void)
-{
+        
         sysinfo_set_item_val("fb", NULL, true);
-        sysinfo_set_item_val("fb.width", NULL, xres);
-        sysinfo_set_item_val("fb.height", NULL, yres);
-        sysinfo_set_item_val("fb.scanline", NULL, scanline);
-        sysinfo_set_item_val("fb.bpp", NULL, bitspp);
-        sysinfo_set_item_val("fb.address.virtual", NULL, (__address) fbaddress);
-}
+        sysinfo_set_item_val("fb.width", NULL, x);
+        sysinfo_set_item_val("fb.height", NULL, y);
+        sysinfo_set_item_val("fb.bpp", NULL, bpp);
+        sysinfo_set_item_val("fb.scanline", NULL, scan);
+        sysinfo_set_item_val("fb.address.physical", NULL, addr);
+}