From nobody Wed Nov 5 05:46:24 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 1530218426693796.3628940191437; Thu, 28 Jun 2018 13:40:26 -0700 (PDT) Received: from localhost ([::1]:38463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdiM-0002Gv-1A for importer@patchew.org; Thu, 28 Jun 2018 16:40:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdAw-0007aM-LI for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdAv-0000vU-EY for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:54 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:44036) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdAv-0000u7-7Y for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:53 -0400 Received: by mail-wr0-x244.google.com with SMTP id p12-v6so6676349wrn.11 for ; Thu, 28 Jun 2018 13:05:53 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.05.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:51 -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=OTU9nOzigmCSPzLcxmr/6iAJCHWRunYdD8W68iYnPMw=; b=mg9phm4LTR2gv7E8FjV0d4pquLCLFCPwKM6QizzJfier9K9CKXojG4YH1uuxgoYbgy VhAjsXg+zYW+vMOQWpkdqMazRks5SZVOtPEGlA+fnpGEr3qBkkcEuJ79PzZlLaGujQwq daxu576mVtKzl3b47bVhrzDqiItChbHxs3Y3y+/de8G/gn34R3aHn5eUe1BCsdWe7Z+b S/098EIeTgMZUQ471kLD+7ddJ7pigyT8ePi4ATx4sHg15nbIlPqgnHiAxUYn0paV9rHA a8C2LUGRa+l4lgdu1clSpeAetMLckXBZnGw1LaOvjdFdsrK1Iu7HVvgjGiDlBMN/s6uJ UITQ== 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=OTU9nOzigmCSPzLcxmr/6iAJCHWRunYdD8W68iYnPMw=; b=kgmGui1zlsFIOI4VXifo8quFdlPIJ5/pEvqagsvkYRupEyOfpoXFd+4JiuTvwOazAJ xk2HlNaz6lF9xnwGYDq/OsMDpVTqNlGB6qX9wP4jT/8BKTTouxVrs91AVzx0xXNXGF2y Dkhjp88vLWqts31VOJiTJ8ik/XBYNEFEs3Gn92p4eiExmTzOw/miI8HHZ7ErcUUUdksW Y6dD2DLrO+batInfPAvowpAkC4N0igBRjASlz8/IdLj3Jqxb6vsfPJ7jL6UtN3XQxOzT c59bEWqh+NO2JzMr5qeQZ5okctHA4M2+CYbMzb795CPzQSutd2ZcF2fI7DEVHk+xs4tu Dveg== X-Gm-Message-State: APt69E3k3ZYrh4aV1ayiXyEY8Owc0XslDusKKoG8Iw0ZqicSkTK+Fkbs xthFNutXwMp9xTZWFqTlnExxUbIb X-Google-Smtp-Source: AAOMgpd4uP6NYQ3+TMCa39yrYIT+o0qi6vLvHdy4l9VDqL/iiXnzQj3+bSU/d0M62uFYpd4jtCZcfA== X-Received: by 2002:adf:ebc3:: with SMTP id v3-v6mr9795044wrn.33.1530216351954; Thu, 28 Jun 2018 13:05:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:49 +0200 Message-Id: <1530216310-52873-40-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-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:c0c::244 Subject: [Qemu-devel] [PULL 39/60] esp: remove legacy esp_init() function 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: Mark Cave-Ayland 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: Mark Cave-Ayland Remove the legacy esp_init() function now that there are no more remaining users. Signed-off-by: Mark Cave-Ayland Message-Id: <20180613094727.11326-3-mark.cave-ayland@ilande.co.uk> Signed-off-by: Paolo Bonzini Tested-by: Herv=C3=A9 Poussineau --- hw/scsi/esp.c | 30 ------------------------------ include/hw/scsi/esp.h | 5 ----- 2 files changed, 35 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 9ed9727..630d923 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -619,36 +619,6 @@ static const MemoryRegionOps sysbus_esp_mem_ops =3D { .valid.accepts =3D esp_mem_accepts, }; =20 -ESPState *esp_init(hwaddr espaddr, int it_shift, - ESPDMAMemoryReadWriteFunc dma_memory_read, - ESPDMAMemoryReadWriteFunc dma_memory_write, - void *dma_opaque, qemu_irq irq, qemu_irq *reset, - qemu_irq *dma_enable) -{ - DeviceState *dev; - SysBusDevice *s; - SysBusESPState *sysbus; - ESPState *esp; - - dev =3D qdev_create(NULL, TYPE_ESP); - sysbus =3D ESP_STATE(dev); - esp =3D &sysbus->esp; - esp->dma_memory_read =3D dma_memory_read; - esp->dma_memory_write =3D dma_memory_write; - esp->dma_opaque =3D dma_opaque; - sysbus->it_shift =3D it_shift; - /* XXX for now until rc4030 has been changed to use DMA enable signal = */ - esp->dma_enabled =3D 1; - qdev_init_nofail(dev); - s =3D SYS_BUS_DEVICE(dev); - sysbus_connect_irq(s, 0, irq); - sysbus_mmio_map(s, 0, espaddr); - *reset =3D qdev_get_gpio_in(dev, 0); - *dma_enable =3D qdev_get_gpio_in(dev, 1); - - return esp; -} - static const struct SCSIBusInfo esp_scsi_info =3D { .tcq =3D false, .max_target =3D ESP_MAX_DEVS, diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 93fdace..682a0d2 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -131,11 +131,6 @@ typedef struct { #define TCHI_FAS100A 0x4 #define TCHI_AM53C974 0x12 =20 -ESPState *esp_init(hwaddr espaddr, int it_shift, - ESPDMAMemoryReadWriteFunc dma_memory_read, - ESPDMAMemoryReadWriteFunc dma_memory_write, - void *dma_opaque, qemu_irq irq, qemu_irq *reset, - qemu_irq *dma_enable); void esp_dma_enable(ESPState *s, int irq, int level); void esp_request_cancelled(SCSIRequest *req); void esp_command_complete(SCSIRequest *req, uint32_t status, size_t resid); --=20 1.8.3.1