[Qemu-devel] [6964] Use pixel_ops.h

[Qemu-devel] [6964] Use pixel_ops.h

[Paul Brook]

Revision: 6964
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6964
Author:   pbrook
Date:     2009-04-01 11:43:02 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
Use pixel_ops.h

Signed-off-by: Paul Brook <paul@codesourcery.com>

Modified Paths:
--------------
    trunk/hw/pl110.c

Modified: trunk/hw/pl110.c
===================================================================
--- trunk/hw/pl110.c	2009-03-31 17:18:10 UTC (rev 6963)
+++ trunk/hw/pl110.c	2009-04-01 11:43:02 UTC (rev 6964)
@@ -59,31 +59,8 @@
 #define pl110_versatile_id pl110_id
 #endif
 
-static inline uint32_t rgb_to_pixel8(unsigned int r, unsigned int g, unsigned b)
-{
-    return ((r >> 5) << 5) | ((g >> 5) << 2) | (b >> 6);
-}
+#include "pixel_ops.h"
 
-static inline uint32_t rgb_to_pixel15(unsigned int r, unsigned int g, unsigned b)
-{
-    return ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3);
-}
-
-static inline uint32_t rgb_to_pixel16(unsigned int r, unsigned int g, unsigned b)
-{
-    return ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
-}
-
-static inline uint32_t rgb_to_pixel24(unsigned int r, unsigned int g, unsigned b)
-{
-    return (r << 16) | (g << 8) | b;
-}
-
-static inline uint32_t rgb_to_pixel32(unsigned int r, unsigned int g, unsigned b)
-{
-    return (r << 16) | (g << 8) | b;
-}
-
 typedef void (*drawfn)(uint32_t *, uint8_t *, const uint8_t *, int);
 
 #define BITS 8