Message ID | 1539894735-14232-2-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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="FOLnxzJz"; 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 42bhCV26Ltz9s8F for <incoming@patchwork.ozlabs.org>; Fri, 19 Oct 2018 07:55:50 +1100 (AEDT) Received: from localhost ([::1]:44628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gDFKd-0001pp-RZ for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2018 16:55:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gDEyF-0007H2-8W for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gDEy8-0006DI-LC for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:35 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:37726) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gDEy5-00063j-Fo for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:31 -0400 Received: by mail-wr1-x432.google.com with SMTP id q1-v6so2207060wrs.4 for <qemu-devel@nongnu.org>; Thu, 18 Oct 2018 13:32:19 -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=X95M23LMKjuiZf2LDeAyYVWbs8JDwp9NRuZihCiZHTU=; b=FOLnxzJzPwZFKDNUC2lBAkt2Xj1P9lvTpzEZGgoHq0p0RUvqwkeT/dwsPjKQ9UO/Q6 svG8oQRXlkEL4JZ8rhGQgjI4ex2/DFfUkuj2AUb11N/dGCWz4O3BNn4PNoEYhoNzAluT YEQaISTc7scIP9dtGfciGrylRvAEVbsnOKkpnUivTyozwFzLwnzMDjRNS6zvmNy3JD2K VPeeU8zVBUnt/E4cXI3cwPJ+WovSRkjLrZf41/lAn8e8iYBZVimQvFF1j1SPWmKho5Uf MHjiaQxjx5eiBxbuQPdGKwIqusUY2hH5TwyPJVUGN93gaBSc/8trp+vQFwVbicIrXW4t PJ7w== 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=X95M23LMKjuiZf2LDeAyYVWbs8JDwp9NRuZihCiZHTU=; b=p+sIcriH57qYE4d+RGL9FtiqbFg9WH0cEtGp/8HLY9Mr6PpGM0w0MnJ7RKlDPoQhE4 2/ExhXXUZpFaUzTHh8PdAd0Wj+vSbwIgEKOqvh5wu69wDmMmOpT9/4+acIEBIv3RYIln oMLgbwNcT0cDks7rps4fOhr9ZxuXX0zR6GQhf/EgOY3W89cCL03TcrO0z+kaq5SNm9Mo 7lIl23EuHfoT4cw6CW7St7Ryl4xexKTYNOG1Z9H0IiKJCNeM5W9mzMxY/AfZrOJA6Fva cx4/J2BbaXHIUonLwGmb7ValC3zLMD/Qwm+6vxBJYtTgbIrKy1U1E2iaId5FgHByr9Vt NGfQ== X-Gm-Message-State: ABuFfogDl7NvTgvY2VHxgW7l0H1dGoIGYrlagesi9DtDx91VSC0gOG7E xJhDiqSWi3z+mTCQEA7gVP26QUOs X-Google-Smtp-Source: ACcGV61yyMofIWqBp+8wUhZ63qYszKaV3C+TuPdgkh8r0yzN6bWFz52FpVFhUEaytz/TI+KuGlDxKQ== X-Received: by 2002:adf:e387:: with SMTP id e7-v6mr30633483wrm.94.1539894738343; Thu, 18 Oct 2018 13:32:18 -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 a12-v6sm14270952wrr.71.2018.10.18.13.32.17 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 13:32:17 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 22:31:28 +0200 Message-Id: <1539894735-14232-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539894735-14232-1-git-send-email-pbonzini@redhat.com> References: <1539894735-14232-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::432 Subject: [Qemu-devel] [PULL 01/48] 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/48] es1370: more fixes for ADC_FRAMEADR and ADC_FRAMECNT
|
expand
|
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 4f980a5..aa5a8d7 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -585,9 +585,12 @@ 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: + framecnt: d += (addr - ES1370_REG_DAC1_FRAMECNT) >> 3; val = d->frame_cnt; #ifdef DEBUG_ES1370 @@ -602,9 +605,12 @@ 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: + frameadr: d += (addr - ES1370_REG_DAC1_FRAMEADR) >> 3; val = d->frame_addr; break;
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 <pbonzini@redhat.com> --- hw/audio/es1370.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)