From nobody Wed Nov 5 14:25:39 2025 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.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534871150386425.9904684784543; Tue, 21 Aug 2018 10:05:50 -0700 (PDT) Received: from localhost ([::1]:54948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA6H-0003xl-6F for importer@patchew.org; Tue, 21 Aug 2018 13:05:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA3z-0001CQ-JR for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA3o-0005gs-JU for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:21 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:51603) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA3n-0005PF-H1 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:15 -0400 Received: by mail-wm0-x243.google.com with SMTP id y2-v6so3642512wma.1 for ; Tue, 21 Aug 2018 10:03:07 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Glxe9Yp7P9y8GjB52CI8XZtr7/eFOb4UZdmOC2+vFbQ=; b=iaYyz+wUbqezLt1XusPoNAHqQXPIKAl44FmSAVtAG1IlLJkAFM7j9Pqd+0/sIcxXvj e8G6MmHhafBDANQbW6GByC9YMkGq7btMPUEBtWvIGCdFcky9/0XemOiyyFVzfAtMkzn7 fFWF8IsWL/ScPrgWy0XNHzwUiPN7Re9E3/+wZahoYyVB4cLE8xvkmYI+2FV18/rCaSpf gTiBFdbq3aUdFXTF7g53dgNDeZmFQ1koLPhRgjHNq8j4Ud6T9sNupYmKanxGNMxfNQdM +kirHrL/SgwX7ITuXQ4gmS7ZO+dzUooC0iFd8JK7Gz9OTBD9qpyOLta2d0kzjDJhimph QJXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Glxe9Yp7P9y8GjB52CI8XZtr7/eFOb4UZdmOC2+vFbQ=; b=YTDo8PChe+y5pJPVgYkLamWbC8UwMrb9/ABgcKPzgGj86XjiOEX+tsPDirTSfHUhwI 1xdyTJGOwBvU3APfumhAbSUV5yyxGEccPBTFvWzef+F0nIbR2usGJE5AGmM7S1xFNxcE wUTQ6fJq1QS2dUDHH+Iu+U52J1KatT7JSe0HrH8Jfs9AdhhiYXe72phloheqVpJzFRNC TJib4oY9+sbLNgfCc48zWBUbdmpZUOmAI0uKA3FR05aCX836k1k6fUqH1f8NPkZiXycF VmN5Cy76YpQ/w9TtjA4n2bdrHConNZvBbOjweAEO9sBLBwtj2R+gfyWPOQNm4JcfIiWc bJuw== X-Gm-Message-State: APzg51BhW2LoC3gw9SEAG1mBhKIdmcJ9WUUz0AX9yLqE64+BPUUaW09V rcZfd0Xm+iWTUm2iFUlkf4JDjAsU X-Google-Smtp-Source: ANB0VdYnlXnrIRSpaEUYFPJkAmNDP4iTiiJEwCzY6H/giHRi+/lYMixizwMpJtn/1W1bNuuTklGkMQ== X-Received: by 2002:a1c:8893:: with SMTP id k141-v6mr162484wmd.36.1534870986651; Tue, 21 Aug 2018 10:03:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:01:35 +0200 Message-Id: <1534870966-9287-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 03/74] es1370: simplify MemoryRegionOps 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the automatic subregister extraction from the memory API, and avoid that Coverity complains about missing fallthrough comments. Signed-off-by: Paolo Bonzini --- hw/audio/es1370.c | 235 ++++++--------------------------------------------= ---- 1 file changed, 25 insertions(+), 210 deletions(-) diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 59cf252..dd75c9e 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -474,82 +474,7 @@ static inline uint32_t es1370_fixup (ES1370State *s, u= int32_t addr) return addr; } =20 -static void es1370_writeb(void *opaque, uint32_t addr, uint32_t val) -{ - ES1370State *s =3D opaque; - uint32_t shift, mask; - - addr =3D es1370_fixup (s, addr); - - switch (addr) { - case ES1370_REG_CONTROL: - case ES1370_REG_CONTROL + 1: - case ES1370_REG_CONTROL + 2: - case ES1370_REG_CONTROL + 3: - shift =3D (addr - ES1370_REG_CONTROL) << 3; - mask =3D 0xff << shift; - val =3D (s->ctl & ~mask) | ((val & 0xff) << shift); - es1370_update_voices (s, val, s->sctl); - print_ctl (val); - break; - case ES1370_REG_MEMPAGE: - s->mempage =3D val; - break; - case ES1370_REG_SERIAL_CONTROL: - case ES1370_REG_SERIAL_CONTROL + 1: - case ES1370_REG_SERIAL_CONTROL + 2: - case ES1370_REG_SERIAL_CONTROL + 3: - shift =3D (addr - ES1370_REG_SERIAL_CONTROL) << 3; - mask =3D 0xff << shift; - val =3D (s->sctl & ~mask) | ((val & 0xff) << shift); - es1370_maybe_lower_irq (s, val); - es1370_update_voices (s, s->ctl, val); - print_sctl (val); - break; - default: - lwarn ("writeb %#x <- %#x\n", addr, val); - break; - } -} - -static void es1370_writew(void *opaque, uint32_t addr, uint32_t val) -{ - ES1370State *s =3D opaque; - addr =3D es1370_fixup (s, addr); - uint32_t shift, mask; - struct chan *d =3D &s->chan[0]; - - switch (addr) { - case ES1370_REG_CODEC: - dolog ("ignored codec write address %#x, data %#x\n", - (val >> 8) & 0xff, val & 0xff); - s->codec =3D val; - break; - - case ES1370_REG_CONTROL: - case ES1370_REG_CONTROL + 2: - shift =3D (addr !=3D ES1370_REG_CONTROL) << 4; - mask =3D 0xffff << shift; - val =3D (s->ctl & ~mask) | ((val & 0xffff) << shift); - es1370_update_voices (s, val, s->sctl); - print_ctl (val); - break; - - case ES1370_REG_ADC_SCOUNT: - d++; - case ES1370_REG_DAC2_SCOUNT: - d++; - case ES1370_REG_DAC1_SCOUNT: - d->scount =3D (d->scount & ~0xffff) | (val & 0xffff); - break; - - default: - lwarn ("writew %#x <- %#x\n", addr, val); - break; - } -} - -static void es1370_writel(void *opaque, uint32_t addr, uint32_t val) +static void es1370_write(void *opaque, hwaddr addr, uint64_t val, unsigned= size) { ES1370State *s =3D opaque; struct chan *d =3D &s->chan[0]; @@ -572,21 +497,19 @@ static void es1370_writel(void *opaque, uint32_t addr= , uint32_t val) print_sctl (val); break; =20 - case ES1370_REG_ADC_SCOUNT: - d++; - case ES1370_REG_DAC2_SCOUNT: - d++; case ES1370_REG_DAC1_SCOUNT: + case ES1370_REG_DAC2_SCOUNT: + case ES1370_REG_ADC_SCOUNT: + d +=3D (addr - ES1370_REG_DAC1_SCOUNT) >> 2; d->scount =3D (val & 0xffff) | (d->scount & ~0xffff); ldebug ("chan %td CURR_SAMP_CT %d, SAMP_CT %d\n", d - &s->chan[0], val >> 16, (val & 0xffff)); break; =20 - case ES1370_REG_ADC_FRAMEADR: - d++; - case ES1370_REG_DAC2_FRAMEADR: - d++; case ES1370_REG_DAC1_FRAMEADR: + case ES1370_REG_DAC2_FRAMEADR: + case ES1370_REG_ADC_FRAMEADR: + d +=3D (addr - ES1370_REG_DAC1_FRAMEADR) >> 3; d->frame_addr =3D val; ldebug ("chan %td frame address %#x\n", d - &s->chan[0], val); break; @@ -598,11 +521,10 @@ static void es1370_writel(void *opaque, uint32_t addr= , uint32_t val) lwarn ("writing to phantom frame address %#x\n", val); break; =20 - case ES1370_REG_ADC_FRAMECNT: - d++; - case ES1370_REG_DAC2_FRAMECNT: - d++; case ES1370_REG_DAC1_FRAMECNT: + case ES1370_REG_DAC2_FRAMECNT: + case ES1370_REG_ADC_FRAMECNT: + d +=3D (addr - ES1370_REG_DAC1_FRAMECNT) >> 3; d->frame_cnt =3D val; d->leftover =3D 0; ldebug ("chan %td frame count %d, buffer size %d\n", @@ -615,84 +537,7 @@ static void es1370_writel(void *opaque, uint32_t addr,= uint32_t val) } } =20 -static uint32_t es1370_readb(void *opaque, uint32_t addr) -{ - ES1370State *s =3D opaque; - uint32_t val; - - addr =3D es1370_fixup (s, addr); - - switch (addr) { - case 0x1b: /* Legacy */ - lwarn ("Attempt to read from legacy register\n"); - val =3D 5; - break; - case ES1370_REG_MEMPAGE: - val =3D s->mempage; - break; - case ES1370_REG_CONTROL + 0: - case ES1370_REG_CONTROL + 1: - case ES1370_REG_CONTROL + 2: - case ES1370_REG_CONTROL + 3: - val =3D s->ctl >> ((addr - ES1370_REG_CONTROL) << 3); - break; - case ES1370_REG_STATUS + 0: - case ES1370_REG_STATUS + 1: - case ES1370_REG_STATUS + 2: - case ES1370_REG_STATUS + 3: - val =3D s->status >> ((addr - ES1370_REG_STATUS) << 3); - break; - default: - val =3D ~0; - lwarn ("readb %#x -> %#x\n", addr, val); - break; - } - return val; -} - -static uint32_t es1370_readw(void *opaque, uint32_t addr) -{ - ES1370State *s =3D opaque; - struct chan *d =3D &s->chan[0]; - uint32_t val; - - addr =3D es1370_fixup (s, addr); - - switch (addr) { - case ES1370_REG_ADC_SCOUNT + 2: - d++; - case ES1370_REG_DAC2_SCOUNT + 2: - d++; - case ES1370_REG_DAC1_SCOUNT + 2: - val =3D d->scount >> 16; - break; - - case ES1370_REG_ADC_FRAMECNT: - d++; - case ES1370_REG_DAC2_FRAMECNT: - d++; - case ES1370_REG_DAC1_FRAMECNT: - val =3D d->frame_cnt & 0xffff; - break; - - case ES1370_REG_ADC_FRAMECNT + 2: - d++; - case ES1370_REG_DAC2_FRAMECNT + 2: - d++; - case ES1370_REG_DAC1_FRAMECNT + 2: - val =3D d->frame_cnt >> 16; - break; - - default: - val =3D ~0; - lwarn ("readw %#x -> %#x\n", addr, val); - break; - } - - return val; -} - -static uint32_t es1370_readl(void *opaque, uint32_t addr) +static uint64_t es1370_read(void *opaque, hwaddr addr, unsigned size) { ES1370State *s =3D opaque; uint32_t val; @@ -717,11 +562,10 @@ static uint32_t es1370_readl(void *opaque, uint32_t a= ddr) val =3D s->sctl; break; =20 - case ES1370_REG_ADC_SCOUNT: - d++; - case ES1370_REG_DAC2_SCOUNT: - d++; case ES1370_REG_DAC1_SCOUNT: + case ES1370_REG_DAC2_SCOUNT: + case ES1370_REG_ADC_SCOUNT: + d +=3D (addr - ES1370_REG_DAC1_SCOUNT) >> 2; val =3D d->scount; #ifdef DEBUG_ES1370 { @@ -735,11 +579,10 @@ static uint32_t es1370_readl(void *opaque, uint32_t a= ddr) #endif break; =20 - case ES1370_REG_ADC_FRAMECNT: - d++; - case ES1370_REG_DAC2_FRAMECNT: - d++; case ES1370_REG_DAC1_FRAMECNT: + case ES1370_REG_DAC2_FRAMECNT: + case ES1370_REG_ADC_FRAMECNT: + d +=3D (addr - ES1370_REG_DAC1_FRAMECNT) >> 3; val =3D d->frame_cnt; #ifdef DEBUG_ES1370 { @@ -753,11 +596,10 @@ static uint32_t es1370_readl(void *opaque, uint32_t a= ddr) #endif break; =20 - case ES1370_REG_ADC_FRAMEADR: - d++; - case ES1370_REG_DAC2_FRAMEADR: - d++; case ES1370_REG_DAC1_FRAMEADR: + case ES1370_REG_DAC2_FRAMEADR: + case ES1370_REG_ADC_FRAMEADR: + d +=3D (addr - ES1370_REG_DAC1_FRAMEADR) >> 3; val =3D d->frame_addr; break; =20 @@ -908,44 +750,17 @@ static void es1370_adc_callback (void *opaque, int av= ail) es1370_run_channel (s, ADC_CHANNEL, avail); } =20 -static uint64_t es1370_read(void *opaque, hwaddr addr, - unsigned size) -{ - switch (size) { - case 1: - return es1370_readb(opaque, addr); - case 2: - return es1370_readw(opaque, addr); - case 4: - return es1370_readl(opaque, addr); - default: - return -1; - } -} - -static void es1370_write(void *opaque, hwaddr addr, uint64_t val, - unsigned size) -{ - switch (size) { - case 1: - es1370_writeb(opaque, addr, val); - break; - case 2: - es1370_writew(opaque, addr, val); - break; - case 4: - es1370_writel(opaque, addr, val); - break; - } -} - static const MemoryRegionOps es1370_io_ops =3D { .read =3D es1370_read, .write =3D es1370_write, - .impl =3D { + .valid =3D { .min_access_size =3D 1, .max_access_size =3D 4, }, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 --=20 1.8.3.1