From patchwork Sun Sep 30 08:12:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 976786 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="kBqqb022"; 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 42NJ9C6GvMz9s7T for ; Sun, 30 Sep 2018 18:14:22 +1000 (AEST) Received: from localhost ([::1]:54207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6Wrs-000243-5m for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:14:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6Wr2-00023H-Gu for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6Wr1-0008KY-2m for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:28 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6Wqz-0008Ei-4g for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:25 -0400 Received: by mail-wr1-x442.google.com with SMTP id s14-v6so10477421wrw.6 for ; Sun, 30 Sep 2018 01:13:23 -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=99ge6bB/FR7LsmylJWTw1ZT0w9yo65BzKxmk/jHO5Sw=; b=kBqqb022wV4RDhOEsl7mdYgIXcJJwArUOYqqMSlmfoBVNM9qMk3rlnErL5C5oriAy2 2/kYDlz/sE59kuXmqJ6BJ/u+fp8aw+ObiPjIhE9oZ/nyT1aIKae9zE6sBR+RaG50MMRb 4RSpUQPO5WqjyFHn4wFZqg7TjOXmKY9IQxGZzC28idw7yLJJcMRbImyQr9hzrlFMdLQf KAjJaMgKB0r3SQFSA/NKmRD6q1cMQEljDl7qH6xsj36S1t6JFvHEqQ48ENQKaKO52K4T GQQn5mpIFYg/B8zQd3e0NjyxfrXZWm7xNWfdlNievgWL+C9B/LHFTsPaMvO6pa1KMmgn n3WQ== 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=99ge6bB/FR7LsmylJWTw1ZT0w9yo65BzKxmk/jHO5Sw=; b=eNNdM13AFqsKgqf1MVDPxXWO7ONGHA+go45QB7H5gyi3hdUmVUsVTZBdXYX2KMAvK4 H+/y7cHowzxVdtudJPTMZbNOwImswFniKlExUudPZ8f/rCf4FQqgMaInxiTm5K2KNJR3 lBQY3UlgzPS9bNRVJW7NKP0KvLZzjvAn5TtPRIJB2uvcx6D/uS2rNBTuWK9zmFNFTsUC NDw16DqcmgW5rJHDWS/QwUr1GmIA54BQDR2n2ip5rWdvK7y50uvr2hvM1BN/i+w6GaZu L2/oRFGGnVzfqzGcG3sANRLN3E2ppga/cmLRLpXsr3bYvfs9LnuAspep/Y1RRa6RgYan ufvQ== X-Gm-Message-State: ABuFfogw4mf+TVsDfayh0/2Zbk8NmdimD3p7/KAR1A0Z5UPhGcMm0kJ/ uZ/PIhTikK7yAVxd3Rpq+giljm4p X-Google-Smtp-Source: ACcGV61rL/McdEJj2Zp+et1lAmHpFXi5iHNixpFFpXWiBFCzibqJSvRx+3aGfL5ZNm16ana4737FMg== X-Received: by 2002:a5d:4912:: with SMTP id x18-v6mr3500259wrq.114.1538295202298; Sun, 30 Sep 2018 01:13:22 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.13.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:13:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:01 +0200 Message-Id: <1538295197-23704-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-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::442 Subject: [Qemu-devel] [PULL 03/79] es1370: fix 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*. 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 dd75c9e..4f980a5 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -506,10 +506,13 @@ static void es1370_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) d - &s->chan[0], val >> 16, (val & 0xffff)); 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: d->frame_addr = val; ldebug ("chan %td frame address %#x\n", d - &s->chan[0], val); break; @@ -521,10 +524,13 @@ static void es1370_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) lwarn ("writing to phantom frame address %#x\n", val); 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: d->frame_cnt = val; d->leftover = 0; ldebug ("chan %td frame count %d, buffer size %d\n",