motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/sd: Remove unused SDState::enable

Browse source 
Now that sd_enable() has been removed, SD::enable is set to true in
sd_instance_init() and then never changed. So we can remove it.

Note that the VMSTATE_UNUSED() size argument should be '1', not
'sizeof(bool)', as noted in the CAUTION comment in vmstate.h.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250128104519.3981448-12-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Peter Maydell 2025-01-28 10:45:19 +00:00 • committed by Philippe Mathieu-Daudé
parent bda21477f5
commit aa0cbf85f3
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/sd/sd.c
View file

@ -173,7 +173,6 @@ struct SDState {
size_t data_size; size_t data_size;
uint8_t data[512]; uint8_t data[512];
QEMUTimer *ocr_power_timer; QEMUTimer *ocr_power_timer;
bool enable;
uint8_t dat_lines; uint8_t dat_lines;
bool cmd_line; bool cmd_line;
}; };
@ -292,12 +291,12 @@ static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
static uint8_t sd_get_dat_lines(SDState *sd) static uint8_t sd_get_dat_lines(SDState *sd)
{ {
return sd->enable ? sd->dat_lines : 0; return sd->dat_lines;
} }
static bool sd_get_cmd_line(SDState *sd) static bool sd_get_cmd_line(SDState *sd)
{ {
return sd->enable ? sd->cmd_line : false; return sd->cmd_line;
} }
static void sd_set_voltage(SDState *sd, uint16_t millivolts) static void sd_set_voltage(SDState *sd, uint16_t millivolts)
@ -976,7 +975,7 @@ static const VMStateDescription sd_vmstate = {
VMSTATE_UINT32(data_offset, SDState), VMSTATE_UINT32(data_offset, SDState),
VMSTATE_UINT8_ARRAY(data, SDState, 512), VMSTATE_UINT8_ARRAY(data, SDState, 512),
VMSTATE_UNUSED_V(1, 512), VMSTATE_UNUSED_V(1, 512),
VMSTATE_BOOL(enable, SDState), VMSTATE_UNUSED(1),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
.subsections = (const VMStateDescription * const []) { .subsections = (const VMStateDescription * const []) {
@ -2146,7 +2145,7 @@ static int sd_do_command(SDState *sd, SDRequest *req,
sd_rsp_type_t rtype; sd_rsp_type_t rtype;
int rsplen; int rsplen;
if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable) { if (!sd->blk || !blk_is_inserted(sd->blk)) {
return 0; return 0;
} }
@ -2297,8 +2296,9 @@ static void sd_write_byte(SDState *sd, uint8_t value)
{ {
int i; int i;
if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable) if (!sd->blk || !blk_is_inserted(sd->blk)) {
return; return;
}
if (sd->state != sd_receivingdata_state) { if (sd->state != sd_receivingdata_state) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
@ -2429,8 +2429,9 @@ static uint8_t sd_read_byte(SDState *sd)
uint8_t ret; uint8_t ret;
uint32_t io_len; uint32_t io_len;
if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable) if (!sd->blk || !blk_is_inserted(sd->blk)) {
return dummy_byte; return dummy_byte;
}
if (sd->state != sd_sendingdata_state) { if (sd->state != sd_sendingdata_state) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
@ -2664,7 +2665,6 @@ static void sd_instance_init(Object *obj)
sd->proto = sc->proto; sd->proto = sc->proto;
sd->last_cmd_name = "UNSET"; sd->last_cmd_name = "UNSET";
sd->enable = true;
sd->ocr_power_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sd_ocr_powerup, sd); sd->ocr_power_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sd_ocr_powerup, sd);
} }