Changeset 20eb5e4d in mainline

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.

Files:

• kernel/arch/sparc64/src/drivers/scr.c (modified) (3 diffs)
• kernel/genarch/include/fb/visuals.h (modified) (1 diff)
• kernel/genarch/src/fb/fb.c (modified) (4 diffs)
• uspace/srv/fb/fb.c (modified) (5 diffs)

kernel/arch/sparc64/src/drivers/scr.c

@@ -79 +79 @@
         
         uintptr_t fb_addr;
+        unsigned int fb_offset = 0;
         uint32_t fb_width = 0;
         uint32_t fb_height = 0;
@@ -168 +169 @@
                 }
 
+                fb_offset = 4 * 0x2000;
+
                 switch (fb_depth) {
                 case 8:
                         fb_scanline = fb_linebytes * (fb_depth >> 3);
-                        visual = VISUAL_SB1500_PALETTE;
+                        visual = VISUAL_INDIRECT_8;
                         break;
                 case 16:
@@ -226 +229 @@
         fb_properties_t props = {
                 .addr = fb_addr,
-                .offset = 0,
+                .offset = fb_offset,
                 .x = fb_width,
                 .y = fb_height,

kernel/genarch/include/fb/visuals.h

@@ -45 +45 @@
 
 #define VISUAL_BGR_0_8_8_8      6
-#define VISUAL_SB1500_PALETTE   7
 
 #endif

kernel/genarch/src/fb/fb.c

@@ -190 +190 @@
         *((uint8_t *) dst) = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 |
             BLUE(rgb, 3);
-}
-
-static void sb1500rgb_byte8(void *dst, int rgb)
-{
-        if (RED(rgb, 1) && GREEN(rgb, 1) && BLUE(rgb, 1))
-                *((uint8_t *) dst) = 255;
-        else if (RED(rgb, 1) && GREEN(rgb, 1))
-                *((uint8_t *) dst) = 150;
-        else if (GREEN(rgb, 1) && BLUE(rgb, 1))
-                *((uint8_t *) dst) = 47;
-        else if (RED(rgb, 1) && BLUE(rgb, 1))
-                *((uint8_t *) dst) = 48;
-        else if (RED(rgb, 1))
-                *((uint8_t *) dst) = 32;
-        else if (GREEN(rgb, 1))
-                *((uint8_t *) dst) = 47;
-        else if (BLUE(rgb, 1))
-                *((uint8_t *) dst) = 2;
-        else 
-                *((uint8_t *) dst) = 1;
 }
 
@@ -467 +447 @@
                 pixelbytes = 1;
                 break;
-        case VISUAL_SB1500_PALETTE:
-                rgb2scr = sb1500rgb_byte8;
-                scr2rgb = byte8_rgb;
-                pixelbytes = 1;
-                break;
         case VISUAL_RGB_5_5_5:
                 rgb2scr = rgb_byte555;
@@ -506 +481 @@
         }
         
-        unsigned int fbsize = props->scan * props->y + props->offset;
+        unsigned int fbsize = props->scan * props->y;
         
         /* Map the framebuffer */
-        fbaddress = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
+        fbaddress = (uint8_t *) hw_map((uintptr_t) props->addr + props->offset,
+                fbsize);
         fbaddress += props->offset;
         
@@ -532 +508 @@
         sysinfo_set_item_val("fb.visual", NULL, props->visual);
         sysinfo_set_item_val("fb.address.physical", NULL, props->addr);
+        sysinfo_set_item_val("fb.offset", NULL, props->offset);
         sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
 

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;