Changeset 95b9963 in mainline

Timestamp:

2009-02-12T20:04:19Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

af75db9

Parents:

0f81ceb7

Message:

add BGR 888 visual, remove FB_INVERT_ENDIAN

Location:

kernel/genarch

Files:

• include/fb/fb.h (modified) (1 diff)
• include/fb/visuals.h (modified) (1 diff)
• src/fb/fb.c (modified) (2 diffs)

kernel/genarch/include/fb/fb.h

@@ -50 +50 @@
          * relative to "addr".
          */
-        unsigned int offset;    
+        unsigned int offset;
 
         /** Screen width in pixels. */

kernel/genarch/include/fb/visuals.h

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

kernel/genarch/src/fb/fb.c

@@ -121 +121 @@
 
 
+/** RGB 8:8:8 conversion
+ *
+ */
+static void rgb_888(void *dst, uint32_t rgb)
+{
+        ((uint8_t *) dst)[0] = BLUE(rgb, 8);
+        ((uint8_t *) dst)[1] = GREEN(rgb, 8);
+        ((uint8_t *) dst)[2] = RED(rgb, 8);
+}
+
+
 /** BGR 8:8:8 conversion
  *
  */
-static void rgb_888(void *dst, uint32_t rgb)
-{
-#if defined(FB_INVERT_ENDIAN)
+static void bgr_888(void *dst, uint32_t rgb)
+{
         ((uint8_t *) dst)[0] = RED(rgb, 8);
         ((uint8_t *) dst)[1] = GREEN(rgb, 8);
         ((uint8_t *) dst)[2] = BLUE(rgb, 8);
-#else
-        ((uint8_t *) dst)[0] = BLUE(rgb, 8);
-        ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-        ((uint8_t *) dst)[2] = RED(rgb, 8);
-#endif
 }
 
@@ -450 +455 @@
                 pixelbytes = 3;
                 break;
+        case VISUAL_BGR_8_8_8:
+                rgb_conv = bgr_888;
+                pixelbytes = 3;
+                break;
         case VISUAL_RGB_8_8_8_0:
                 rgb_conv = rgb_888;