From nobody Fri May 3 02:36:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686336786728515.4247213029078; Fri, 9 Jun 2023 11:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7hD6-0000xc-Bh; Fri, 09 Jun 2023 14:51:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD1-0000wW-MS; Fri, 09 Jun 2023 14:51:39 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD0-0002pa-6a; Fri, 09 Jun 2023 14:51:39 -0400 Received: from [2a00:23c4:8bac:6900:b726:cf58:4c12:f013] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q7hCq-0000p5-4p; Fri, 09 Jun 2023 19:51:32 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+zG1+zsLiApFxKVTbKvT2753to4bpAB1vEbcK9znN+g=; b=B+0HE1CDZ+DGeWLRZ4z+KAWMfa onPUEe3Nn8pp5lhL3LNwLGYWUSy5qyKABfOsqt9eUIXbRts6MbcoOWPC0EgIUiYm4SrUQ5Ay0jCOB V+sU4dfjm5ylpSfztxHnl5rYi3HyvUxRd5+h8y5cPrpg+baCoWd5odPYJuleDWlm+TqVvJNLBoHcy WrsyJDx4qS0+dgYdNqEUPn5jrOQuvxiarPC8vbmWDxe0z2XpWLCq2U8xv47Z4Qkrb9YRxGTPpE/xL wvY8DWjXzUBwMnqYKabfVla0E+AjhEh1RyOl5SIFlhqMbRZY/ur4dy90xOZRgSiM8jfmAw6XTC+qM u1VcrICj8kvG3Bi7L7VnLLdemyJnB9y4lbZOJ9oK3W/R6mG1itNs5oW+I/2T0Scc+q46fVxJqSsU5 d4FCLncoTkz4N93EWQQ2UCllyjs7aW7JO85QGZY79yvjxV8kZ8AL5ygTbG9kwvOY5jWY9+A/Op0L4 e5knnH0BPAt89r/JrbnzOH2PlaHynstSp3tmC+9sWqWgqxMFySL1geOmknDgjwFSsVg9jNN6KhuR2 3JVoqt5RO/kj7MWf8uoiDCK8Vm2JbN3jdRT2op7uSzv32+0e2wSZ4X0sw8IIs+zD0gKcQA7ClE6Xo +/m6kMabjFJZzhwJIxOmnOn1w+mElvssvHGvxQONw=; From: Mark Cave-Ayland To: jsnow@redhat.com, shentey@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 9 Jun 2023 19:51:15 +0100 Message-Id: <20230609185119.691152-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> References: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bac:6900:b726:cf58:4c12:f013 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/5] cmd646: checkpatch fixes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1686336787621100013 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/cmd646.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index a68357c1c5..20f1e41d57 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -96,7 +96,7 @@ static uint64_t bmdma_read(void *opaque, hwaddr addr, return ((uint64_t)1 << (size * 8)) - 1; } =20 - switch(addr & 3) { + switch (addr & 3) { case 0: val =3D bm->cmd; break; @@ -133,7 +133,7 @@ static void bmdma_write(void *opaque, hwaddr addr, } =20 trace_bmdma_write_cmd646(addr, val); - switch(addr & 3) { + switch (addr & 3) { case 0: bmdma_cmd_writeb(bm, val); break; @@ -144,7 +144,8 @@ static void bmdma_write(void *opaque, hwaddr addr, cmd646_update_irq(pci_dev); break; case 2: - bm->status =3D (val & 0x60) | (bm->status & 1) | (bm->status & ~va= l & 0x06); + bm->status =3D (val & 0x60) | (bm->status & 1) | + (bm->status & ~val & 0x06); break; case 3: if (bm =3D=3D &bm->pci_dev->bmdma[0]) { @@ -167,7 +168,7 @@ static void bmdma_setup_bar(PCIIDEState *d) int i; =20 memory_region_init(&d->bmdma_bar, OBJECT(d), "cmd646-bmdma", 16); - for(i =3D 0;i < 2; i++) { + for (i =3D 0; i < 2; i++) { bm =3D &d->bmdma[i]; memory_region_init_io(&bm->extra_io, OBJECT(d), &cmd646_bmdma_ops,= bm, "cmd646-bmdma-bus", 4); @@ -255,7 +256,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) =20 pci_conf[PCI_CLASS_PROG] =3D 0x8f; =20 - pci_conf[CNTRL] =3D CNTRL_EN_CH0; // enable IDE0 + pci_conf[CNTRL] =3D CNTRL_EN_CH0; /* enable IDE0 */ if (d->secondary) { /* XXX: if not enabled, really disable the seconday IDE controller= */ pci_conf[CNTRL] |=3D CNTRL_EN_CH1; /* enable IDE1 */ @@ -289,7 +290,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); =20 /* TODO: RST# value should be 0 */ - pci_conf[PCI_INTERRUPT_PIN] =3D 0x01; // interrupt on pin 1 + pci_conf[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt on pin 1 */ =20 qdev_init_gpio_in(ds, cmd646_set_irq, 2); for (i =3D 0; i < 2; i++) { --=20 2.30.2 From nobody Fri May 3 02:36:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686336786277244.78867749941128; Fri, 9 Jun 2023 11:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7hD8-0000yF-M8; Fri, 09 Jun 2023 14:51:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD4-0000xL-53; Fri, 09 Jun 2023 14:51:42 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD2-0002rw-Jw; Fri, 09 Jun 2023 14:51:41 -0400 Received: from [2a00:23c4:8bac:6900:b726:cf58:4c12:f013] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q7hCu-0000p5-At; Fri, 09 Jun 2023 19:51:36 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=KZZHoQewgBXwL13bfUxestEau4HgdSwG+IGmDreN6Ew=; b=VQ5zxdRL8BkWkAuZZrxcYJobgO Davqkb3XvMbXJyoV4ncPzB73tsLUv3D95E69U6DJrLTBBbBV4MWLIIUkQTrVzh8McjKLIdjHm2E8e 9wA6H5TiSDXGb0N+v7bABK+iQq5NzO+sO5XmmYkbhFG13rgVbZ6LxdM3MSqnvG/tsshncRWyqHUkV FufzC34geV/cq8jr84cptekSKDchO9+LnKZh9FN3jqz+Yum193vD40Cr4mJZy/ryLFb6hCgDDQd7v B+JbQq1b21CWy7QDa0Q3ytubVBhnhp42ve5yerQZnKDqvAF/2JEwxk7voTOLqoVSGn/9vYGDburjl oEAmzoGk0u6E5GSZH8h6lG1CpqoSBY3i11Bgn+Zoba/TNw+GEFZWPKzP1DqDL71A9/nzbcG4IW7t3 F7sIMHNTpOu+iQhKT7+iSb8S4qznJWZDA9iZuZ0ZXgoKnN9hVPh+t7txGvPrHPcU63XuPjodoeypu rxz4O4OQNn761b3oKIUKj4T+otwjzX2pE3PLINhTLKAsuhTHnMoVU794G5vSPRc6wK5zzXKppy7ZW 4yuxpAnZUPF2tVtPvVo+/tmaGYtazGWvWod3js2iWwFLcrhnRYqRQYP6bbN2YPS1GcLaEMfTAEFno oTGRQOWoRoaz57rFWLEwcrEO6OEZEzHHq2ysqHvM4=; From: Mark Cave-Ayland To: jsnow@redhat.com, shentey@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 9 Jun 2023 19:51:16 +0100 Message-Id: <20230609185119.691152-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> References: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bac:6900:b726:cf58:4c12:f013 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/5] cmd646: create separate header and QOM type for CMD646_IDE X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1686336787745100018 Content-Type: text/plain; charset="utf-8" This will enable CMD646-specific fields to be added to CMD6464IDEState in future. Signed-off-by: Mark Cave-Ayland --- hw/ide/cmd646.c | 4 +++- include/hw/ide/cmd646.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 include/hw/ide/cmd646.h diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 20f1e41d57..a3e227fba7 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -33,6 +33,7 @@ #include "sysemu/reset.h" =20 #include "hw/ide/pci.h" +#include "hw/ide/cmd646.h" #include "trace.h" =20 /* CMD646 specific */ @@ -339,9 +340,10 @@ static void cmd646_ide_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo cmd646_ide_info =3D { - .name =3D "cmd646-ide", + .name =3D TYPE_CMD646_IDE, .parent =3D TYPE_PCI_IDE, .class_init =3D cmd646_ide_class_init, + .instance_size =3D sizeof(CMD646IDEState), }; =20 static void cmd646_ide_register_types(void) diff --git a/include/hw/ide/cmd646.h b/include/hw/ide/cmd646.h new file mode 100644 index 0000000000..4780b1132c --- /dev/null +++ b/include/hw/ide/cmd646.h @@ -0,0 +1,38 @@ +/* + * QEMU IDE Emulation: PCI cmd646 support. + * + * Copyright (c) 2003 Fabrice Bellard + * Copyright (c) 2006 Openedhand Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#ifndef HW_IDE_CMD646_H +#define HW_IDE_CMD646_H + +#define TYPE_CMD646_IDE "cmd646-ide" +OBJECT_DECLARE_SIMPLE_TYPE(CMD646IDEState, CMD646_IDE) + +#include "hw/ide/pci.h" + +struct CMD646IDEState { + PCIIDEState parent_obj; +}; + +#endif --=20 2.30.2 From nobody Fri May 3 02:36:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686336786529666.1808873681654; Fri, 9 Jun 2023 11:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7hDB-0000zk-NP; Fri, 09 Jun 2023 14:51:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD8-0000yI-FV; Fri, 09 Jun 2023 14:51:46 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD7-0002tS-2i; Fri, 09 Jun 2023 14:51:46 -0400 Received: from [2a00:23c4:8bac:6900:b726:cf58:4c12:f013] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q7hCy-0000p5-G4; Fri, 09 Jun 2023 19:51:40 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jJPUSGdC7j79yHmzcXbbAXe4Xq0aaoRGjYGvLAai0eM=; b=kw20TYxeOAzRwVi7O22fPIldDQ H3F1DNqqEQ12PzcPT76hMd8HzsPSuuVuYSOWO4U/o2QVNv462YJFvReMi0HbV5uxvlMyRzyviUszD UKIctjBwVQYOg5l9uHBPxwb02tC2n8Z7htrdQ3CydbWxmVxjHOqd5DYO+PgQxMbw7aNqZr90isvOF g8lgqNz67aFz/DFY6JzCQBhu3GI7mKH2IpCGokDpnamLPH0dG9+h7Ok9hzlEUbsD/sVbmbfgj+vMZ Scuqww3RxiUhXvRbNz553HKLKIL6DhokP4Sl0wCwvyho0XgpTeT4vPPPME0zLSg73/PUtPSXqKUa7 nyKlgvtfNkwi5H9cTcZo1a046At+xnVMp+aMO166EhzwYKy1GuVKBt3Q2jg6jSBmYOZyZA1Q+HP5q JYfngjq3uQa+7gw8lj4HURaDOmZpkhdVqznGkH3zPLYjBokeh88tLEYzgqVI1x0XjyeykKIWEXuvd eJCAVIMwG417rf0itDmOiaMSaFvU9dTtiXHLdQuTpjdG/DvvnIC0lVseTeyO499Not7uaKRqKX+qw zM7LAQ0ap3EJDvajQCHydcnwTT+OP8z0SNrkyqzAf35lAVWYX21YIXBhGz2VuLkTck5rC1oLIN7bU 0e56sDAPF1W7Lh+RR9ZxI16EPs1Ab8O/Fg+Eoh0rA=; From: Mark Cave-Ayland To: jsnow@redhat.com, shentey@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 9 Jun 2023 19:51:17 +0100 Message-Id: <20230609185119.691152-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> References: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bac:6900:b726:cf58:4c12:f013 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 3/5] cmd646: use TYPE_CMD646_IDE instead of hardcoded "cmd646-ide" string X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1686336787177100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland --- hw/alpha/dp264.c | 4 ++-- hw/sparc64/sun4u.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 03495e1e60..f2affecad9 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -13,7 +13,7 @@ #include "alpha_sys.h" #include "qemu/error-report.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/ide/pci.h" +#include "hw/ide/cmd646.h" #include "hw/isa/superio.h" #include "net/net.h" #include "qemu/cutils.h" @@ -132,7 +132,7 @@ static void clipper_init(MachineState *machine) isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); =20 /* IDE disk setup. */ - pci_dev =3D pci_create_simple(pci_bus, -1, "cmd646-ide"); + pci_dev =3D pci_create_simple(pci_bus, -1, TYPE_CMD646_IDE); pci_ide_create_devs(pci_dev); =20 /* Load PALcode. Given that this is not "real" cpu palcode, diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index e2858a0331..66b55eabd1 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -50,7 +50,7 @@ #include "hw/sparc/sparc64.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" -#include "hw/ide/pci.h" +#include "hw/ide/cmd646.h" #include "hw/loader.h" #include "hw/fw-path-provider.h" #include "elf.h" @@ -673,7 +673,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, qemu_macaddr_default_if_unset(&macaddr); } =20 - pci_dev =3D pci_new(PCI_DEVFN(3, 0), "cmd646-ide"); + pci_dev =3D pci_new(PCI_DEVFN(3, 0), TYPE_CMD646_IDE); qdev_prop_set_uint32(&pci_dev->qdev, "secondary", 1); pci_realize_and_unref(pci_dev, pci_busA, &error_fatal); pci_ide_create_devs(pci_dev); --=20 2.30.2 From nobody Fri May 3 02:36:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686336786452227.69145763206666; Fri, 9 Jun 2023 11:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7hDD-00010Y-WF; Fri, 09 Jun 2023 14:51:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hDC-000106-CB; Fri, 09 Jun 2023 14:51:50 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hDA-0002uX-Vv; Fri, 09 Jun 2023 14:51:50 -0400 Received: from [2a00:23c4:8bac:6900:b726:cf58:4c12:f013] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q7hD2-0000p5-LW; Fri, 09 Jun 2023 19:51:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=k5+VVrnWZpXPXGUGnpL17cwo8bJr6WXkTyeLJYavsoo=; b=uLFAf1Dbvl/qSfl6Gp+uuXW4G1 3oL76T/7SJOTg1awHj8DFIlIOOVDZ8YTPVwZCXNpCY2fRDpYcjb2llhiSST6PRd5KEvseGPBLKELT lYysWGBJRPOq+KRjiq5gIGr1yRW/oc5V470SozPYTMOcvXkiaPJEhUQlqy1ygSA0ZnGWN8b4gtIX5 YFJ+dnke46VGfUh+CuZufJQiB3je2w43zI4M5cfN4sq9RoIW4PcuAN/leJThKR0VCbQXRDYSEljOO +ZeP10Z1osjFArSK8No9Q2hJ9yZcaHQuVL0U/93l0K7U3felUgCd8uGb/mnoVaN9bEb/Jk0UXycBU epa/WgEIUd7h5iYgA+ZeB69XWZp5dGgQTu2xPfD5tLLQlYhGbThz3KTtAUnoJkHaoB6Xwno19rGmU olYv3lH2Y/El4EU39y35bnl3ElXUHzOlez39lRLiLw4JdQu/i9qfQE0+TnqvAT55/LNGITs2h2Cgc fTffhrzqr3arusyfZpZwUoxuEFXndfABTCTGt5UjloW4nNqZ95vKaVfDB6F/5C+XOgsii8TBgKuJF uiyV2hNDgxVd5Mkpwq44j2tm4VvLlnTtlMDk4SU4CY40F8jSCe5hlFj0WNULx0xuZI3NLySfwa3kk exKOtpXaRVuJqDE12PqvEm2z2I4YNlkpNLwXD1L+4=; From: Mark Cave-Ayland To: jsnow@redhat.com, shentey@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 9 Jun 2023 19:51:18 +0100 Message-Id: <20230609185119.691152-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> References: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bac:6900:b726:cf58:4c12:f013 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 4/5] cmd646: rename cmd646_bmdma_ops to bmdma_ops X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1686336787190100005 Content-Type: text/plain; charset="utf-8" This is to allow us to use the cmd646_bmdma_ops name for the CMD646 device-specific registers in the next commit. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/cmd646.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index a3e227fba7..9103da581f 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -158,7 +158,7 @@ static void bmdma_write(void *opaque, hwaddr addr, } } =20 -static const MemoryRegionOps cmd646_bmdma_ops =3D { +static const MemoryRegionOps bmdma_ops =3D { .read =3D bmdma_read, .write =3D bmdma_write, }; @@ -171,7 +171,7 @@ static void bmdma_setup_bar(PCIIDEState *d) memory_region_init(&d->bmdma_bar, OBJECT(d), "cmd646-bmdma", 16); for (i =3D 0; i < 2; i++) { bm =3D &d->bmdma[i]; - memory_region_init_io(&bm->extra_io, OBJECT(d), &cmd646_bmdma_ops,= bm, + memory_region_init_io(&bm->extra_io, OBJECT(d), &bmdma_ops, bm, "cmd646-bmdma-bus", 4); memory_region_add_subregion(&d->bmdma_bar, i * 8, &bm->extra_io); memory_region_init_io(&bm->addr_ioport, OBJECT(d), --=20 2.30.2 From nobody Fri May 3 02:36:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686336786077167.45583644624605; Fri, 9 Jun 2023 11:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7hDI-00011z-Mp; Fri, 09 Jun 2023 14:51:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hDG-00011H-Vb; Fri, 09 Jun 2023 14:51:55 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hDF-0002vl-99; Fri, 09 Jun 2023 14:51:54 -0400 Received: from [2a00:23c4:8bac:6900:b726:cf58:4c12:f013] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q7hD6-0000p5-Ra; Fri, 09 Jun 2023 19:51:48 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=BjIXwPrt4L4/BuNkHvOZ69CiJDN7mTCQ/Qs0TuUfOgM=; b=jBlfasiRs19XtRnaUGye42j8RK eBMbNUvl5H3sYgVgjawiMhewpfbeXRxNGp9wdBcY8p2a4ay4tP088SEaZjpnre8e9Oc7YXn8oFx9b w7QkiRWCgK1YuEQnKa/mWNQZagUXnaGhd1xM4GMQb31Ajnciara1peZORxIPaJNzIReYjNE459bFa xbJ2G56iUn3jrQ0R0Jyf/3MSA577l36K7cp8CqwnMU5DVlvk3BZ8Yn2nxQ/B1HZ5gJoCdE+YTXvpB YTBBJt6yCjTsm8UFaOtZlTtbKNUlSonAzTsxumWZOH98b2r+7RCtM6sDp6lZgJaYsj2eg2IwjygNJ kvK7AQMThXbuG3vcjjx7cu8Z5tDwMcX1VXPRW+UUHFMQDi14fvHwo+Z+xNkYvpPK6rbOCvXlWf0Hi FtVJJgob+ZYKTBlL6oBLP6x3uboPa/aSaEYA5DlWjzmZVeanC7CodTe/7erKhSCWvZ+8OWc/Q7C8B He3X2Fb78A1KJlc0EWWnDBGnnhlmFIC9iqArB0J2f/1R1Teot6j+xO6GGGGOtwNwvdVrPPZEnZ3ut +UYJk9s4hPqbuH4c+mt5R74nFOuLKKsV2tYrQFnPC2So8gnIZULssorzrgkk/jvpuj0kWtURz2Bmi 72eEHDbtSGxagA6iE42eSQGKkI9lz8C1H4A502dWk=; From: Mark Cave-Ayland To: jsnow@redhat.com, shentey@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 9 Jun 2023 19:51:19 +0100 Message-Id: <20230609185119.691152-6-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> References: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bac:6900:b726:cf58:4c12:f013 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 5/5] cmd646: move device-specific BMDMA registers to separate memory region X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1686336787631100014 Content-Type: text/plain; charset="utf-8" The aim here is to eliminate any device-specific registers from the main BM= DMA bar memory region so it can potentially be moved into the shared PCI IDE de= vice. For each BMDMA bus create a new cmd646-bmdma-specific memory region represe= nting the device-specific BMDMA registers and then map them using aliases onto the existing BMDMAState memory region. Signed-off-by: Mark Cave-Ayland --- hw/ide/cmd646.c | 111 +++++++++++++++++++++++++++++++--------- include/hw/ide/cmd646.h | 4 ++ 2 files changed, 90 insertions(+), 25 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 9103da581f..dd495f2e1b 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -90,7 +90,6 @@ static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size) { BMDMAState *bm =3D opaque; - PCIDevice *pci_dev =3D PCI_DEVICE(bm->pci_dev); uint32_t val; =20 if (size !=3D 1) { @@ -101,19 +100,9 @@ static uint64_t bmdma_read(void *opaque, hwaddr addr, case 0: val =3D bm->cmd; break; - case 1: - val =3D pci_dev->config[MRDMODE]; - break; case 2: val =3D bm->status; break; - case 3: - if (bm =3D=3D &bm->pci_dev->bmdma[0]) { - val =3D pci_dev->config[UDIDETCR0]; - } else { - val =3D pci_dev->config[UDIDETCR1]; - } - break; default: val =3D 0xff; break; @@ -127,7 +116,6 @@ static void bmdma_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { BMDMAState *bm =3D opaque; - PCIDevice *pci_dev =3D PCI_DEVICE(bm->pci_dev); =20 if (size !=3D 1) { return; @@ -138,23 +126,10 @@ static void bmdma_write(void *opaque, hwaddr addr, case 0: bmdma_cmd_writeb(bm, val); break; - case 1: - pci_dev->config[MRDMODE] =3D - (pci_dev->config[MRDMODE] & ~0x30) | (val & 0x30); - cmd646_update_dma_interrupts(pci_dev); - cmd646_update_irq(pci_dev); - break; case 2: bm->status =3D (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06); break; - case 3: - if (bm =3D=3D &bm->pci_dev->bmdma[0]) { - pci_dev->config[UDIDETCR0] =3D val; - } else { - pci_dev->config[UDIDETCR1] =3D val; - } - break; } } =20 @@ -181,6 +156,91 @@ static void bmdma_setup_bar(PCIIDEState *d) } } =20 +static uint64_t cmd646_bmdma_read(void *opaque, hwaddr addr, unsigned size) +{ + BMDMAState *bm =3D opaque; + PCIDevice *pci_dev =3D PCI_DEVICE(bm->pci_dev); + uint32_t val; + + if (size !=3D 1) { + return ((uint64_t)1 << (size * 8)) - 1; + } + + switch (addr & 3) { + case 1: + val =3D pci_dev->config[MRDMODE]; + break; + case 3: + if (bm =3D=3D &bm->pci_dev->bmdma[0]) { + val =3D pci_dev->config[UDIDETCR0]; + } else { + val =3D pci_dev->config[UDIDETCR1]; + } + break; + default: + val =3D 0xff; + break; + } + + trace_bmdma_read_cmd646(addr, val); + return val; +} + +static void cmd646_bmdma_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + BMDMAState *bm =3D opaque; + PCIDevice *pci_dev =3D PCI_DEVICE(bm->pci_dev); + + if (size !=3D 1) { + return; + } + + trace_bmdma_write_cmd646(addr, val); + switch (addr & 3) { + case 1: + pci_dev->config[MRDMODE] =3D + (pci_dev->config[MRDMODE] & ~0x30) | (val & 0x30); + cmd646_update_dma_interrupts(pci_dev); + cmd646_update_irq(pci_dev); + break; + case 3: + if (bm =3D=3D &bm->pci_dev->bmdma[0]) { + pci_dev->config[UDIDETCR0] =3D val; + } else { + pci_dev->config[UDIDETCR1] =3D val; + } + break; + } +} + +static const MemoryRegionOps cmd646_bmdma_ops =3D { + .read =3D cmd646_bmdma_read, + .write =3D cmd646_bmdma_write, +}; + +static void cmd646_bmdma_setup(PCIIDEState *d) +{ + CMD646IDEState *s =3D CMD646_IDE(d); + BMDMAState *bm; + int i; + + /* Setup aliases for device-specific BMDMA registers */ + for (i =3D 0; i < 2; i++) { + bm =3D &d->bmdma[i]; + memory_region_init_io(&s->bmdma_mem[i], OBJECT(d), &cmd646_bmdma_o= ps, + bm, "cmd646-bmdma", 4); + memory_region_init_alias(&s->bmdma_mem_alias[i][0], OBJECT(d), + "cmd646-bmdma[1]", &s->bmdma_mem[i], 0x1,= 1); + memory_region_add_subregion(&bm->extra_io, 0x1, + &s->bmdma_mem_alias[i][0]); + memory_region_init_alias(&s->bmdma_mem_alias[i][1], OBJECT(d), + "cmd646-bmdma[3]", &s->bmdma_mem[i], 0x3,= 1); + memory_region_add_subregion(&bm->extra_io, 0x3, + &s->bmdma_mem_alias[i][1]); + } +} + static void cmd646_update_irq(PCIDevice *pd) { int pci_level; @@ -289,6 +349,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) =20 bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); + cmd646_bmdma_setup(d); =20 /* TODO: RST# value should be 0 */ pci_conf[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt on pin 1 */ diff --git a/include/hw/ide/cmd646.h b/include/hw/ide/cmd646.h index 4780b1132c..5329964533 100644 --- a/include/hw/ide/cmd646.h +++ b/include/hw/ide/cmd646.h @@ -29,10 +29,14 @@ #define TYPE_CMD646_IDE "cmd646-ide" OBJECT_DECLARE_SIMPLE_TYPE(CMD646IDEState, CMD646_IDE) =20 +#include "exec/memory.h" #include "hw/ide/pci.h" =20 struct CMD646IDEState { PCIIDEState parent_obj; + + MemoryRegion bmdma_mem[2]; + MemoryRegion bmdma_mem_alias[2][2]; }; =20 #endif --=20 2.30.2