From nobody Tue Feb 10 21:40:31 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 1515699175195160.16081950302123; Thu, 11 Jan 2018 11:32:55 -0800 (PST) Received: from localhost ([::1]:36585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZias-0003zP-C4 for importer@patchew.org; Thu, 11 Jan 2018 14:32:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZiYc-0002aH-Mh for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZiYb-00058p-Hr for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:34 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:37386) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZiYb-00058B-DL for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:33 -0500 Received: by mail-qt0-x241.google.com with SMTP id f2so3234554qtj.4 for ; Thu, 11 Jan 2018 11:30:33 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id i37sm4870538qtc.80.2018.01.11.11.30.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 11:30:32 -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=WoP5cSB09nEWiQZEHx0BO+KcIvBbk2cVYdeA5YY0k8IESxRCqoI8RY70uYgnC85hAR O6oLhl4hr7owZO3XgLiOIzl7VZ3MLtPKVTI12I5GmBrBD+5QBTdXubKeK+rwctmt5A8C kiVMG5nGIro7FPJjwUoMLkivcCAdb6aTuyGwwsG05UIPkPf8UCvW9zE4dBO3qwjcvbo1 J5tYD0Ae6A7W6MwMBhx4gU0pH9a9L8j20tS3+sUTHHUsLADoQvrC2eyBfH5pIl5RB6EJ vcFbCkpxqBUA9YWNm+RGyNyy5QtR9NCnQw0dcsVUsAFpY5zevJ5/zdRUKDU1PwbCUGZ3 3tRw== 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=bf6/ZpyGUlOkvQiawNLPShSXh+/cSdgo4NbbTYj+d2nfCDd+96NMMEvDvuFFnGk2T0 AMHjlYpTdj2IrEC7hQZuhgr3d8TB5glilm7udWuV4YRAz0jrY1aYJpPe3xk3L+vlfXII TWXJfRVKBeig12XJs/ibieEnmI9rudep6HhWtQf1i6Wg2nebqrMqfJlmWH3Q/cFWqotD yzAvicSIguRA8SSt1emSIeNh/bA1E/fObGBo9eBIhWj5vfgEWRICeNo0Xco4vYWsWGwv 4OWc9yMzzH1WiK/AlS/ZZgauUDU5OUDFD9BXA3WJq3SuGZTIJ15et8Boj0UDUe5/cQGl Q/qQ== X-Gm-Message-State: AKwxyteYqguPudWuijHosF0xzoDhhhhLKIbYYFSyia9WRIUOIsH90Fms WRcIUJhe9hXcwDLvTXlxolU= X-Google-Smtp-Source: ACJfBoufgCsvZDUNiIfe/Dzs5GZl2NEhDZFiRJzm9uHBm5odlqQ2DgXlp1v29enhZBems3JKGoMH7w== X-Received: by 10.237.34.137 with SMTP id p9mr31940830qtc.194.1515699032929; Thu, 11 Jan 2018 11:30:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 11 Jan 2018 16:30:09 -0300 Message-Id: <20180111193021.17466-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111193021.17466-1-f4bug@amsat.org> References: <20180111193021.17466-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::241 Subject: [Qemu-devel] [PATCH v6 01/13] 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" , 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