Draw struct flashchip into struct flashprog_flashctx
We used to have a reference to a dynamically allocated struct flashchip
inside the flash context. But now that we only ever allocate both in one
go, we can let go of the reference and make it a single structure.
Change-Id: I857acb1def6d133a5cbc28fc7a99b7b1a22b55e0
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/494
diff --git a/memory_bus.c b/memory_bus.c
index 7219171..d90df8f 100644
--- a/memory_bus.c
+++ b/memory_bus.c
@@ -70,7 +70,7 @@
flash->virtual_registers = (chipaddr)ERROR_PTR;
const chipsize_t size = flashprog_flash_getsize(flash);
- void *const addr = programmer_map_flash_data(par, size, flash->chip->name);
+ void *const addr = programmer_map_flash_data(par, size, flash->chip.name);
if (addr == ERROR_PTR)
return 1;
@@ -97,7 +97,7 @@
void *const addr = programmer_map_flash_region(par, "flash chip registers", base, size);
if (addr == ERROR_PTR) {
msg_pdbg2("Could not map flash chip registers %s at 0x%0*" PRIxPTR ".\n",
- flash->chip->name, PRIxPTR_WIDTH, base);
+ flash->chip.name, PRIxPTR_WIDTH, base);
return 0;
}
flash->physical_registers = base;