hw/sd/sdcard: Remove sd_none enum from sd_cmd_type_t

All handlers using the 'sd_none' enum got converted,
remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-76-philmd@linaro.org>

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 10f2764a53a823fbdb1a82e8323ea29d640f848e..43f60cf089a28be46f294ebdc9cfd4384d225d78 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -524,17 +524,12 @@ static void sd_set_rca(SDState *sd, uint16_t value)
 static uint16_t sd_req_get_rca(SDState *s, SDRequest req)
 {
     switch (s->proto->cmd[req.cmd].type) {
-    case sd_none:
-        /* Called from legacy code not ported to SDProto array */
-        assert(!s->proto->cmd[req.cmd].handler);
-        /* fall-through */
     case sd_ac:
     case sd_adtc:
         return req.arg >> 16;
     case sd_spi:
-        g_assert_not_reached();
     default:
-        return 0;
+        g_assert_not_reached();
     }
 }
 

diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index 29c76935a0e4060800dadcf4425103df47a698a6..c1a35ab4209731032478e1cd7b5098041390564e 100644 (file)
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -76,7 +76,6 @@ typedef enum  {
 } sd_uhs_mode_t;
 
 typedef enum {
-    sd_none = 0,
     sd_spi,
     sd_bc,     /* broadcast -- no response */
     sd_bcr,    /* broadcast with response */