| Message ID | 20180215221325.7611-21-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | SDCard: bugfixes, support UHS-I (part 5) | expand |
On 15 February 2018 at 22:13, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > So far this device intends to model the Spec v1.10 > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> > --- > hw/sd/sd.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index b9429b06ca..d4565626ce 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -47,6 +47,11 @@ > > //#define DEBUG_SD 1 > > +typedef enum { > + SD_PHY_SPEC_VER_1_10 = 110, > + SD_PHY_SPEC_VER_2_00 = 200, /* not yet supported */ > +} sd_phy_spec_ver_t; > + > typedef enum { > sd_r0 = 0, /* no response */ > sd_r1, /* normal response command */ > @@ -122,6 +127,7 @@ struct SDState { > qemu_irq inserted_cb; > QEMUTimer *ocr_power_timer; > const char *proto_name; > + int spec_version; > bool enable; > uint8_t dat_lines; > bool cmd_line; > @@ -2169,6 +2175,7 @@ static void sd_realize(DeviceState *dev, Error **errp) > int ret; > > sd->proto_name = sd->spi ? "SPI" : "SD"; > + sd->spec_version = SD_PHY_SPEC_VER_1_10; > > if (sd->blk && blk_is_read_only(sd->blk)) { > error_setg(errp, "Cannot use read-only drive as SD card"); I think I'd prefer to see this patch with the ones that actually use the field -- as it stands it's never used. thanks -- PMM
On 02/22/2018 11:26 AM, Peter Maydell wrote: > On 15 February 2018 at 22:13, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: >> So far this device intends to model the Spec v1.10 >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> >> --- >> hw/sd/sd.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/hw/sd/sd.c b/hw/sd/sd.c >> index b9429b06ca..d4565626ce 100644 >> --- a/hw/sd/sd.c >> +++ b/hw/sd/sd.c >> @@ -47,6 +47,11 @@ >> >> //#define DEBUG_SD 1 >> >> +typedef enum { >> + SD_PHY_SPEC_VER_1_10 = 110, >> + SD_PHY_SPEC_VER_2_00 = 200, /* not yet supported */ >> +} sd_phy_spec_ver_t; >> + >> typedef enum { >> sd_r0 = 0, /* no response */ >> sd_r1, /* normal response command */ >> @@ -122,6 +127,7 @@ struct SDState { >> qemu_irq inserted_cb; >> QEMUTimer *ocr_power_timer; >> const char *proto_name; >> + int spec_version; >> bool enable; >> uint8_t dat_lines; >> bool cmd_line; >> @@ -2169,6 +2175,7 @@ static void sd_realize(DeviceState *dev, Error **errp) >> int ret; >> >> sd->proto_name = sd->spi ? "SPI" : "SD"; >> + sd->spec_version = SD_PHY_SPEC_VER_1_10; >> >> if (sd->blk && blk_is_read_only(sd->blk)) { >> error_setg(errp, "Cannot use read-only drive as SD card"); > > I think I'd prefer to see this patch with the ones that actually use > the field -- as it stands it's never used. Indeed I see, thanks.
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b9429b06ca..d4565626ce 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -47,6 +47,11 @@ //#define DEBUG_SD 1 +typedef enum { + SD_PHY_SPEC_VER_1_10 = 110, + SD_PHY_SPEC_VER_2_00 = 200, /* not yet supported */ +} sd_phy_spec_ver_t; + typedef enum { sd_r0 = 0, /* no response */ sd_r1, /* normal response command */ @@ -122,6 +127,7 @@ struct SDState { qemu_irq inserted_cb; QEMUTimer *ocr_power_timer; const char *proto_name; + int spec_version; bool enable; uint8_t dat_lines; bool cmd_line; @@ -2169,6 +2175,7 @@ static void sd_realize(DeviceState *dev, Error **errp) int ret; sd->proto_name = sd->spi ? "SPI" : "SD"; + sd->spec_version = SD_PHY_SPEC_VER_1_10; if (sd->blk && blk_is_read_only(sd->blk)) { error_setg(errp, "Cannot use read-only drive as SD card");