Changeset 8424198 in mainline

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

Files:

• arch/ia32/src/drivers/vesa.c (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/ppc32/include/exception.h (modified) (1 diff)
• arch/ppc32/src/console.c (deleted)
• arch/ppc32/src/ppc32.c (modified) (2 diffs)
• genarch/include/fb/fb.h (modified) (1 diff)
• genarch/src/fb/fb.c (modified) (4 diffs)

arch/ia32/src/drivers/vesa.c

@@ -59 +59 @@
 }
 
-static count_t vesa_frame_order(void)
-{
-        __u32 x = vesa_scanline*vesa_height;
-        if (x <= FRAME_SIZE)
-                return 0;
-
-        return (fnzb32(x - 1) + 1) - FRAME_WIDTH;
-}
-
 void vesa_init(void)
 {
-        int a;
-        __address vram_lin_addr;
-
-        vram_lin_addr = PA2KA(PFN2ADDR(frame_alloc(vesa_frame_order(), FRAME_KA)));
-        /* Map videoram */
-        for (a = 0; a < ((vesa_scanline * vesa_height + PAGE_SIZE - 1) >> PAGE_WIDTH); a++)
-                page_mapping_insert(AS_KERNEL, vram_lin_addr + a*PAGE_SIZE, vesa_ph_addr + a*FRAME_SIZE,
-                        PAGE_NOT_CACHEABLE);
-
-        fb_init(vram_lin_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline);
-        
-        fb_register();
-        sysinfo_set_item_val("fb.address.physical", NULL, vesa_ph_addr);
+        fb_init(vesa_ph_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline);
 }
 

arch/ppc32/Makefile.inc

@@ -62 +62 @@
 
 ARCH_SOURCES = \
-        arch/$(ARCH)/src/console.c \
         arch/$(ARCH)/src/context.S \
         arch/$(ARCH)/src/debug/panic.s \

arch/ppc32/include/exception.h

@@ -79 +79 @@
 static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
 {
-        /* TODO */
+        istate->pc = retaddr;
 }
 

arch/ppc32/src/ppc32.c

@@ -58 +58 @@
         /* Start decrementer */
         start_decrementer();
-
-        ppc32_console_init();
         cuda_init();
 }
@@ -66 +64 @@
 {
         if (config.cpu_active == 1) {
+                fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);    
+        
                 /* Merge all zones to 1 big zone */
                 zone_merge_all();

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);
+}