Changeset 20eb5e4d in mainline for uspace

Timestamp:

2008-12-07T00:41:59Z (16 years ago)

Author:

Pavel Rimsky <rimskyp@…>

Branches:

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

Children:

5d9430d7

Parents:

2b1f860

Message:

Added forgotten stuff related to framebuffers with offsets. Got rid of VISUAL_SB1500_PALETTE.

File:

• uspace/srv/fb/fb.c (modified) (5 diffs)

uspace/srv/fb/fb.c

@@ -522 +522 @@
  */
 static bool
-screen_init(void *addr, unsigned int xres, unsigned int yres,
-        unsigned int scan, unsigned int visual, bool invert_colors)
+screen_init(void *addr, unsigned int offset, unsigned int xres,
+        unsigned int yres, unsigned int scan, unsigned int visual,
+        bool invert_colors)
 {
         switch (visual) {
@@ -565 +566 @@
         }
 
-        screen.fbaddress = (unsigned char *) addr;
+        screen.fbaddress = (unsigned char *) (((uintptr_t) addr) + offset);
         screen.xres = xres;
         screen.yres = yres;
@@ -1354 +1355 @@
         unsigned int fb_scanline;
         unsigned int fb_visual;
+        unsigned int fb_offset;
         bool fb_invert_colors;
         void *fb_addr;
@@ -1361 +1363 @@
 
         fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
+        fb_offset = sysinfo_value("fb.offset");
         fb_width = sysinfo_value("fb.width");
         fb_height = sysinfo_value("fb.height");
@@ -1370 +1373 @@
         fb_addr = as_get_mappable_page(asz);
         
-        physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >>
+        physmem_map(fb_ph_addr + fb_offset, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >>
             PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
 
-        if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual,
+        if (screen_init(fb_addr, fb_offset, fb_width, fb_height, fb_scanline, fb_visual,
             fb_invert_colors))
                 return 0;