hw/sd/sdcard: Factor spi_cmd_SEND_CxD() out

philmd · philmd · commit 7574baef43f0 · 2025-08-05T16:05:56.000+02:00
spi_cmd_SEND_CSD() and spi_cmd_SEND_CID() are very
similar. Factor the common code as spi_cmd_SEND_CxD().

Signed-off-by: Philippe Mathieu-Daudé &lt;philmd@linaro.org&gt;
Acked-by: Richard Henderson &lt;richard.henderson@linaro.org&gt;
Message-Id: &lt;20250804133406.17456-9-philmd@linaro.org&gt;
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
@@ -1588,14 +1588,19 @@ static sd_rsp_type_t emmc_cmd_SEND_EXT_CSD(SDState *sd, SDRequest req)
                                  sd->ext_csd, sizeof(sd->ext_csd));
 }
 
-/* CMD9 */
-static sd_rsp_type_t spi_cmd_SEND_CSD(SDState *sd, SDRequest req)
+static sd_rsp_type_t spi_cmd_SEND_CxD(SDState *sd, SDRequest req,
+                                      const void *data, size_t size)
 {
     if (sd->state != sd_standby_state) {
         return sd_invalid_state_for_cmd(sd, req);
     }
-    return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req),
-                                 sd->csd, 16);
+    return sd_cmd_to_sendingdata(sd, req, 0, data, size);
+}
+
+/* CMD9 */
+static sd_rsp_type_t spi_cmd_SEND_CSD(SDState *sd, SDRequest req)
+{
+    return spi_cmd_SEND_CxD(sd, req, sd->csd, sizeof(sd->csd));
 }
 
 static sd_rsp_type_t sd_cmd_SEND_CSD(SDState *sd, SDRequest req)
@@ -1610,11 +1615,7 @@ static sd_rsp_type_t sd_cmd_SEND_CSD(SDState *sd, SDRequest req)
 /* CMD10 */
 static sd_rsp_type_t spi_cmd_SEND_CID(SDState *sd, SDRequest req)
 {
-    if (sd->state != sd_standby_state) {
-        return sd_invalid_state_for_cmd(sd, req);
-    }
-    return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req),
-                                 sd->cid, 16);
+    return spi_cmd_SEND_CxD(sd, req, sd->cid, sizeof(sd->cid));
 }
 
 static sd_rsp_type_t sd_cmd_SEND_CID(SDState *sd, SDRequest req)

Original file line number	Diff line number	Diff line change
`@@ -1588,14 +1588,19 @@ static sd_rsp_type_t emmc_cmd_SEND_EXT_CSD(SDState *sd, SDRequest req)`
`1588`	`1588`	`sd->ext_csd, sizeof(sd->ext_csd));`
`1589`	`1589`	`}`
`1590`	`1590`
`1591`		`-/* CMD9 */`
`1592`		`-static sd_rsp_type_t spi_cmd_SEND_CSD(SDState *sd, SDRequest req)`
	`1591`	`+static sd_rsp_type_t spi_cmd_SEND_CxD(SDState *sd, SDRequest req,`
	`1592`	`+ const void *data, size_t size)`
`1593`	`1593`	`{`
`1594`	`1594`	`if (sd->state != sd_standby_state) {`
`1595`	`1595`	`return sd_invalid_state_for_cmd(sd, req);`
`1596`	`1596`	`}`
`1597`		`- return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req),`
`1598`		`- sd->csd, 16);`
	`1597`	`+ return sd_cmd_to_sendingdata(sd, req, 0, data, size);`
	`1598`	`+}`
	`1599`	`+`
	`1600`	`+/* CMD9 */`
	`1601`	`+static sd_rsp_type_t spi_cmd_SEND_CSD(SDState *sd, SDRequest req)`
	`1602`	`+{`
	`1603`	`+ return spi_cmd_SEND_CxD(sd, req, sd->csd, sizeof(sd->csd));`
`1599`	`1604`	`}`
`1600`	`1605`
`1601`	`1606`	`static sd_rsp_type_t sd_cmd_SEND_CSD(SDState *sd, SDRequest req)`
`@@ -1610,11 +1615,7 @@ static sd_rsp_type_t sd_cmd_SEND_CSD(SDState *sd, SDRequest req)`
`1610`	`1615`	`/* CMD10 */`
`1611`	`1616`	`static sd_rsp_type_t spi_cmd_SEND_CID(SDState *sd, SDRequest req)`
`1612`	`1617`	`{`
`1613`		`- if (sd->state != sd_standby_state) {`
`1614`		`- return sd_invalid_state_for_cmd(sd, req);`
`1615`		`- }`
`1616`		`- return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req),`
`1617`		`- sd->cid, 16);`
	`1618`	`+ return spi_cmd_SEND_CxD(sd, req, sd->cid, sizeof(sd->cid));`
`1618`	`1619`	`}`
`1619`	`1620`
`1620`	`1621`	`static sd_rsp_type_t sd_cmd_SEND_CID(SDState *sd, SDRequest req)`