| Message ID | 20180216022933.10945-7-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | SDHCI: convert legacy devices to the SDBus API (part 6) | expand |
On Thu, Feb 15, 2018 at 6:29 PM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > It belongs to the legacy API (the last user has been converted). > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > include/hw/sd/sd.h | 1 - > hw/sd/sd.c | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h > index bf1eb0713c..4491db98de 100644 > --- a/include/hw/sd/sd.h > +++ b/include/hw/sd/sd.h > @@ -138,7 +138,6 @@ int sd_do_command(SDState *sd, SDRequest *req, > void sd_write_data(SDState *sd, uint8_t value); > uint8_t sd_read_data(SDState *sd); > void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); > -bool sd_data_ready(SDState *sd); > /* sd_enable should not be used -- it is only used on the nseries boards, > * where it is part of a broken implementation of the MMC card slot switch > * (there should be two card slots which are multiplexed to a single MMC > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 9ac9b63ff8..72d32f7845 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -1885,7 +1885,7 @@ uint8_t sd_read_data(SDState *sd) > return ret; > } > > -bool sd_data_ready(SDState *sd) > +static bool sd_data_ready(SDState *sd) > { > return sd->state == sd_sendingdata_state; > } > -- > 2.16.1 > >
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index bf1eb0713c..4491db98de 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -138,7 +138,6 @@ int sd_do_command(SDState *sd, SDRequest *req, void sd_write_data(SDState *sd, uint8_t value); uint8_t sd_read_data(SDState *sd); void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); -bool sd_data_ready(SDState *sd); /* sd_enable should not be used -- it is only used on the nseries boards, * where it is part of a broken implementation of the MMC card slot switch * (there should be two card slots which are multiplexed to a single MMC diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9ac9b63ff8..72d32f7845 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1885,7 +1885,7 @@ uint8_t sd_read_data(SDState *sd) return ret; } -bool sd_data_ready(SDState *sd) +static bool sd_data_ready(SDState *sd) { return sd->state == sd_sendingdata_state; }
It belongs to the legacy API (the last user has been converted). Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/sd/sd.h | 1 - hw/sd/sd.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)