Changeset 19490ce in mainline

Timestamp:

2009-08-03T21:06:35Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9035c5a

Parents:

dd2cfa7

Message:

Fix 16bpp modes.

Files:

• kernel/arch/ia32/src/drivers/vesa.c (modified) (1 diff)
• kernel/arch/ppc32/src/ppc32.c (modified) (1 diff)
• kernel/arch/sparc64/src/drivers/scr.c (modified) (2 diffs)
• kernel/genarch/include/fb/visuals.h (modified) (1 diff)
• kernel/genarch/src/fb/fb.c (modified) (2 diffs)
• uspace/srv/fb/fb.c (modified) (2 diffs)

kernel/arch/ia32/src/drivers/vesa.c

@@ -86 +86 @@
                     && (vesa_green_mask == 5) && (vesa_green_pos == 5)
                     && (vesa_blue_mask == 5) && (vesa_blue_pos == 0))
-                        visual = VISUAL_BGR_5_5_5;
+                        visual = VISUAL_RGB_5_5_5_LE;
                 else
-                        visual = VISUAL_BGR_5_6_5;
+                        visual = VISUAL_RGB_5_6_5_LE;
                 break;
         case 24:

kernel/arch/ppc32/src/ppc32.c

@@ -93 +93 @@
                                 break;
                         case 16:
-                                visual = VISUAL_BGR_5_5_5;
+                                visual = VISUAL_RGB_5_5_5_BE;
                                 break;
                         case 24:

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

@@ -134 +134 @@
                 case 16:
                         fb_scanline = fb_linebytes * (fb_depth >> 3);
-                        visual = VISUAL_BGR_5_6_5;
+                        visual = VISUAL_RGB_5_6_5_BE;
                         break;
                 case 24:
@@ -178 +178 @@
                 case 16:
                         fb_scanline = fb_linebytes * (fb_depth >> 3);
-                        visual = VISUAL_BGR_5_6_5;
+                        visual = VISUAL_RGB_5_6_5_BE;
                         break;
                 case 24:

kernel/genarch/include/fb/visuals.h

@@ -38 +38 @@
 typedef enum {
         VISUAL_INDIRECT_8,
-        VISUAL_BGR_5_5_5,
-        VISUAL_BGR_5_6_5,
+        VISUAL_RGB_5_5_5_LE,
+        VISUAL_RGB_5_5_5_BE,
+        VISUAL_RGB_5_6_5_LE,
+        VISUAL_RGB_5_6_5_BE,
         VISUAL_BGR_8_8_8,
         VISUAL_BGR_0_8_8_8,

kernel/genarch/src/fb/fb.c

@@ -146 +146 @@
 }
 
-static void bgr_555(void *dst, uint32_t rgb)
-{
-        uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 5) << 5)) & 0xff;
-        uint8_t lo = (GREEN(rgb, 5) >> 3) | (RED(rgb, 5) << 2);
-        *((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo);
-}
-
-static void bgr_565(void *dst, uint32_t rgb)
-{
-        uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 6) << 5)) & 0xff;
-        uint8_t lo = (GREEN(rgb, 6) >> 3) | (RED(rgb, 5) << 3);
-        *((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo);
+static void rgb_555_be(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 10 |
+            GREEN(rgb, 5) << 5 | BLUE(rgb, 5));
+}
+
+static void rgb_555_le(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 10 |
+            GREEN(rgb, 5) << 5 | BLUE(rgb, 5));
+}
+
+static void rgb_565_be(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 11 |
+            GREEN(rgb, 6) << 5 | BLUE(rgb, 5));
+}
+
+static void rgb_565_le(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 11 |
+            GREEN(rgb, 6) << 5 | BLUE(rgb, 5));
 }
 
@@ -455 +465 @@
                 pixelbytes = 1;
                 break;
-        case VISUAL_BGR_5_5_5:
-                rgb_conv = bgr_555;
+        case VISUAL_RGB_5_5_5_LE:
+                rgb_conv = rgb_555_le;
                 pixelbytes = 2;
                 break;
-        case VISUAL_BGR_5_6_5:
-                rgb_conv = bgr_565;
+        case VISUAL_RGB_5_5_5_BE:
+                rgb_conv = rgb_555_be;
+                pixelbytes = 2;
+                break;
+        case VISUAL_RGB_5_6_5_LE:
+                rgb_conv = rgb_565_le;
+                pixelbytes = 2;
+                break;
+        case VISUAL_RGB_5_6_5_BE:
+                rgb_conv = rgb_565_be;
                 pixelbytes = 2;
                 break;

uspace/srv/fb/fb.c

@@ -290 +290 @@
 }
 
-static void bgr_555(void *dst, uint32_t rgb)
-{
-        uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 5) << 5)) & 0xff;
-        uint8_t lo = (GREEN(rgb, 5) >> 3) | (RED(rgb, 5) << 2);
-        *((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo);
+static void rgb_555_be(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 10 |
+            GREEN(rgb, 5) << 5 | BLUE(rgb, 5));
+}
+
+static void rgb_555_le(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 10 |
+            GREEN(rgb, 5) << 5 | BLUE(rgb, 5));
+}
+
+static void rgb_565_be(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 11 |
+            GREEN(rgb, 6) << 5 | BLUE(rgb, 5));
+}
+
+static void rgb_565_le(void *dst, uint32_t rgb)
+{
+        *((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 11 |
+            GREEN(rgb, 6) << 5 | BLUE(rgb, 5));
 }
 
 static void mask_555(void *dst, bool mask)
 {
-        bgr_555(dst, mask ? 0xffffff : 0);
-}
-
-static void bgr_565(void *dst, uint32_t rgb)
-{
-        uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 6) << 5)) & 0xff;
-        uint8_t lo = (GREEN(rgb, 6) >> 3) | (RED(rgb, 5) << 3);
-        *((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo);
+        rgb_555_be(dst, mask ? 0xffffff : 0);
 }
 
 static void mask_565(void *dst, bool mask)
 {
-        bgr_565(dst, mask ? 0xffffff : 0);
+        rgb_565_be(dst, mask ? 0xffffff : 0);
 }
 
@@ -622 +632 @@
                 screen.pixelbytes = 1;
                 break;
-        case VISUAL_BGR_5_5_5:
-                screen.rgb_conv = bgr_555;
+        case VISUAL_RGB_5_5_5_LE:
+                screen.rgb_conv = rgb_555_le;
                 screen.mask_conv = mask_555;
                 screen.pixelbytes = 2;
                 break;
-        case VISUAL_BGR_5_6_5:
-                screen.rgb_conv = bgr_565;
+        case VISUAL_RGB_5_5_5_BE:
+                screen.rgb_conv = rgb_555_be;
+                screen.mask_conv = mask_555;
+                screen.pixelbytes = 2;
+                break;
+        case VISUAL_RGB_5_6_5_LE:
+                screen.rgb_conv = rgb_565_le;
+                screen.mask_conv = mask_565;
+                screen.pixelbytes = 2;
+                break;
+        case VISUAL_RGB_5_6_5_BE:
+                screen.rgb_conv = rgb_565_be;
                 screen.mask_conv = mask_565;
                 screen.pixelbytes = 2;