ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/sd/sdcard: Introduce set_csd/set_cid handlers 

In preparation of introducing eMMC support which have
different CSD/CID structures, introduce a pair of handlers
in SDCardClass.

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-82-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-14 15:49:10 +02:00
parent f18a78de24
commit 5241b759bc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/sd/sd.c
View File

@ -680,6 +680,7 @@ static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
static void sd_reset(DeviceState *dev) static void sd_reset(DeviceState *dev)
{ {
SDState *sd = SD_CARD(dev); SDState *sd = SD_CARD(dev);
SDCardClass *sc = SD_CARD_GET_CLASS(sd);
uint64_t size; uint64_t size;
uint64_t sect; uint64_t sect;
@ -700,8 +701,8 @@ static void sd_reset(DeviceState *dev)
sd->size = size; sd->size = size;
sd_set_ocr(sd); sd_set_ocr(sd);
sd_set_scr(sd); sd_set_scr(sd);
sd_set_cid(sd); sc->set_cid(sd);
sd_set_csd(sd, size); sc->set_csd(sd, size);
sd_set_cardstatus(sd); sd_set_cardstatus(sd);
sd_set_sdstatus(sd); sd_set_sdstatus(sd);
@ -2475,6 +2476,8 @@ static void sd_class_init(ObjectClass *klass, void *data)
sc->enable = sd_enable; sc->enable = sd_enable;
sc->get_inserted = sd_get_inserted; sc->get_inserted = sd_get_inserted;
sc->get_readonly = sd_get_readonly; sc->get_readonly = sd_get_readonly;
sc->set_cid = sd_set_cid;
sc->set_csd = sd_set_csd;
sc->proto = &sd_proto_sd; sc->proto = &sd_proto_sd;
} }

2
include/hw/sd/sd.h
View File

@ -127,6 +127,8 @@ struct SDCardClass {
void (*enable)(SDState *sd, bool enable); void (*enable)(SDState *sd, bool enable);
bool (*get_inserted)(SDState *sd); bool (*get_inserted)(SDState *sd);
bool (*get_readonly)(SDState *sd); bool (*get_readonly)(SDState *sd);
void (*set_cid)(SDState *sd);
void (*set_csd)(SDState *sd, uint64_t size);
const struct SDProto *proto; const struct SDProto *proto;
}; };