On 6/24/21 4:22 PM, Philippe Mathieu-Daudé wrote: > Add 2 command handler arrays in SDProto, for CMD and ACMD. > Have sd_normal_command() / sd_app_command() use these arrays: > if an command handler is registered, call it, otherwise fall > back to current code base. > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > hw/sd/sd.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index a1cc8ab0be8..ce1eec0374f 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -88,8 +88,12 @@ enum SDCardStates { > sd_disconnect_state, > }; > > +typedef sd_rsp_type_t (*sd_cmd_handler)(SDState *sd, SDRequest req); > + > typedef struct SDProto { > const char *name; > + sd_cmd_handler cmd[SDMMC_CMD_MAX]; > + sd_cmd_handler acmd[SDMMC_CMD_MAX]; > } SDProto;
A class would be better but it's no big deal for the moment. > > struct SDState { > @@ -994,6 +998,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, > SDRequest req) > return sd_illegal; > } > > + if (sd->proto->cmd[req.cmd]) { > + return sd->proto->cmd[req.cmd](sd, req); > + } > + I expect that some default array will be used to initialize ->cmd ? Thanks, C. > switch (req.cmd) { > /* Basic commands (Class 0 and Class 1) */ > case 0: /* CMD0: GO_IDLE_STATE */ > @@ -1533,6 +1541,11 @@ static sd_rsp_type_t sd_app_command(SDState *sd, > trace_sdcard_app_command(sd->proto->name, sd_acmd_name(req.cmd), > req.cmd, req.arg, sd_state_name(sd->state)); > sd->card_status |= APP_CMD; > + > + if (sd->proto->acmd[req.cmd]) { > + return sd->proto->acmd[req.cmd](sd, req); > + } > + > switch (req.cmd) { > case 6: /* ACMD6: SET_BUS_WIDTH */ > if (sd->spi) { >