Changeset ccb0cbc in mainline

Timestamp:

2006-11-22T13:45:05Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

eb353b3

Parents:

2bc137c2

Message:

Add BGR 0888 visual for Ultra 60

Files:

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

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

@@ -144 +144 @@
         case SCR_FFB:   
                 fb_scanline = 8192;
-                visual = VISUAL_RGB_0_8_8_8;
+                visual = VISUAL_BGR_0_8_8_8;
 
                 ofw_upa_reg_t *reg = &((ofw_upa_reg_t *) prop->value)[FFB_REG_24BPP];

kernel/genarch/include/fb/visuals.h

@@ -37 +37 @@
 
 #define VISUAL_INDIRECT_8       0
+
 #define VISUAL_RGB_5_5_5        1
 #define VISUAL_RGB_5_6_5        2
@@ -43 +44 @@
 #define VISUAL_RGB_0_8_8_8      5
 
+#define VISUAL_BGR_0_8_8_8      6
+
 #endif
 

kernel/genarch/src/fb/fb.c

@@ -106 +106 @@
 }
 
+static void bgr_byte0888(void *dst, int rgb)
+{
+        *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 | RED(rgb, 8);
+}
+
+static int byte0888_bgr(void *src)
+{
+        int color = *(uint32_t *)(src);
+        return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | ((color >> 16) & 0xff);
+}
+
 static void rgb_byte888(void *dst, int rgb)
 {
@@ -403 +414 @@
                 pixelbytes = 4;
                 break;
+        case VISUAL_BGR_0_8_8_8:
+                rgb2scr = bgr_byte0888;
+                scr2rgb = byte0888_bgr;
+                pixelbytes = 4;
+                break;
         default:
                 panic("Unsupported visual.\n");

uspace/fb/fb.c

@@ -160 +160 @@
 }
 
+static void bgr_byte0888(void *dst, int rgb)
+{
+        *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 | RED(rgb, 8);
+}
+
+static int byte0888_bgr(void *src)
+{
+        int color = *(uint32_t *)(src);
+        return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | ((color >> 16) & 0xff);
+}
+
 static void rgb_byte888(void *dst, int rgb)
 {
@@ -508 +519 @@
                 screen.rgb2scr = rgb_byte0888;
                 screen.scr2rgb = byte0888_rgb;
+                screen.pixelbytes = 4;
+                break;
+        case VISUAL_BGR_0_8_8_8:
+                screen.rgb2scr = bgr_byte0888;
+                screen.scr2rgb = byte0888_bgr;
                 screen.pixelbytes = 4;
                 break;