From patchwork Fri Oct 19 11:49:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 986699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T8irbCKK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42c46D0Gr1z9sDJ for ; Fri, 19 Oct 2018 22:52:36 +1100 (AEDT) Received: from localhost ([::1]:49212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDTKT-0007h4-LS for incoming@patchwork.ozlabs.org; Fri, 19 Oct 2018 07:52:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDTHx-0006E5-Cp for qemu-devel@nongnu.org; Fri, 19 Oct 2018 07:49:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDTHq-0001TP-8k for qemu-devel@nongnu.org; Fri, 19 Oct 2018 07:49:55 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:39631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDTHp-0001PL-Ln for qemu-devel@nongnu.org; Fri, 19 Oct 2018 07:49:49 -0400 Received: by mail-wm1-x32b.google.com with SMTP id y144-v6so3378187wmd.4 for ; Fri, 19 Oct 2018 04:49:48 -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=AoAMj/XR9lgByByOjLSy7QgLzvITaK2PA5tXT/AveUk=; b=T8irbCKKETVa0FtreKdZrWGlIeFftAhGn6xC4L2Cwpev6zr+LluglsQjYJdituLSPT 65cdCmWq8qGJjNTUMP4nfsRw7wsVBOaD71EEAA3tnUxJLJXlQXGxla9P+9Dl3pE+WnEu CA0qKxhW98/8NCTOnwTs0WEWIOdGMqkADvl1xSgHOnZvoKw2JU46cmvbfs3MZKo3AEnX 2FpayTQQKW9LqHZpGWmtHaRo8n1nwzQ90boUhaxQwvj2U2zapmHvS9iLlVgzaFJ/nSrH o539MLNAPgtsBFV9+54rpN/NionFrwi4J05wB3TfORNN0qYpGvRVI4p7581ux3I/11IC flvQ== 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=AoAMj/XR9lgByByOjLSy7QgLzvITaK2PA5tXT/AveUk=; b=AUWBzxfLRVgmxPCDnW/6v3gpDvYO2SXpPYFSz7acz5Z+WC/Vv6idVmoKQriRFoRyeF zjlWtqF2Ab/rj5cB4B7ePW/hw5eAc+VbeCSAuoXuyGSw1D4q5TD5sXfjMlsIVv8uZBQL 8cXY2DFuMK3TDKuMsZxXPU3WV4gCyvRe5JCmdVjG0v+bUzx3mJFO+5Yz9bXT+bLoVA7T KJHq5+HpWwATdYEoSLupqYSF/MS/PzNzOwpZJuiNqqXSd2UBzXlVPS/8Kv8mnxhK9OAC yrToPLIiX779HTdlRe2kWcMU58j63vMeszraVobBUoIHBrtKSn18JPAJWvodTjK2Zlw9 m5ug== X-Gm-Message-State: ABuFfoigrzDImXe9tgl0Gr/exvTJAdArvlhGrw+sy+5DO4EUGmRhTwUE t8P7HFpf2CLgttUAoslaiQxOAr3R X-Google-Smtp-Source: ACcGV630BtEtanXM9J9PeMg5u7MC8eKb9KOSIEwgsvKZA19e06jb8zPE+6BbK9HfJ57E39HxKokubQ== X-Received: by 2002:a1c:710:: with SMTP id 16-v6mr4622199wmh.22.1539949787513; Fri, 19 Oct 2018 04:49:47 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-231-174.clienti.tiscali.it. [78.12.231.174]) by smtp.gmail.com with ESMTPSA id s1-v6sm17933439wrw.35.2018.10.19.04.49.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Oct 2018 04:49:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2018 13:49:38 +0200 Message-Id: <1539949778-13129-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539949778-13129-1-git-send-email-pbonzini@redhat.com> References: <1539949778-13129-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:4864:20::32b Subject: [Qemu-devel] [PULL 01/47] es1370: more fixes for ADC_FRAMEADR and ADC_FRAMECNT 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" They are not consecutive with DAC1_FRAME* and DAC2_FRAME*; Coverity still complains about es1370_read, while es1370_write was fixed in commit cf9270e5220671f49cc238deaf6136669cc07ae1. Fixes: 154c1d1f960c5147a3f8ef00907504112f271cd8 Signed-off-by: Paolo Bonzini --- hw/audio/es1370.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 4f980a5..97789a0 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -585,10 +585,13 @@ static uint64_t es1370_read(void *opaque, hwaddr addr, unsigned size) #endif break; + case ES1370_REG_ADC_FRAMECNT: + d += 2; + goto framecnt; case ES1370_REG_DAC1_FRAMECNT: case ES1370_REG_DAC2_FRAMECNT: - case ES1370_REG_ADC_FRAMECNT: d += (addr - ES1370_REG_DAC1_FRAMECNT) >> 3; + framecnt: val = d->frame_cnt; #ifdef DEBUG_ES1370 { @@ -602,10 +605,13 @@ static uint64_t es1370_read(void *opaque, hwaddr addr, unsigned size) #endif break; + case ES1370_REG_ADC_FRAMEADR: + d += 2; + goto frameadr; case ES1370_REG_DAC1_FRAMEADR: case ES1370_REG_DAC2_FRAMEADR: - case ES1370_REG_ADC_FRAMEADR: d += (addr - ES1370_REG_DAC1_FRAMEADR) >> 3; + frameadr: val = d->frame_addr; break;