diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2014-07-19 22:03:29 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2014-07-19 22:03:29 +0000 |
| commit | a5bcbceb581f27cfc0055369d3dd9cfd1ae00bfa (patch) | |
| tree | 5daecd880a16b7011be28e064fb7550f3e6b7e58 /dummyflasher.c | |
| parent | 82b6ec1df30d3fca55547f230c76718d6e613b2a (diff) | |
| download | ast2050-flashrom-a5bcbceb581f27cfc0055369d3dd9cfd1ae00bfa.zip ast2050-flashrom-a5bcbceb581f27cfc0055369d3dd9cfd1ae00bfa.tar.gz | |
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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'dummyflasher.c')
| -rw-r--r-- | dummyflasher.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/dummyflasher.c b/dummyflasher.c index f0095d1..46c540a 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -109,7 +109,7 @@ static uint16_t dummy_chip_readw(const struct flashctx *flash, const chipaddr ad static uint32_t dummy_chip_readl(const struct flashctx *flash, const chipaddr addr); static void dummy_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); -static const struct spi_programmer spi_programmer_dummyflasher = { +static const struct spi_master spi_master_dummyflasher = { .type = SPI_CONTROLLER_DUMMY, .max_data_read = MAX_DATA_READ_UNLIMITED, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -120,7 +120,7 @@ static const struct spi_programmer spi_programmer_dummyflasher = { .write_aai = default_spi_write_aai, }; -static const struct par_programmer par_programmer_dummy = { +static const struct par_master par_master_dummy = { .chip_readb = dummy_chip_readb, .chip_readw = dummy_chip_readw, .chip_readl = dummy_chip_readl, @@ -395,12 +395,10 @@ dummy_init_out: return 1; } if (dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH)) - register_par_programmer(&par_programmer_dummy, - dummy_buses_supported & - (BUS_PARALLEL | BUS_LPC | - BUS_FWH)); + register_par_master(&par_master_dummy, + dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH)); if (dummy_buses_supported & BUS_SPI) - register_spi_programmer(&spi_programmer_dummyflasher); + register_spi_master(&spi_master_dummyflasher); return 0; } |
