From nobody Tue Oct 28 04:17:48 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515003180252654.4468238362653; Wed, 3 Jan 2018 10:13:00 -0800 (PST) Received: from localhost ([::1]:60043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnX9-0003mG-Cy for importer@patchew.org; Wed, 03 Jan 2018 13:12:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSc-0000AS-9Y for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSb-0006t8-6W for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:18 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:42895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSb-0006su-1i for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:17 -0500 Received: by mail-qt0-x244.google.com with SMTP id g9so3106807qth.9 for ; Wed, 03 Jan 2018 10:08:17 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:15 -0800 (PST) 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=H55m8SAxQCZteXEHo639T3ncP9waoJie0p/fu8nR8T8=; b=Yp/a0dSNFgdspuB6ZrrKCeu5Bgle7xbTyzgK/tC/LkqK4d1MNwlHOcU1GrqNzccwas cmwAmel3RRDaAUZO8hWfi2+N7SyImZKy4HPzpS6+uPs/Dieff0Rx2UFBZk1yYlfuok4j B0xIW3fdCL3yk0k38r/ouOAiUSv/rxMeh+nJYPPuNfYzSNt81VuGI1KSvaMomLYaFl8m HG5mtx1xAtiIyXfceH2CB/ltNfzpmqVBDZWT8F9bG9Ng++ACJmYyKqHEbETEPljPjlV/ 756VmDqSZgchy1hOJK7vvCILOVlnZpH7zHuRCW9uMvX9tsIjpdCVQl48T4jcn3PVWRC1 AyIA== 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=H55m8SAxQCZteXEHo639T3ncP9waoJie0p/fu8nR8T8=; b=GAQmulM0sA8kBg5HQfbIvlaA1g8Bfr5kXC29DHzHpgvynLzoHENnb7ZNBvkv5ZbR/m RMTG0V6QjoJwn7thmZCU1Qdd4+t8IQfGtDIw7rzqTgzUXphx6oOhuUBZwsgbGRCFxDkP 73xe/EHbbkiIKaIxg2Jc7c4RKhC3AHaslShkk8zqfkeOmXVxZ1HVZecSEIQikp515M7N KIRHNgjrnHVYvvCAvLCY+8khlCdbM4IYXVNKmRFERHhU9W/LLJBesFv3B76SfSvmA8od hf9GKiIoQyHoKNJWR3h0P+92T2WQVhUfx66M2eMs34L9lE6RYbEpTXAhgiC/m0aRzRUA Y4YQ== X-Gm-Message-State: AKGB3mLd9LDuL+z0CdnOglZVhZPoKfQix9HapMhoZacs6utSy60tMP5h 2pLlptoU0gX/iLJH+EQLJfY= X-Google-Smtp-Source: ACJfBou2x/gWISwfPod595UrZ4Z6fGe/7cCKEnaqnEU9/moKkDM5My2R7kaVpskCCA2qQYQgZZ120A== X-Received: by 10.200.46.50 with SMTP id r47mr2793874qta.314.1515002896594; Wed, 03 Jan 2018 10:08:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:49 -0300 Message-Id: <20180103180805.18140-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-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:c0d::244 Subject: [Qemu-devel] [PATCH v5 01/17] sdhci: clean up includes 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: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 4 ---- include/hw/sd/sdhci.h | 7 ++++++- hw/sd/sdhci.c | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 161177cf39..248fd027f9 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -24,8 +24,6 @@ #ifndef SDHCI_INTERNAL_H #define SDHCI_INTERNAL_H =20 -#include "hw/sd/sdhci.h" - /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 =20 @@ -227,6 +225,4 @@ enum { sdhc_gap_write =3D 2 /* SDHC stopped at block gap during write oper= ation */ }; =20 -extern const VMStateDescription sdhci_vmstate; - #endif diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 0f0c3f1e64..1335373d3c 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -26,17 +26,19 @@ #define SDHCI_H =20 #include "qemu-common.h" -#include "hw/block/block.h" #include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/sd/sd.h" =20 /* SD/MMC host controller state */ typedef struct SDHCIState { + /*< private >*/ union { PCIDevice pcidev; SysBusDevice busdev; }; + + /*< public >*/ SDBus sdbus; MemoryRegion iomem; =20 @@ -46,6 +48,7 @@ typedef struct SDHCIState { qemu_irq ro_cb; qemu_irq irq; =20 + /* Registers cleared on reset */ uint32_t sdmasysad; /* SDMA System Address register */ uint16_t blksize; /* Host DMA Buff Boundary and Transfer BlkSize = Reg */ uint16_t blkcnt; /* Blocks count for current transfer */ @@ -70,8 +73,10 @@ typedef struct SDHCIState { uint16_t acmd12errsts; /* Auto CMD12 error status register */ uint64_t admasysaddr; /* ADMA System Address Register */ =20 + /* Read-only registers */ uint32_t capareg; /* Capabilities Register */ uint32_t maxcurr; /* Maximum Current Capabilities Register */ + uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; uint16_t data_count; /* current element in FIFO buffer */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b064a087c9..b7d2a20985 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -29,6 +29,7 @@ #include "sysemu/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" =20 --=20 2.15.1