From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Bin Meng" <bin.meng@windriver.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-block@nongnu.org
Subject: [PULL 04/18] hw/sd: Introduce receive_ready() callback
Date: Sat, 20 Feb 2021 01:12:55 +0100 [thread overview]
Message-ID: <20210220001309.2225022-5-f4bug@amsat.org> (raw)
In-Reply-To: <20210220001309.2225022-1-f4bug@amsat.org>
From: Bin Meng <bin.meng@windriver.com>
At present there is a data_ready() callback for the SD data read
path. Let's add a receive_ready() for the SD data write path.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20210128063035.15674-5-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/hw/sd/sd.h | 2 ++
hw/sd/core.c | 13 +++++++++++++
hw/sd/sd.c | 6 ++++++
3 files changed, 21 insertions(+)
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index 05ef9b73e56..47360ba4ee9 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -116,6 +116,7 @@ struct SDCardClass {
* Return: byte value read
*/
uint8_t (*read_byte)(SDState *sd);
+ bool (*receive_ready)(SDState *sd);
bool (*data_ready)(SDState *sd);
void (*set_voltage)(SDState *sd, uint16_t millivolts);
uint8_t (*get_dat_lines)(SDState *sd);
@@ -187,6 +188,7 @@ void sdbus_write_data(SDBus *sdbus, const void *buf, size_t length);
* Read multiple bytes of data on the data lines of a SD bus.
*/
void sdbus_read_data(SDBus *sdbus, void *buf, size_t length);
+bool sdbus_receive_ready(SDBus *sd);
bool sdbus_data_ready(SDBus *sd);
bool sdbus_get_inserted(SDBus *sd);
bool sdbus_get_readonly(SDBus *sd);
diff --git a/hw/sd/core.c b/hw/sd/core.c
index 08c93b59034..30ee62c5106 100644
--- a/hw/sd/core.c
+++ b/hw/sd/core.c
@@ -160,6 +160,19 @@ void sdbus_read_data(SDBus *sdbus, void *buf, size_t length)
}
}
+bool sdbus_receive_ready(SDBus *sdbus)
+{
+ SDState *card = get_card(sdbus);
+
+ if (card) {
+ SDCardClass *sc = SD_CARD_GET_CLASS(card);
+
+ return sc->receive_ready(card);
+ }
+
+ return false;
+}
+
bool sdbus_data_ready(SDBus *sdbus)
{
SDState *card = get_card(sdbus);
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 5de9e0a6c20..172e83f99d9 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -2037,6 +2037,11 @@ uint8_t sd_read_byte(SDState *sd)
return ret;
}
+static bool sd_receive_ready(SDState *sd)
+{
+ return sd->state == sd_receivingdata_state;
+}
+
static bool sd_data_ready(SDState *sd)
{
return sd->state == sd_sendingdata_state;
@@ -2147,6 +2152,7 @@ static void sd_class_init(ObjectClass *klass, void *data)
sc->do_command = sd_do_command;
sc->write_byte = sd_write_byte;
sc->read_byte = sd_read_byte;
+ sc->receive_ready = sd_receive_ready;
sc->data_ready = sd_data_ready;
sc->enable = sd_enable;
sc->get_inserted = sd_get_inserted;
--
2.26.2
next prev parent reply other threads:[~2021-02-20 0:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-20 0:12 [PULL 00/18] SD/MMC patches for 2021-02-20 Philippe Mathieu-Daudé
2021-02-20 0:12 ` [PULL 01/18] hw/sd: ssi-sd: Support multiple block read Philippe Mathieu-Daudé
2021-02-20 0:12 ` [PULL 02/18] hw/sd: sd: Remove duplicated codes in single/multiple block read/write Philippe Mathieu-Daudé
2021-02-20 0:12 ` [PULL 03/18] hw/sd: sd: Allow single/multiple block write for SPI mode Philippe Mathieu-Daudé
2021-02-20 0:12 ` Philippe Mathieu-Daudé [this message]
2021-02-20 0:12 ` [PULL 05/18] hw/sd: ssi-sd: Support single block write Philippe Mathieu-Daudé
2021-02-20 0:12 ` [PULL 06/18] hw/sd: ssi-sd: Support multiple " Philippe Mathieu-Daudé
2021-02-20 0:12 ` [PULL 07/18] hw/sd: ssi-sd: Fix SEND_IF_COND (CMD8) response Philippe Mathieu-Daudé
2021-02-20 0:12 ` [PULL 08/18] hw/sd: ssi-sd: Fix STOP_TRANSMISSION (CMD12) response Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 09/18] hw/sd: ssi-sd: Handle the rest commands with R1b response type Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 10/18] hw/sd: sd: Fix address check in sd_erase() Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 11/18] hw/sd: sd: Only SDSC cards support CMD28/29/30 Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 12/18] hw/sd: sd: Fix CMD30 response type Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 13/18] hw/sd: sd: Move the sd_block_{read, write} and macros ahead Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 14/18] hw/sd: sd: Skip write protect groups check in sd_erase() for high capacity cards Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 15/18] hw/sd: sd: Skip write protect groups check in CMD24/25 " Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 16/18] hw/sd: sd: Bypass the RCA check for CMD13 in SPI mode Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 17/18] hw/sd: sdhci: Simplify updating s->prnsts in sdhci_sdma_transfer_multi_blocks() Philippe Mathieu-Daudé
2021-02-20 0:13 ` [PULL 18/18] MAINTAINERS: Add Bin Meng as co-maintainer for SD/MMC cards Philippe Mathieu-Daudé
2021-02-21 11:45 ` [PULL 00/18] SD/MMC patches for 2021-02-20 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210220001309.2225022-5-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alistair.francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).