memory_bus: Pass master instead of flash to .chip_read/write
There is / should be no need to know flash-chip details in a programmer
driver. They should only pass data around and leave the chip details to
each chip driver.
This will allow us to probe for chips before knowing the details and as
a bonus gets rid of many `flash.h` dependencies.
Change-Id: Iae78fbbd95567134da890613114999cb14c3a011
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/437
diff --git a/gfxnvidia.c b/gfxnvidia.c
index c3e08d8..1fba838 100644
--- a/gfxnvidia.c
+++ b/gfxnvidia.c
@@ -17,7 +17,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include "flash.h"
#include "programmer.h"
#include "hwaccess_physmap.h"
#include "platform/pci.h"
@@ -60,10 +59,8 @@
{0},
};
-static void gfxnvidia_chip_writeb(const struct flashctx *flash, uint8_t val,
- chipaddr addr);
-static uint8_t gfxnvidia_chip_readb(const struct flashctx *flash,
- const chipaddr addr);
+static void gfxnvidia_chip_writeb(const struct par_master *, uint8_t val, chipaddr);
+static uint8_t gfxnvidia_chip_readb(const struct par_master *, chipaddr);
static const struct par_master par_master_gfxnvidia = {
.chip_readb = gfxnvidia_chip_readb,
.chip_readw = fallback_chip_readw,
@@ -105,14 +102,12 @@
return register_par_master(&par_master_gfxnvidia, BUS_PARALLEL, 0, 0, NULL);
}
-static void gfxnvidia_chip_writeb(const struct flashctx *flash, uint8_t val,
- chipaddr addr)
+static void gfxnvidia_chip_writeb(const struct par_master *par, uint8_t val, chipaddr addr)
{
pci_mmio_writeb(val, nvidia_bar + (addr & GFXNVIDIA_MEMMAP_MASK));
}
-static uint8_t gfxnvidia_chip_readb(const struct flashctx *flash,
- const chipaddr addr)
+static uint8_t gfxnvidia_chip_readb(const struct par_master *par, const chipaddr addr)
{
return pci_mmio_readb(nvidia_bar + (addr & GFXNVIDIA_MEMMAP_MASK));
}