From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L5OQ1-0002s8-Fb
	for qemu-devel@nongnu.org; Wed, 26 Nov 2008 12:43:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L5OPz-0002qH-RO
	for qemu-devel@nongnu.org; Wed, 26 Nov 2008 12:43:17 -0500
Received: from [199.232.76.173] (port=41303 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L5OPz-0002q6-Mb
	for qemu-devel@nongnu.org; Wed, 26 Nov 2008 12:43:15 -0500
Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:41210
	helo=SMTP.EU.CITRIX.COM)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <Stefano.Stabellini@eu.citrix.com>)
	id 1L5OPy-0000fr-IJ
	for qemu-devel@nongnu.org; Wed, 26 Nov 2008 12:43:14 -0500
Message-ID: <492D8B9D.1010001@eu.citrix.com>
Date: Wed, 26 Nov 2008 17:47:09 +0000
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH 1 of 7] few more accessors
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

This patch introduces few more DisplayState accessors in hw/sm501.c.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff -r d8ccc2d27955 hw/sm501.c
--- a/hw/sm501.c	Mon Nov 24 20:21:41 2008 +0000
+++ b/hw/sm501.c	Wed Nov 26 16:33:07 2008 +0000
@@ -955,7 +955,7 @@
 
 static inline int get_depth_index(DisplayState *s)
 {
-    switch(s->depth) {
+    switch(ds_get_bits_per_pixel(s)) {
     default:
     case 8:
 	return 0;
@@ -985,7 +985,7 @@
 
     uint8_t  * src = s->local_mem;
     int src_bpp = 0;
-    int dst_bpp = s->ds->depth / 8 + (s->ds->depth % 8 ? 1 : 0);
+    int dst_bpp = ds_get_bytes_per_pixel(s->ds) + (ds_get_bits_per_pixel(s->ds) % 8 ? 1 : 0);
     uint32_t * palette = (uint32_t *)&s->dc_palette[SM501_DC_CRT_PALETTE
 						    - SM501_DC_PANEL_PALETTE];
     int ds_depth_index = get_depth_index(s->ds);
@@ -1039,7 +1039,7 @@
 
 	/* draw line and change status */
 	if (update) {
-	    draw_line(&s->ds->data[y * width * dst_bpp], src, width, palette);
+	    draw_line(&(ds_get_data(s->ds)[y * width * dst_bpp]), src, width, palette);
 	    if (y_start < 0)
 		y_start = y;
 	    if (page0 < page_min)