aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--atahpt.c2
-rw-r--r--atapromise.c2
-rw-r--r--atavia.c2
-rw-r--r--drkaiser.c2
-rw-r--r--dummyflasher.c3
-rw-r--r--gfxnvidia.c2
-rw-r--r--internal.c2
-rw-r--r--it8212.c2
-rw-r--r--nic3com.c2
-rw-r--r--nicintel.c2
-rw-r--r--nicnatsemi.c2
-rw-r--r--nicrealtek.c2
-rw-r--r--programmer.c5
-rw-r--r--programmer.h2
-rw-r--r--satamv.c2
-rw-r--r--satasii.c2
-rw-r--r--serprog.c2
17 files changed, 21 insertions, 17 deletions
diff --git a/atahpt.c b/atahpt.c
index dae02225..620e8946 100644
--- a/atahpt.c
+++ b/atahpt.c
@@ -75,7 +75,7 @@ int atahpt_init(void)
reg32 |= (1 << 24);
rpci_write_long(dev, REG_FLASH_ACCESS, reg32);
- register_par_master(&par_master_atahpt, BUS_PARALLEL);
+ register_par_master(&par_master_atahpt, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/atapromise.c b/atapromise.c
index ab34a1ec..f32bdb49 100644
--- a/atapromise.c
+++ b/atapromise.c
@@ -140,7 +140,7 @@ int atapromise_init(void)
}
max_rom_decode.parallel = rom_size;
- register_par_master(&par_master_atapromise, BUS_PARALLEL);
+ register_par_master(&par_master_atapromise, BUS_PARALLEL, NULL);
msg_pwarn("Do not use this device as a generic programmer. It will leave anything outside\n"
"the first %zu kB of the flash chip in an undefined state. It works fine for the\n"
diff --git a/atavia.c b/atavia.c
index b407a30c..e04950a8 100644
--- a/atavia.c
+++ b/atavia.c
@@ -160,7 +160,7 @@ int atavia_init(void)
return 1;
}
- register_par_master(&lpc_master_atavia, BUS_LPC);
+ register_par_master(&lpc_master_atavia, BUS_LPC, NULL);
return 0;
}
diff --git a/drkaiser.c b/drkaiser.c
index ac49df30..fa562b4c 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -77,7 +77,7 @@ int drkaiser_init(void)
return 1;
max_rom_decode.parallel = 128 * 1024;
- register_par_master(&par_master_drkaiser, BUS_PARALLEL);
+ register_par_master(&par_master_drkaiser, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/dummyflasher.c b/dummyflasher.c
index e19e46cb..c1c393c7 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -1027,7 +1027,8 @@ dummy_init_out:
}
if (dummy_buses_supported & BUS_NONSPI)
register_par_master(&par_master_dummy,
- dummy_buses_supported & BUS_NONSPI);
+ dummy_buses_supported & BUS_NONSPI,
+ NULL);
if (dummy_buses_supported & BUS_SPI)
register_spi_master(&spi_master_dummyflasher, data);
diff --git a/gfxnvidia.c b/gfxnvidia.c
index d8ea4d68..fe6f982b 100644
--- a/gfxnvidia.c
+++ b/gfxnvidia.c
@@ -103,7 +103,7 @@ int gfxnvidia_init(void)
/* Write/erase doesn't work. */
programmer_may_write = 0;
- register_par_master(&par_master_gfxnvidia, BUS_PARALLEL);
+ register_par_master(&par_master_gfxnvidia, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/internal.c b/internal.c
index bdbe32d4..bb324358 100644
--- a/internal.c
+++ b/internal.c
@@ -335,7 +335,7 @@ int internal_init(void)
#endif /* IS_X86 */
if (internal_buses_supported & BUS_NONSPI)
- register_par_master(&par_master_internal, internal_buses_supported);
+ register_par_master(&par_master_internal, internal_buses_supported, NULL);
/* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */
if (is_laptop && !laptop_ok) {
diff --git a/it8212.c b/it8212.c
index ac53a6fc..2f2d43ea 100644
--- a/it8212.c
+++ b/it8212.c
@@ -67,7 +67,7 @@ int it8212_init(void)
rpci_write_long(dev, PCI_ROM_ADDRESS, io_base_addr | 0x01);
max_rom_decode.parallel = IT8212_MEMMAP_SIZE;
- register_par_master(&par_master_it8212, BUS_PARALLEL);
+ register_par_master(&par_master_it8212, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/nic3com.c b/nic3com.c
index b7b967a4..6ff91e72 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -120,7 +120,7 @@ int nic3com_init(void)
return 1;
max_rom_decode.parallel = 128 * 1024;
- register_par_master(&par_master_nic3com, BUS_PARALLEL);
+ register_par_master(&par_master_nic3com, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/nicintel.c b/nicintel.c
index 4672890f..afd26826 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -99,7 +99,7 @@ int nicintel_init(void)
pci_rmmio_writew(0x0001, nicintel_control_bar + CSR_FCR);
max_rom_decode.parallel = NICINTEL_MEMMAP_SIZE;
- register_par_master(&par_master_nicintel, BUS_PARALLEL);
+ register_par_master(&par_master_nicintel, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/nicnatsemi.c b/nicnatsemi.c
index 085768d6..77b54407 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -71,7 +71,7 @@ int nicnatsemi_init(void)
* functions below wants to be 0x0000FFFF.
*/
max_rom_decode.parallel = 131072;
- register_par_master(&par_master_nicnatsemi, BUS_PARALLEL);
+ register_par_master(&par_master_nicnatsemi, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/nicrealtek.c b/nicrealtek.c
index 5454b63a..2208179c 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -86,7 +86,7 @@ int nicrealtek_init(void)
if (register_shutdown(nicrealtek_shutdown, NULL))
return 1;
- register_par_master(&par_master_nicrealtek, BUS_PARALLEL);
+ register_par_master(&par_master_nicrealtek, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/programmer.c b/programmer.c
index 42ea2e3b..c276a69b 100644
--- a/programmer.c
+++ b/programmer.c
@@ -81,7 +81,8 @@ void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf,
}
int register_par_master(const struct par_master *mst,
- const enum chipbustype buses)
+ const enum chipbustype buses,
+ void *data)
{
struct registered_master rmst = {0};
@@ -96,6 +97,8 @@ int register_par_master(const struct par_master *mst,
rmst.buses_supported = buses;
rmst.par = *mst;
+ if (data)
+ rmst.par.data = data;
return register_master(&rmst);
}
diff --git a/programmer.h b/programmer.h
index 1a2e7584..ac6b0584 100644
--- a/programmer.h
+++ b/programmer.h
@@ -747,7 +747,7 @@ struct par_master {
void (*chip_readn) (const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len);
void *data;
};
-int register_par_master(const struct par_master *mst, const enum chipbustype buses);
+int register_par_master(const struct par_master *mst, const enum chipbustype buses, void *data);
struct registered_master {
enum chipbustype buses_supported;
struct {
diff --git a/satamv.c b/satamv.c
index 31265eab..2640b784 100644
--- a/satamv.c
+++ b/satamv.c
@@ -148,7 +148,7 @@ int satamv_init(void)
/* 512 kByte with two 8-bit latches, and
* 4 MByte with additional 3-bit latch. */
max_rom_decode.parallel = 4 * 1024 * 1024;
- register_par_master(&par_master_satamv, BUS_PARALLEL);
+ register_par_master(&par_master_satamv, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/satasii.c b/satasii.c
index 8a0938d6..c9dfdadb 100644
--- a/satasii.c
+++ b/satasii.c
@@ -100,7 +100,7 @@ int satasii_init(void)
if ((id != 0x0680) && (!(pci_mmio_readl(sii_bar) & (1 << 26))))
msg_pwarn("Warning: Flash seems unconnected.\n");
- register_par_master(&par_master_satasii, BUS_PARALLEL);
+ register_par_master(&par_master_satasii, BUS_PARALLEL, NULL);
return 0;
}
diff --git a/serprog.c b/serprog.c
index 056d8d1a..e6028aab 100644
--- a/serprog.c
+++ b/serprog.c
@@ -885,7 +885,7 @@ int serprog_init(void)
if (serprog_buses_supported & BUS_SPI)
register_spi_master(&spi_master_serprog, NULL);
if (serprog_buses_supported & BUS_NONSPI)
- register_par_master(&par_master_serprog, serprog_buses_supported & BUS_NONSPI);
+ register_par_master(&par_master_serprog, serprog_buses_supported & BUS_NONSPI, NULL);
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 15:29:53 +0000