mirror of
https://review.coreboot.org/flashrom.git
synced 2025-05-01 00:43:40 +02:00
programmer: Make use of new register_par_master() API
Pass pointers to dynamically allocated data to register_par_master(). This way we can avoid a mutable global. BUG=b:185191942 TEST=builds Change-Id: I76572e43d01f8a5e1aa73b1b9e8a187465ed8fef Signed-off-by: Anastasia Klimchuk <aklm@chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54172 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
parent
9a2f91d7eb
commit
c49aaeef77
@ -622,7 +622,7 @@ static const struct spi_master spi_master_dummyflasher = {
|
|||||||
.write_aai = default_spi_write_aai,
|
.write_aai = default_spi_write_aai,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct par_master par_master_dummy = {
|
static const struct par_master par_master_dummy = {
|
||||||
.chip_readb = dummy_chip_readb,
|
.chip_readb = dummy_chip_readb,
|
||||||
.chip_readw = dummy_chip_readw,
|
.chip_readw = dummy_chip_readw,
|
||||||
.chip_readl = dummy_chip_readl,
|
.chip_readl = dummy_chip_readl,
|
||||||
@ -674,7 +674,6 @@ int dummy_init(void)
|
|||||||
}
|
}
|
||||||
data->emu_chip = EMULATE_NONE;
|
data->emu_chip = EMULATE_NONE;
|
||||||
data->delay_us = 0;
|
data->delay_us = 0;
|
||||||
par_master_dummy.data = data;
|
|
||||||
|
|
||||||
msg_pspew("%s\n", __func__);
|
msg_pspew("%s\n", __func__);
|
||||||
|
|
||||||
@ -1028,7 +1027,7 @@ dummy_init_out:
|
|||||||
if (dummy_buses_supported & BUS_NONSPI)
|
if (dummy_buses_supported & BUS_NONSPI)
|
||||||
register_par_master(&par_master_dummy,
|
register_par_master(&par_master_dummy,
|
||||||
dummy_buses_supported & BUS_NONSPI,
|
dummy_buses_supported & BUS_NONSPI,
|
||||||
NULL);
|
data);
|
||||||
if (dummy_buses_supported & BUS_SPI)
|
if (dummy_buses_supported & BUS_SPI)
|
||||||
register_spi_master(&spi_master_dummyflasher, data);
|
register_spi_master(&spi_master_dummyflasher, data);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user