From nobody Tue Dec 16 05:37:31 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520982674192252.14074271547167; Tue, 13 Mar 2018 16:11:14 -0700 (PDT) Received: from localhost ([::1]:43407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evt4b-0008QP-A9 for importer@patchew.org; Tue, 13 Mar 2018 19:11:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsi8-0005p8-It for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsi6-0003Qt-Dg for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:00 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35658) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsi6-0003Pe-4O for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:58 -0400 Received: by mail-wm0-x241.google.com with SMTP id x7so878106wmc.0 for ; Tue, 13 Mar 2018 15:47:57 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.47.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:47:56 -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=az8I/f8vyKt324wBJCayoTUky/M1VToseC7iTJiQ2LM=; b=j9Mc+dvM8JGZNAnADG1qtLs9WlhflQJTiTB6ReOAXhLt856ID4K26R1QuKw+nM9EO4 qBSjeO1RtXdU6D2QFbTKQYgCfsNH4rjVPFGl8dqd9S5W3vKz6MNyzpPRIXqiqaH2SSH4 ie31zXJysNEjSKEqloWWNOwhkZyQ4f/3jdR/ETNkEohdfZXIytW7mfXUyx1g7J3jMTyG kvrdz5nMoZRwRxiKjJiW7LvlLNuhYxBiAG0tJlENAiAv6n1mCBfKyVRUHyOoLFSFGXXX C+coGlKCAuc5SrcoUpqQe1aMPxl9a/r0pSkk9heZ2TRZA6iSMlqoudfZTxvYA6FOFwTI 3TxA== 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=az8I/f8vyKt324wBJCayoTUky/M1VToseC7iTJiQ2LM=; b=c3v9Oh/tK4XNRgcxtkBhW7JO79d0KLF1nMEK2NUimP0p2FIVNuNSFn36LeP2Lc8VWM 5cG32OdONJTLRtDrJT+gpy5NKk6raz0j3zs24SLHAbD/w16zyFbSJHraBkkMUh3wleWU K+v19UQTBUH8mGKOfA4klrmzkWUWWt6SJalLtRkpVZ6C6p5nUtH5sh9j60GUB7hfUnyB lOaHw/c356K16S7/JogGRYAbKrgPfJ23J8OMPoFl2jKM0IK4mgv8FJ2PJXDwXi3GjYAB n1iDl/DnNQ7r1Smihzio6KiAWIFjK7IiBA6QKLMhW+e4HUrBBqbSb8LqW92s3rYrMmC5 IBQg== X-Gm-Message-State: AElRT7EJYplGwL8Fa/kKxxUurzzdykJcXWM2OrbUrTz0wN/GnAT+VtVI C4unFTWJyYZIIt0hOyOJL8og+FHJ X-Google-Smtp-Source: AG47ELvj0rE4qsoFbGL8Od9pRWW9FH/2jfnCKfYpH2WNveW6QfGW7yryTeh1jrBcOdBBSPq/xR99wg== X-Received: by 10.28.178.81 with SMTP id b78mr2183574wmf.78.1520981276620; Tue, 13 Mar 2018 15:47:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:38 +0100 Message-Id: <20180313224719.4954-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> 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: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 28/69] hw/dma/i8257: Rename DMA_init() to i8257_dma_init() 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 - Move the header from hw/isa/ to hw/dma/ - Remove the old i386/pc dependency - use a bool type for the high_page_enable argument Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20180308223946.26784-3-f4bug@amsat.org> Reviewed-by: Mark Cave-Ayland Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- hw/dma/i82374.c | 3 ++- hw/dma/i8257.c | 4 ++-- hw/i386/pc.c | 3 ++- hw/mips/mips_fulong2e.c | 3 ++- hw/mips/mips_jazz.c | 3 ++- hw/mips/mips_malta.c | 3 ++- hw/sparc/sun4m.c | 4 ---- hw/sparc64/sun4u.c | 4 ---- include/hw/{isa =3D> dma}/i8257.h | 6 ++++++ include/hw/isa/isa.h | 2 -- 11 files changed, 19 insertions(+), 18 deletions(-) rename include/hw/{isa =3D> dma}/i8257.h (86%) diff --git a/MAINTAINERS b/MAINTAINERS index 02ac81432f..319ac9f929 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -940,8 +940,8 @@ F: hw/timer/mc146818rtc* F: hw/watchdog/wdt_ib700.c F: include/hw/display/vga.h F: include/hw/char/parallel.h +F: include/hw/dma/i8257.h F: include/hw/i2c/pm_smbus.h -F: include/hw/isa/i8257.h F: include/hw/timer/hpet.h F: include/hw/timer/i8254* F: include/hw/timer/mc146818rtc* diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 6c0f975df0..83c87d92e0 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -24,6 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/dma/i8257.h" =20 #define TYPE_I82374 "i82374" #define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_I82374) @@ -123,7 +124,7 @@ static void i82374_realize(DeviceState *dev, Error **er= rp) portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), s->iobase); =20 - DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); + i8257_dma_init(isa_bus_from_device(ISA_DEVICE(dev)), true); memset(s->commands, 0, sizeof(s->commands)); } =20 diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index bd23e893bf..52675e97c9 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/isa/isa.h" -#include "hw/isa/i8257.h" +#include "hw/dma/i8257.h" #include "qemu/main-loop.h" #include "trace.h" =20 @@ -622,7 +622,7 @@ static void i8257_register_types(void) =20 type_init(i8257_register_types) =20 -void DMA_init(ISABus *bus, int high_page_enable) +void i8257_dma_init(ISABus *bus, bool high_page_enable) { ISADevice *isa1, *isa2; DeviceState *d; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8fa51d8eba..a6ceea9c64 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -41,6 +41,7 @@ #include "elf.h" #include "multiboot.h" #include "hw/timer/mc146818rtc.h" +#include "hw/dma/i8257.h" #include "hw/timer/i8254.h" #include "hw/audio/pcspk.h" #include "hw/pci/msi.h" @@ -1607,7 +1608,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, port92_init(port92, a20_line[1]); g_free(a20_line); =20 - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); =20 for(i =3D 0; i < MAX_FD; i++) { fd[i] =3D drive_get(IF_FLOPPY, 0, i); diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index a8e8c23733..1e43768589 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257.h" #include "hw/char/serial.h" #include "hw/char/parallel.h" #include "hw/block/fdc.h" @@ -359,7 +360,7 @@ static void mips_fulong2e_init(MachineState *machine) =20 /* init other devices */ pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); =20 /* Super I/O */ isa_create_simple(isa_bus, "i8042"); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index c87a122ddf..8b6f03a889 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -27,6 +27,7 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257.h" #include "hw/char/serial.h" #include "hw/char/parallel.h" #include "hw/isa/isa.h" @@ -220,7 +221,7 @@ static void mips_jazz_init(MachineState *machine, /* ISA devices */ i8259 =3D i8259_init(isa_bus, env->irq[4]); isa_bus_irqs(isa_bus, i8259); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); pcspk_init(isa_bus, pit); =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index c74882c7e9..9cb86c432e 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -27,6 +27,7 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257.h" #include "hw/char/serial.h" #include "hw/char/parallel.h" #include "hw/block/fdc.h" @@ -1209,7 +1210,7 @@ void mips_malta_init(MachineState *machine) smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); g_free(smbus_eeprom_buf); pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); =20 /* Super I/O */ isa_create_simple(isa_bus, "i8042"); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 2b8af2c884..6471aca25d 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -98,10 +98,6 @@ struct sun4m_hwdef { uint8_t nvram_machine_id; }; =20 -void DMA_init(ISABus *bus, int high_page_enable) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index ceb1ba7eaf..0ca0243821 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -90,10 +90,6 @@ typedef struct EbusState { #define TYPE_EBUS "ebus" #define EBUS(obj) OBJECT_CHECK(EbusState, (obj), TYPE_EBUS) =20 -void DMA_init(ISABus *bus, int high_page_enable) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { diff --git a/include/hw/isa/i8257.h b/include/hw/dma/i8257.h similarity index 86% rename from include/hw/isa/i8257.h rename to include/hw/dma/i8257.h index 88a2766a3f..2cab50bb6c 100644 --- a/include/hw/isa/i8257.h +++ b/include/hw/dma/i8257.h @@ -1,6 +1,10 @@ #ifndef HW_I8257_H #define HW_I8257_H =20 +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "exec/ioport.h" + #define TYPE_I8257 "i8257" =20 typedef struct I8257Regs { @@ -40,4 +44,6 @@ typedef struct I8257State { PortioList portio_pageh; } I8257State; =20 +void i8257_dma_init(ISABus *bus, bool high_page_enable); + #endif diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 95593408ef..b9dbab24b4 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -151,6 +151,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d) return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); } =20 -/* i8257.c */ -void DMA_init(ISABus *bus, int high_page_enable); #endif --=20 2.14.3