Changeset 925fdd7 in mainline

Timestamp:

2008-12-10T21:41:22Z (16 years ago)

Author:

Pavel Rimsky <rimskyp@…>

Branches:

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

Children:

bb74e8ab

Parents:

8af9950

Message:

Fixed the bug when on SunBlade1500 we wrote to an address outside the framebuffer memory. A nasty hack to the 8-bit palette so that on sb1500 we do not have to turn black into white and white into black.

Files:

• boot/genarch/ofw.c (modified) (2 diffs)
• kernel/genarch/src/fb/fb.c (modified) (5 diffs)
• uspace/srv/fb/fb.c (modified) (3 diffs)

boot/genarch/ofw.c

@@ -299 +299 @@
         unsigned int sc = ofw_get_size_cells(ofw_memory) /
             (sizeof(uintptr_t) / sizeof(uint32_t));
-        printf("address cells: %d, size cells: %d. ", ac, sc);
 
         uintptr_t buf[((ac + sc) * MEMMAP_MAX_RECORDS)];
@@ -406 +405 @@
                 return false;
 
-        /* setup the palette so that the 3:2:3 scheme is usable */
+        /* setup the palette so that the (inverted) 3:2:3 scheme is usable */
         unsigned int i;
         for (i = 0; i < 256; i++)
                 if (ofw_call("call-method", 6, 1, NULL, "color!", screen,
-                        i,
+                        255 - i,
                         i << 5,
                         (i >> 3) << 6,

kernel/genarch/src/fb/fb.c

@@ -178 +178 @@
 }
 
-/** Put pixel - 8-bit depth (color palette/3:2:3)
+/** Put pixel - 8-bit depth (color palette/3:2:3, inverted)
  *
  * Even though we try 3:2:3 color scheme here, an 8-bit framebuffer
@@ -185 +185 @@
  * palette. This could be fixed by supporting custom palette
  * and setting it to simulate the 8-bit truecolor.
+ *
+ * Currently we set the palette on the sparc64 port.
+ *
+ * Note that the byte is being inverted by this function. The reason is
+ * that we would like to use a color palette where the white color code
+ * is 0 and the black color code is 255, as some machines (SunBlade 1500) 
+ * use these codes for black and white and prevent to set codes
+ * 0 and 255 to other colors.
  */
 static void rgb_byte8(void *dst, int rgb)
 {
-        *((uint8_t *) dst) = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 |
-            BLUE(rgb, 3);
+        *((uint8_t *) dst) = 255 - (RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 |
+            BLUE(rgb, 3));
 }
 
@@ -198 +206 @@
 static int byte8_rgb(void *src)
 {
-        int color = *(uint8_t *)src;
+        int color = 255 - (*(uint8_t *)src);
         return (((color >> 5) & 0x7) << (16 + 5)) |
             (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
@@ -484 +492 @@
         
         /* Map the framebuffer */
-        fbaddress = (uint8_t *) hw_map((uintptr_t) props->addr + props->offset,
-                fbsize);
+        fbaddress = (uint8_t *) hw_map((uintptr_t) props->addr,
+                fbsize + props->offset);
         fbaddress += props->offset;
         
@@ -495 +503 @@
         columns = props->x / COL_WIDTH;
 
-        fb_parea.pbase = (uintptr_t) props->addr;
+        fb_parea.pbase = (uintptr_t) props->addr + props->offset;
         fb_parea.vbase = (uintptr_t) fbaddress;
         fb_parea.frames = SIZE2FRAMES(fbsize);

uspace/srv/fb/fb.c

@@ -243 +243 @@
 rgb_byte8(void *dst, int rgb)
 {
-        *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
+        *(uint8_t *)dst = 255 - (RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 |
+                BLUE(rgb, 3));
 }
 
@@ -250 +251 @@
 byte8_rgb(void *src)
 {
-        int color = *(uint8_t *)src;
+        int color = 255 - (*(uint8_t *)src);
         return (((color >> 5) & 0x7) << (16 + 5)) |
             (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
@@ -566 +567 @@
         }
 
-        screen.fbaddress = (unsigned char *) (((uintptr_t) addr) + offset);
+        screen.fbaddress = (unsigned char *) (((uintptr_t) addr));
         screen.xres = xres;
         screen.yres = yres;