summaryrefslogtreecommitdiff
path: root/nicintel.c
diff options
context:
space:
mode:
authorhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2014-07-19 22:03:29 +0000
committerhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2014-07-19 22:03:29 +0000
commita400554d4d2960edf16d40a4fcc8040b3e2f6d74 (patch)
tree5daecd880a16b7011be28e064fb7550f3e6b7e58 /nicintel.c
parentd61c7437f8c0aa69836cab52f4416ffcc10a4047 (diff)
downloadflashrom-a400554d4d2960edf16d40a4fcc8040b3e2f6d74.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. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1831 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'nicintel.c')
-rw-r--r--nicintel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nicintel.c b/nicintel.c
index 98ba29f..69b40d3 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -48,7 +48,7 @@ static void nicintel_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr);
static uint8_t nicintel_chip_readb(const struct flashctx *flash,
const chipaddr addr);
-static const struct par_programmer par_programmer_nicintel = {
+static const struct par_master par_master_nicintel = {
.chip_readb = nicintel_chip_readb,
.chip_readw = fallback_chip_readw,
.chip_readl = fallback_chip_readl,
@@ -103,7 +103,7 @@ int nicintel_init(void)
pci_rmmio_writew(0x0001, nicintel_control_bar + CSR_FCR);
max_rom_decode.parallel = NICINTEL_MEMMAP_SIZE;
- register_par_programmer(&par_programmer_nicintel, BUS_PARALLEL);
+ register_par_master(&par_master_nicintel, BUS_PARALLEL);
return 0;
}