Changeset 8424198 in mainline for arch/ia32/src/drivers/vesa.c

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

File:

• arch/ia32/src/drivers/vesa.c (modified) (1 diff)

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