From nobody Tue Feb 10 23:00:40 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.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522079730276495.9034201142699; Mon, 26 Mar 2018 08:55:30 -0700 (PDT) Received: from localhost ([::1]:57556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0UT3-0004W8-EU for importer@patchew.org; Mon, 26 Mar 2018 11:55:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0U9E-0003CJ-UX for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:35:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0U9E-0000GX-5v for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:35:00 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:39515) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0U9E-0000GH-0y for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:35:00 -0400 Received: by mail-qk0-x244.google.com with SMTP id j73so20514459qke.6 for ; Mon, 26 Mar 2018 08:34:59 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id i188sm2017502qkc.16.2018.03.26.08.34.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 08:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rgo2P27rff/WyNy4lziBbVemdiPbIB0X80dkAmGHaq0=; b=XTQeirro8s71FFnegUWFA4mxY0sZFk39CMMzEXMDaL1Xtv0LtaX/xSCwsNMQlVGpuG E8yWk1jLTbKuH4al3dqKblNAsmP8dN0GvdQ/njA/UU3Bx+cS6c50H0v+0kjy/xR736ud HQao9bL+ENkMApjh1udy4c0TTk6nYo73bBk4ycOpqb7xpx//aurFtujMLDHZMUXrxOM5 6A7QimtXAdfgpKDTYZ1B5BkbnuzNhBcyXSlnOuPDQXg6w0RVu4yP04TRoX6HmHFjKH/G RHaESkXBjYHacvvE3H1uhcghOQt1XVLesYNNkhip3RfiNPA9g5w3FgyScA9wqCZ/gymA htGg== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rgo2P27rff/WyNy4lziBbVemdiPbIB0X80dkAmGHaq0=; b=AUD8/xpKpWBiDnUPUGUj/QDAQeytwtQficokGy226i3lGCdNNpprtXESyRiENaqYEn /t8pVdNdh2KvL2IdhFKTrnjSM/f7CraWK3bFD5kXploBxfMAL2wUbJ9ne2IKN61KVShD D6Cdt37egiwHA4vWGrxt/LlvXfYx3fMTGJUwjYytmNhQk45iqlMhQH7dJbC81ZzdmpWZ UYA4I41YoCCMlmOQARMloOMgYjldEexyyYt5nozLB3TjbbmX4Wpvsp1RSBjBVU3PHEKz U+db1O2Xv24rjWsw+Yba1tromfx4dmkhggUfYEVVP53y86Ctb4167WZCykM/bAkQ31RL FSwA== X-Gm-Message-State: AElRT7EcnYr3ETQp0ypvZccQGLk2qRKx8NL4136O+oo/Z8lPQGyjHqL8 9tjHSssZlEOKVHQQGJ9CGNc= X-Google-Smtp-Source: AG47ELu0laB/LdJaoKVtbxxHAxh41sAXrQFD7BAQYsAaL9FSvMCJ15ZH930jP00Hnp/O63LHtfoP9g== X-Received: by 10.55.20.22 with SMTP id e22mr55484657qkh.12.1522078499504; Mon, 26 Mar 2018 08:34:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eduardo Otubo , Thomas Huth , Paolo Bonzini Date: Mon, 26 Mar 2018 12:34:38 -0300 Message-Id: <20180326153441.32641-3-f4bug@amsat.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180326153441.32641-1-f4bug@amsat.org> References: <20180326153441.32641-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH for-2.13 2/5] hw/dma/i8257: Define I8257_CHANNEL_COUNT 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: Eduardo Habkost , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Michael Tokarev , Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Nageswara Sastry , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The 8257 has 4 DMA channels, reflect that to denote than when 8 channels are used, this is not a single 8257 (but probably two cascaded). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/dma/i8257.h | 4 +++- hw/dma/i8257.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h index 2cab50bb6c..3053f18797 100644 --- a/include/hw/dma/i8257.h +++ b/include/hw/dma/i8257.h @@ -7,6 +7,8 @@ =20 #define TYPE_I8257 "i8257" =20 +#define I8257_CHANNEL_COUNT 4 + typedef struct I8257Regs { int now[2]; uint16_t base[2]; @@ -33,7 +35,7 @@ typedef struct I8257State { uint8_t command; uint8_t mask; uint8_t flip_flop; - I8257Regs regs[4]; + I8257Regs regs[I8257_CHANNEL_COUNT]; MemoryRegion channel_io; MemoryRegion cont_io; =20 diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 52675e97c9..df030f934c 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -361,7 +361,7 @@ static void i8257_dma_run(void *opaque) d->running =3D 1; } =20 - for (ichan =3D 0; ichan < 4; ichan++) { + for (ichan =3D 0; ichan < I8257_CHANNEL_COUNT; ichan++) { int mask; =20 mask =3D 1 << ichan; @@ -536,8 +536,8 @@ static const VMStateDescription vmstate_i8257 =3D { VMSTATE_UINT8(mask, I8257State), VMSTATE_UINT8(flip_flop, I8257State), VMSTATE_INT32(dshift, I8257State), - VMSTATE_STRUCT_ARRAY(regs, I8257State, 4, 1, vmstate_i8257_regs, - I8257Regs), + VMSTATE_STRUCT_ARRAY(regs, I8257State, I8257_CHANNEL_COUNT, 1, + vmstate_i8257_regs, I8257Regs), VMSTATE_END_OF_LIST() } }; --=20 2.16.3