From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LoyqY-0006Qb-M2
	for qemu-devel@nongnu.org; Wed, 01 Apr 2009 07:43:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LoyqW-0006QP-7d
	for qemu-devel@nongnu.org; Wed, 01 Apr 2009 07:43:05 -0400
Received: from [199.232.76.173] (port=54295 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LoyqW-0006QM-2s
	for qemu-devel@nongnu.org; Wed, 01 Apr 2009 07:43:04 -0400
Received: from savannah.gnu.org ([199.232.41.3]:40608 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <paul@nowt.org>) id 1LoyqV-0004fU-Qr
	for qemu-devel@nongnu.org; Wed, 01 Apr 2009 07:43:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69) (envelope-from <paul@nowt.org>)
	id 1LoyqV-0002Zl-12
	for qemu-devel@nongnu.org; Wed, 01 Apr 2009 11:43:03 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <pbrook@savannah.gnu.org>) id 1LoyqU-0002ZS-ML
	for qemu-devel@nongnu.org; Wed, 01 Apr 2009 11:43:02 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1LoyqU-0002ZS-ML@cvs.savannah.gnu.org>
Date: Wed, 01 Apr 2009 11:43:02 +0000
Subject: [Qemu-devel] [6964] Use pixel_ops.h
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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