From nobody Sun Feb 8 23:19:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492789236123345.2552280971611; Fri, 21 Apr 2017 08:40:36 -0700 (PDT) Received: from localhost ([::1]:60228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1afi-0002va-Lq for importer@patchew.org; Fri, 21 Apr 2017 11:40:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1aWC-0001S9-W4 for qemu-devel@nongnu.org; Fri, 21 Apr 2017 11:30:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1aW8-0007p3-Nn for qemu-devel@nongnu.org; Fri, 21 Apr 2017 11:30:44 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:33796) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1aW8-0007ny-Dx; Fri, 21 Apr 2017 11:30:40 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id A830F745702; Fri, 21 Apr 2017 17:30:38 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 1ED3C7456BC; Fri, 21 Apr 2017 17:30:38 +0200 (CEST) Message-Id: <31205c2df623e7b133ef942ff4f5e95fff800a14.1492787889.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Date: Fri, 21 Apr 2017 17:18:09 +0200 To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:738:2001:2001::2001 Subject: [Qemu-devel] [PATCH v7 02/13] sm501: Use defined constants instead of literal values where available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Magnus Damm , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell Tested-by: Aurelien Jarno --- v3: Fix initial value of misc_control register as Peter Maydell suggested Also use M_BYTE constant from cutils.h hw/display/sm501.c | 29 +++++++++++++++++++---------- hw/display/sm501_template.h | 2 +- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 4f40dee..6b72964 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -446,12 +447,12 @@ =20 /* SM501 local memory size taken from "linux/drivers/mfd/sm501.c" */ static const uint32_t sm501_mem_local_size[] =3D { - [0] =3D 4 * 1024 * 1024, - [1] =3D 8 * 1024 * 1024, - [2] =3D 16 * 1024 * 1024, - [3] =3D 32 * 1024 * 1024, - [4] =3D 64 * 1024 * 1024, - [5] =3D 2 * 1024 * 1024, + [0] =3D 4 * M_BYTE, + [1] =3D 8 * M_BYTE, + [2] =3D 16 * M_BYTE, + [3] =3D 32 * M_BYTE, + [4] =3D 64 * M_BYTE, + [5] =3D 2 * M_BYTE, }; #define get_local_mem_size(s) sm501_mem_local_size[(s)->local_mem_size_ind= ex] =20 @@ -555,7 +556,7 @@ static uint32_t get_local_mem_size_index(uint32_t size) static inline int is_hwc_enabled(SM501State *state, int crt) { uint32_t addr =3D crt ? state->dc_crt_hwc_addr : state->dc_panel_hwc_a= ddr; - return addr & 0x80000000; + return addr & SM501_HWC_EN; } =20 /** @@ -1411,9 +1412,17 @@ void sm501_init(MemoryRegion *address_space_mem, uin= t32_t base, s->local_mem_size_index =3D get_local_mem_size_index(local_mem_bytes); SM501_DPRINTF("local mem size=3D%x. index=3D%d\n", get_local_mem_size(= s), s->local_mem_size_index); - s->system_control =3D 0x00100000; - s->misc_control =3D 0x00001000; /* assumes SH, active=3Dlow */ - s->dc_panel_control =3D 0x00010000; + s->system_control =3D 0x00100000; /* 2D engine FIFO empty */ + /* Bits 17 (SH), 7 (CDR), 6:5 (Test), 2:0 (Bus) are all supposed + * to be determined at reset by GPIO lines which set config bits. + * We hardwire them: + * SH =3D 0 : Hitachi Ready Polarity =3D=3D Active Low + * CDR =3D 0 : do not reset clock divider + * TEST =3D 0 : Normal mode (not testing the silicon) + * BUS =3D 0 : Hitachi SH3/SH4 + */ + s->misc_control =3D SM501_MISC_DAC_POWER; + s->dc_panel_control =3D 0x00010000; /* FIFO level 3 */ s->dc_crt_control =3D 0x00010000; =20 /* allocate local memory */ diff --git a/hw/display/sm501_template.h b/hw/display/sm501_template.h index aeeac5d..16e500b 100644 --- a/hw/display/sm501_template.h +++ b/hw/display/sm501_template.h @@ -108,7 +108,7 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(SM501State= *s, int crt, /* get hardware cursor pattern */ uint32_t cursor_addr =3D get_hwc_address(s, crt); assert(0 <=3D c_y && c_y < SM501_HWC_HEIGHT); - cursor_addr +=3D 64 * c_y / 4; /* 4 pixels per byte */ + cursor_addr +=3D SM501_HWC_WIDTH * c_y / 4; /* 4 pixels per byte */ cursor_addr +=3D s->base; =20 /* get cursor position */ --=20 2.7.4