path: root/flash.h
diff options
authorCarl-Daniel Hailfinger <>2014-07-19 22:03:29 +0000
committerCarl-Daniel Hailfinger <>2014-07-19 22:03:29 +0000
commita5bcbceb581f27cfc0055369d3dd9cfd1ae00bfa (patch)
tree5daecd880a16b7011be28e064fb7550f3e6b7e58 /flash.h
parent82b6ec1df30d3fca55547f230c76718d6e613b2a (diff)
Rename programmer registration functions
Register_programmer suggests that we register a programmer. However, that function registers a master for a given bus type, and a programmer may support multiple masters (e.g. SPI, FWH). Rename a few other functions to be more consistent. Corresponding to flashrom svn r1831. Signed-off-by: Carl-Daniel Hailfinger <> Acked-by: Stefan Tauner <>
Diffstat (limited to 'flash.h')
1 files changed, 2 insertions, 2 deletions
diff --git a/flash.h b/flash.h
index c2de2d0..aa01ccf 100644
--- a/flash.h
+++ b/flash.h
@@ -212,7 +212,7 @@ struct flashctx {
chipaddr virtual_memory;
/* Some flash devices have an additional register space. */
chipaddr virtual_registers;
- struct registered_programmer *pgm;
+ struct registered_master *mst;
/* Timing used in probe routines. ZERO is -2 to differentiate between an unset
@@ -258,7 +258,7 @@ extern const char *chip_to_probe;
void map_flash_registers(struct flashctx *flash);
int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
int erase_flash(struct flashctx *flash);
-int probe_flash(struct registered_programmer *pgm, int startchip, struct flashctx *fill_flash, int force);
+int probe_flash(struct registered_master *mst, int startchip, struct flashctx *fill_flash, int force);
int read_flash_to_file(struct flashctx *flash, const char *filename);
char *extract_param(const char *const *haystack, const char *needle, const char *delim);
int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len);
OpenPOWER on IntegriCloud