[flashrom] [PATCH] Rename programmer registration functions

Carl-Daniel Hailfinger c-d.hailfinger.devel.2006 at gmx.net
Wed Aug 29 02:06:11 CEST 2012 

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 at gmx.net>

Index: flashrom-rename_register_programmer_register_master/ogp_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/ogp_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/ogp_spi.c	(Arbeitskopie)
@@ -140,7 +140,7 @@
 	if (register_shutdown(ogp_spi_shutdown, NULL))
 		return 1;
 
-	if (bitbang_spi_init(&bitbang_spi_master_ogp))
+	if (register_spi_bitbang_master(&bitbang_spi_master_ogp))
 		return 1;
 
 	return 0;
Index: flashrom-rename_register_programmer_register_master/flash.h
===================================================================
--- flashrom-rename_register_programmer_register_master/flash.h	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/flash.h	(Arbeitskopie)
@@ -154,7 +154,7 @@
 	chipaddr virtual_memory;
 	/* Some flash devices have an additional register space. */
 	chipaddr virtual_registers;
-	struct registered_programmer *pgm;
+	struct registered_master *pgm;
 };
 
 #define TEST_UNTESTED	0
@@ -215,7 +215,7 @@
 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 *pgm, int startchip, struct flashctx *fill_flash, int force);
 int read_flash_to_file(struct flashctx *flash, const char *filename);
 int min(int a, int b);
 int max(int a, int b);
Index: flashrom-rename_register_programmer_register_master/drkaiser.c
===================================================================
--- flashrom-rename_register_programmer_register_master/drkaiser.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/drkaiser.c	(Arbeitskopie)
@@ -45,7 +45,7 @@
 				 chipaddr addr);
 static uint8_t drkaiser_chip_readb(const struct flashctx *flash,
 				   const chipaddr addr);
-static const struct par_programmer par_programmer_drkaiser = {
+static const struct par_master par_programmer_drkaiser = {
 		.chip_readb		= drkaiser_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -85,7 +85,7 @@
 		return 1;
 
 	max_rom_decode.parallel = 128 * 1024;
-	register_par_programmer(&par_programmer_drkaiser, BUS_PARALLEL);
+	register_par_master(&par_programmer_drkaiser, BUS_PARALLEL);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/it87spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/it87spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/it87spi.c	(Arbeitskopie)
@@ -113,7 +113,7 @@
 static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf,
 				      unsigned int start, unsigned int len);
 
-static const struct spi_programmer spi_programmer_it87xx = {
+static const struct spi_master spi_programmer_it87xx = {
 	.type		= SPI_CONTROLLER_IT87XX,
 	.max_data_read	= MAX_DATA_UNSPECIFIED,
 	.max_data_write	= MAX_DATA_UNSPECIFIED,
@@ -199,7 +199,7 @@
 	if (internal_buses_supported & BUS_SPI)
 		msg_pdbg("Overriding chipset SPI with IT87 SPI.\n");
 	/* FIXME: Add the SPI bus or replace the other buses with it? */
-	register_spi_programmer(&spi_programmer_it87xx);
+	register_spi_master(&spi_programmer_it87xx);
 	return 0;
 }
 
Index: flashrom-rename_register_programmer_register_master/gfxnvidia.c
===================================================================
--- flashrom-rename_register_programmer_register_master/gfxnvidia.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/gfxnvidia.c	(Arbeitskopie)
@@ -66,7 +66,7 @@
 				  chipaddr addr);
 static uint8_t gfxnvidia_chip_readb(const struct flashctx *flash,
 				    const chipaddr addr);
-static const struct par_programmer par_programmer_gfxnvidia = {
+static const struct par_master par_programmer_gfxnvidia = {
 		.chip_readb		= gfxnvidia_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -112,7 +112,7 @@
 
 	/* Write/erase doesn't work. */
 	programmer_may_write = 0;
-	register_par_programmer(&par_programmer_gfxnvidia, BUS_PARALLEL);
+	register_par_master(&par_programmer_gfxnvidia, BUS_PARALLEL);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/nicrealtek.c
===================================================================
--- flashrom-rename_register_programmer_register_master/nicrealtek.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/nicrealtek.c	(Arbeitskopie)
@@ -40,7 +40,7 @@
 
 static void nicrealtek_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr);
 static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipaddr addr);
-static const struct par_programmer par_programmer_nicrealtek = {
+static const struct par_master par_programmer_nicrealtek = {
 		.chip_readb		= nicrealtek_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -82,7 +82,7 @@
 	if (register_shutdown(nicrealtek_shutdown, NULL))
 		return 1;
 
-	register_par_programmer(&par_programmer_nicrealtek, BUS_PARALLEL);
+	register_par_master(&par_programmer_nicrealtek, BUS_PARALLEL);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/serprog.c
===================================================================
--- flashrom-rename_register_programmer_register_master/serprog.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/serprog.c	(Arbeitskopie)
@@ -320,7 +320,7 @@
 				    unsigned char *readarr);
 static int serprog_spi_read(struct flashctx *flash, uint8_t *buf,
 			    unsigned int start, unsigned int len);
-static struct spi_programmer spi_programmer_serprog = {
+static struct spi_master spi_programmer_serprog = {
 	.type		= SPI_CONTROLLER_SERPROG,
 	.max_data_read	= MAX_DATA_READ_UNLIMITED,
 	.max_data_write	= MAX_DATA_WRITE_UNLIMITED,
@@ -337,7 +337,7 @@
 				  const chipaddr addr);
 static void serprog_chip_readn(const struct flashctx *flash, uint8_t *buf,
 			       const chipaddr addr, size_t len);
-static const struct par_programmer par_programmer_serprog = {
+static const struct par_master par_programmer_serprog = {
 		.chip_readb		= serprog_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -673,10 +673,9 @@
 	sp_streamed_transmit_bytes = 0;
 	sp_opbuf_usage = 0;
 	if (serprog_buses_supported & BUS_SPI)
-		register_spi_programmer(&spi_programmer_serprog);
+		register_spi_master(&spi_programmer_serprog);
 	if (serprog_buses_supported & BUS_NONSPI)
-		register_par_programmer(&par_programmer_serprog,
-					serprog_buses_supported & BUS_NONSPI);
+		register_par_master(&par_programmer_serprog, serprog_buses_supported & BUS_NONSPI);
 	return 0;
 }
 
Index: flashrom-rename_register_programmer_register_master/bitbang_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/bitbang_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/bitbang_spi.c	(Arbeitskopie)
@@ -63,7 +63,7 @@
 				    const unsigned char *writearr,
 				    unsigned char *readarr);
 
-static const struct spi_programmer spi_programmer_bitbang = {
+static const struct spi_master spi_programmer_bitbang = {
 	.type		= SPI_CONTROLLER_BITBANG,
 	.max_data_read	= MAX_DATA_READ_UNLIMITED,
 	.max_data_write	= MAX_DATA_WRITE_UNLIMITED,
@@ -82,9 +82,9 @@
 }
 #endif
 
-int bitbang_spi_init(const struct bitbang_spi_master *master)
+int register_spi_bitbang_master(const struct bitbang_spi_master *master)
 {
-	struct spi_programmer pgm = spi_programmer_bitbang;
+	struct spi_master pgm = spi_programmer_bitbang;
 	/* BITBANG_SPI_INVALID is 0, so if someone forgot to initialize ->type,
 	 * we catch it here. Same goes for missing initialization of bitbanging
 	 * functions.
@@ -99,7 +99,7 @@
 	}
 
 	pgm.data = master;
-	register_spi_programmer(&pgm);
+	register_spi_master(&pgm);
 
 	/* Only mess with the bus if we're sure nobody else uses it. */
 	bitbang_spi_request_bus(master);
Index: flashrom-rename_register_programmer_register_master/satamv.c
===================================================================
--- flashrom-rename_register_programmer_register_master/satamv.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/satamv.c	(Arbeitskopie)
@@ -46,7 +46,7 @@
 			       chipaddr addr);
 static uint8_t satamv_chip_readb(const struct flashctx *flash,
 				 const chipaddr addr);
-static const struct par_programmer par_programmer_satamv = {
+static const struct par_master par_programmer_satamv = {
 		.chip_readb		= satamv_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -156,7 +156,7 @@
 	/* 512 kByte with two 8-bit latches, and
 	 * 4 MByte with additional 3-bit latch. */
 	max_rom_decode.parallel = 4 * 1024 * 1024;
-	register_par_programmer(&par_programmer_satamv, BUS_PARALLEL);
+	register_par_master(&par_programmer_satamv, BUS_PARALLEL);
 
 	return 0;
 
Index: flashrom-rename_register_programmer_register_master/dummyflasher.c
===================================================================
--- flashrom-rename_register_programmer_register_master/dummyflasher.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/dummyflasher.c	(Arbeitskopie)
@@ -119,7 +119,7 @@
 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_programmer_dummyflasher = {
 	.type		= SPI_CONTROLLER_DUMMY,
 	.max_data_read	= MAX_DATA_READ_UNLIMITED,
 	.max_data_write	= MAX_DATA_UNSPECIFIED,
@@ -130,7 +130,7 @@
 	.write_aai	= default_spi_write_aai,
 };
 
-static const struct par_programmer par_programmer_dummy = {
+static const struct par_master par_programmer_dummy = {
 		.chip_readb		= dummy_chip_readb,
 		.chip_readw		= dummy_chip_readw,
 		.chip_readl		= dummy_chip_readl,
@@ -401,12 +401,10 @@
 		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_programmer_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_programmer_dummyflasher);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/cli_classic.c
===================================================================
--- flashrom-rename_register_programmer_register_master/cli_classic.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/cli_classic.c	(Arbeitskopie)
@@ -421,10 +421,10 @@
 	msg_pdbg("The following protocols are supported: %s.\n", tempstr);
 	free(tempstr);
 
-	for (j = 0; j < registered_programmer_count; j++) {
+	for (j = 0; j < registered_master_count; j++) {
 		startchip = 0;
 		while (chipcount < ARRAY_SIZE(flashes)) {
-			startchip = probe_flash(&registered_programmers[j], startchip, &flashes[chipcount], 0);
+			startchip = probe_flash(&registered_masters[j], startchip, &flashes[chipcount], 0);
 			if (startchip == -1)
 				break;
 			chipcount++;
@@ -446,12 +446,12 @@
 				  "automatically.\n");
 		}
 		if (force && read_it && chip_to_probe) {
-			struct registered_programmer *pgm;
+			struct registered_master *pgm;
 			int compatible_programmers = 0;
 			msg_cinfo("Force read (-f -r -c) requested, pretending the chip is there:\n");
 			/* This loop just counts compatible controllers. */
-			for (j = 0; j < registered_programmer_count; j++) {
-				pgm = &registered_programmers[j];
+			for (j = 0; j < registered_master_count; j++) {
+				pgm = &registered_masters[j];
 				/* chip is still set from the chip_to_probe earlier in this function. */
 				if (pgm->buses_supported & chip->bustype)
 					compatible_programmers++;
@@ -464,8 +464,8 @@
 			if (compatible_programmers > 1)
 				msg_cinfo("More than one compatible controller found for the requested flash "
 					  "chip, using the first one.\n");
-			for (j = 0; j < registered_programmer_count; j++) {
-				pgm = &registered_programmers[j];
+			for (j = 0; j < registered_master_count; j++) {
+				pgm = &registered_masters[j];
 				startchip = probe_flash(pgm, 0, &flashes[0], 1);
 				if (startchip != -1)
 					break;
Index: flashrom-rename_register_programmer_register_master/internal.c
===================================================================
--- flashrom-rename_register_programmer_register_master/internal.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/internal.c	(Arbeitskopie)
@@ -145,7 +145,7 @@
 				    const chipaddr addr);
 static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf,
 				const chipaddr addr, size_t len);
-static const struct par_programmer par_programmer_internal = {
+static const struct par_master par_programmer_internal = {
 		.chip_readb		= internal_chip_readb,
 		.chip_readw		= internal_chip_readw,
 		.chip_readl		= internal_chip_readl,
@@ -348,7 +348,7 @@
 	 * The error code might have been a warning only.
 	 */
 #if defined(__i386__) || defined(__x86_64__) || defined (__mips)
-	register_par_programmer(&par_programmer_internal, internal_buses_supported);
+	register_par_master(&par_programmer_internal, internal_buses_supported);
 	return 0;
 #else
 	msg_perr("Your platform is not supported yet for the internal "
Index: flashrom-rename_register_programmer_register_master/ichspi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/ichspi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/ichspi.c	(Arbeitskopie)
@@ -1514,7 +1514,7 @@
 	msg_gspew("resulted in 0x%08x.\n", mmio_readl(addr));
 }
 
-static const struct spi_programmer spi_programmer_ich7 = {
+static const struct spi_master spi_programmer_ich7 = {
 	.type = SPI_CONTROLLER_ICH7,
 	.max_data_read = 64,
 	.max_data_write = 64,
@@ -1525,7 +1525,7 @@
 	.write_aai = default_spi_write_aai,
 };
 
-static const struct spi_programmer spi_programmer_ich9 = {
+static const struct spi_master spi_programmer_ich9 = {
 	.type = SPI_CONTROLLER_ICH9,
 	.max_data_read = 64,
 	.max_data_write = 64,
@@ -1536,7 +1536,7 @@
 	.write_aai = default_spi_write_aai,
 };
 
-static const struct opaque_programmer opaque_programmer_ich_hwseq = {
+static const struct opaque_master opaque_programmer_ich_hwseq = {
 	.max_data_read = 64,
 	.max_data_write = 64,
 	.probe = ich_hwseq_probe,
@@ -1623,7 +1623,7 @@
 		}
 		ich_init_opcodes();
 		ich_set_bbar(0);
-		register_spi_programmer(&spi_programmer_ich7);
+		register_spi_master(&spi_programmer_ich7);
 		break;
 	case CHIPSET_ICH8:
 	default:		/* Future version might behave the same */
@@ -1808,9 +1808,9 @@
 			}
 			hwseq_data.size_comp0 = getFCBA_component_density(&desc, 0);
 			hwseq_data.size_comp1 = getFCBA_component_density(&desc, 1);
-			register_opaque_programmer(&opaque_programmer_ich_hwseq);
+			register_opaque_master(&opaque_programmer_ich_hwseq);
 		} else {
-			register_spi_programmer(&spi_programmer_ich9);
+			register_spi_master(&spi_programmer_ich9);
 		}
 		break;
 	}
@@ -1833,7 +1833,7 @@
 	return 0;
 }
 
-static const struct spi_programmer spi_programmer_via = {
+static const struct spi_master spi_programmer_via = {
 	.type = SPI_CONTROLLER_VIA,
 	.max_data_read = 16,
 	.max_data_write = 16,
@@ -1854,7 +1854,7 @@
 	/* Not sure if it speaks all these bus protocols. */
 	internal_buses_supported = BUS_LPC | BUS_FWH;
 	ich_generation = CHIPSET_ICH7;
-	register_spi_programmer(&spi_programmer_via);
+	register_spi_master(&spi_programmer_via);
 
 	msg_pdbg("0x00: 0x%04x     (SPIS)\n", mmio_readw(ich_spibar + 0));
 	msg_pdbg("0x02: 0x%04x     (SPIC)\n", mmio_readw(ich_spibar + 2));
Index: flashrom-rename_register_programmer_register_master/nicintel_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/nicintel_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/nicintel_spi.c	(Arbeitskopie)
@@ -196,7 +196,7 @@
 	if (register_shutdown(nicintel_spi_shutdown, NULL))
 		return 1;
 
-	if (bitbang_spi_init(&bitbang_spi_master_nicintel))
+	if (register_spi_bitbang_master(&bitbang_spi_master_nicintel))
 		return 1;
 
 	return 0;
Index: flashrom-rename_register_programmer_register_master/opaque.c
===================================================================
--- flashrom-rename_register_programmer_register_master/opaque.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/opaque.c	(Arbeitskopie)
@@ -50,9 +50,9 @@
 	return flash->pgm->opaque.erase(flash, blockaddr, blocklen);
 }
 
-int register_opaque_programmer(const struct opaque_programmer *pgm)
+int register_opaque_master(const struct opaque_master *pgm)
 {
-	struct registered_programmer rpgm;
+	struct registered_master rpgm;
 
 	if (!pgm->probe || !pgm->read || !pgm->write || !pgm->erase) {
 		msg_perr("%s called with incomplete programmer definition. "
Index: flashrom-rename_register_programmer_register_master/nicnatsemi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/nicnatsemi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/nicnatsemi.c	(Arbeitskopie)
@@ -41,7 +41,7 @@
 				   chipaddr addr);
 static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
 				     const chipaddr addr);
-static const struct par_programmer par_programmer_nicnatsemi = {
+static const struct par_master par_programmer_nicnatsemi = {
 		.chip_readb		= nicnatsemi_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -75,7 +75,7 @@
 	 * functions below wants to be 0x0000FFFF.
 	 */
 	max_rom_decode.parallel = 131072;
-	register_par_programmer(&par_programmer_nicnatsemi, BUS_PARALLEL);
+	register_par_master(&par_programmer_nicnatsemi, BUS_PARALLEL);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/dediprog.c
===================================================================
--- flashrom-rename_register_programmer_register_master/dediprog.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/dediprog.c	(Arbeitskopie)
@@ -736,7 +736,7 @@
 	return millivolt;
 }
 
-static const struct spi_programmer spi_programmer_dediprog = {
+static const struct spi_master spi_programmer_dediprog = {
 	.type		= SPI_CONTROLLER_DEDIPROG,
 	.max_data_read	= MAX_DATA_UNSPECIFIED,
 	.max_data_write	= MAX_DATA_UNSPECIFIED,
@@ -854,7 +854,7 @@
 		return 1;
 	}
 
-	register_spi_programmer(&spi_programmer_dediprog);
+	register_spi_master(&spi_programmer_dediprog);
 
 	/* RE leftover, leave in until the driver is complete. */
 #if 0
Index: flashrom-rename_register_programmer_register_master/rayer_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/rayer_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/rayer_spi.c	(Arbeitskopie)
@@ -175,7 +175,7 @@
 	/* Get the initial value before writing to any line. */
 	lpt_outbyte = INB(lpt_iobase);
 
-	if (bitbang_spi_init(&bitbang_spi_master_rayer))
+	if (register_spi_bitbang_master(&bitbang_spi_master_rayer))
 		return 1;
 
 	return 0;
Index: flashrom-rename_register_programmer_register_master/it85spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/it85spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/it85spi.c	(Arbeitskopie)
@@ -276,7 +276,7 @@
 				   const unsigned char *writearr,
 				   unsigned char *readarr);
 
-static const struct spi_programmer spi_programmer_it85xx = {
+static const struct spi_master spi_programmer_it85xx = {
 	.type		= SPI_CONTROLLER_IT85XX,
 	.max_data_read	= 64,
 	.max_data_write	= 64,
@@ -312,7 +312,7 @@
 		 * a debug message about it.
 		 */
 		/* Set this as SPI controller. */
-		register_spi_programmer(&spi_programmer_it85xx);
+		register_spi_master(&spi_programmer_it85xx);
 	}
 	return ret;
 }
Index: flashrom-rename_register_programmer_register_master/buspirate_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/buspirate_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/buspirate_spi.c	(Arbeitskopie)
@@ -132,7 +132,7 @@
 static int buspirate_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt,
 				      const unsigned char *writearr, unsigned char *readarr);
 
-static const struct spi_programmer spi_programmer_buspirate = {
+static const struct spi_master spi_programmer_buspirate = {
 	.type		= SPI_CONTROLLER_BUSPIRATE,
 	.max_data_read	= 12,
 	.max_data_write	= 12,
@@ -407,7 +407,7 @@
 		return 1;
 	}
 
-	register_spi_programmer(&spi_programmer_buspirate);
+	register_spi_master(&spi_programmer_buspirate);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/linux_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/linux_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/linux_spi.c	(Arbeitskopie)
@@ -46,7 +46,7 @@
 static int linux_spi_write_256(struct flashctx *flash, uint8_t *buf,
 			       unsigned int start, unsigned int len);
 
-static const struct spi_programmer spi_programmer_linux = {
+static const struct spi_master spi_programmer_linux = {
 	.type		= SPI_CONTROLLER_LINUX,
 	.max_data_read	= MAX_DATA_UNSPECIFIED, /* TODO? */
 	.max_data_write	= MAX_DATA_UNSPECIFIED, /* TODO? */
@@ -115,7 +115,7 @@
 		return 1;
 	}
 
-	register_spi_programmer(&spi_programmer_linux);
+	register_spi_master(&spi_programmer_linux);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/atahpt.c
===================================================================
--- flashrom-rename_register_programmer_register_master/atahpt.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/atahpt.c	(Arbeitskopie)
@@ -45,7 +45,7 @@
 			       chipaddr addr);
 static uint8_t atahpt_chip_readb(const struct flashctx *flash,
 				 const chipaddr addr);
-static const struct par_programmer par_programmer_atahpt = {
+static const struct par_master par_programmer_atahpt = {
 		.chip_readb		= atahpt_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -80,7 +80,7 @@
 	if (register_shutdown(atahpt_shutdown, NULL))
 		return 1;
 
-	register_par_programmer(&par_programmer_atahpt, BUS_PARALLEL);
+	register_par_master(&par_programmer_atahpt, BUS_PARALLEL);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/nic3com.c
===================================================================
--- flashrom-rename_register_programmer_register_master/nic3com.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/nic3com.c	(Arbeitskopie)
@@ -60,7 +60,7 @@
 				chipaddr addr);
 static uint8_t nic3com_chip_readb(const struct flashctx *flash,
 				  const chipaddr addr);
-static const struct par_programmer par_programmer_nic3com = {
+static const struct par_master par_programmer_nic3com = {
 		.chip_readb		= nic3com_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -116,7 +116,7 @@
 		return 1;
 
 	max_rom_decode.parallel = 128 * 1024;
-	register_par_programmer(&par_programmer_nic3com, BUS_PARALLEL);
+	register_par_master(&par_programmer_nic3com, BUS_PARALLEL);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/spi.c	(Arbeitskopie)
@@ -167,9 +167,9 @@
 	return flash->pgm->spi.write_aai(flash, buf, start, len);
 }
 
-int register_spi_programmer(const struct spi_programmer *pgm)
+int register_spi_master(const struct spi_master *pgm)
 {
-	struct registered_programmer rpgm;
+	struct registered_master rpgm;
 
 	if (!pgm->write_aai || !pgm->write_256 || !pgm->read || !pgm->command ||
 	    !pgm->multicommand ||
Index: flashrom-rename_register_programmer_register_master/ft2232_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/ft2232_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/ft2232_spi.c	(Arbeitskopie)
@@ -142,7 +142,7 @@
 				   const unsigned char *writearr,
 				   unsigned char *readarr);
 
-static const struct spi_programmer spi_programmer_ft2232 = {
+static const struct spi_master spi_programmer_ft2232 = {
 	.type		= SPI_CONTROLLER_FT2232,
 	.max_data_read	= 64 * 1024,
 	.max_data_write	= 256,
@@ -356,7 +356,7 @@
 
 	// msg_pdbg("\nft2232 chosen\n");
 
-	register_spi_programmer(&spi_programmer_ft2232);
+	register_spi_master(&spi_programmer_ft2232);
 
 	return 0;
 
Index: flashrom-rename_register_programmer_register_master/satasii.c
===================================================================
--- flashrom-rename_register_programmer_register_master/satasii.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/satasii.c	(Arbeitskopie)
@@ -43,7 +43,7 @@
 
 static void satasii_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr);
 static uint8_t satasii_chip_readb(const struct flashctx *flash, const chipaddr addr);
-static const struct par_programmer par_programmer_satasii = {
+static const struct par_master par_programmer_satasii = {
 		.chip_readb		= satasii_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -90,7 +90,7 @@
 	if (register_shutdown(satasii_shutdown, NULL))
 		return 1;
 
-	register_par_programmer(&par_programmer_satasii, BUS_PARALLEL);
+	register_par_master(&par_programmer_satasii, BUS_PARALLEL);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/wbsio_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/wbsio_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/wbsio_spi.c	(Arbeitskopie)
@@ -68,7 +68,7 @@
 static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf,
 			  unsigned int start, unsigned int len);
 
-static const struct spi_programmer spi_programmer_wbsio = {
+static const struct spi_master spi_programmer_wbsio = {
 	.type = SPI_CONTROLLER_WBSIO,
 	.max_data_read = MAX_DATA_UNSPECIFIED,
 	.max_data_write = MAX_DATA_UNSPECIFIED,
@@ -90,7 +90,7 @@
 	msg_pdbg("%s: Winbond saved on 4 register bits so max chip size is "
 		 "1024 kB!\n", __func__);
 	max_rom_decode.spi = 1024 * 1024;
-	register_spi_programmer(&spi_programmer_wbsio);
+	register_spi_master(&spi_programmer_wbsio);
 
 	return 0;
 }
Index: flashrom-rename_register_programmer_register_master/pony_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/pony_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/pony_spi.c	(Arbeitskopie)
@@ -158,7 +158,7 @@
 		return 1;
 	}
 
-	if (bitbang_spi_init(&bitbang_spi_master_pony)) {
+	if (register_spi_bitbang_master(&bitbang_spi_master_pony)) {
 		return 1;
 	}
 	return 0;
Index: flashrom-rename_register_programmer_register_master/nicintel.c
===================================================================
--- flashrom-rename_register_programmer_register_master/nicintel.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/nicintel.c	(Arbeitskopie)
@@ -48,7 +48,7 @@
 				 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_programmer_nicintel = {
 		.chip_readb		= nicintel_chip_readb,
 		.chip_readw		= fallback_chip_readw,
 		.chip_readl		= fallback_chip_readl,
@@ -110,7 +110,7 @@
 	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_programmer_nicintel, BUS_PARALLEL);
 
 	return 0;
 
Index: flashrom-rename_register_programmer_register_master/sb600spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/sb600spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/sb600spi.c	(Arbeitskopie)
@@ -194,7 +194,7 @@
 	return 0;
 }
 
-static const struct spi_programmer spi_programmer_sb600 = {
+static const struct spi_master spi_programmer_sb600 = {
 	.type = SPI_CONTROLLER_SB600,
 	.max_data_read = 8,
 	.max_data_write = 5,
@@ -320,7 +320,7 @@
 	/* Bring the FIFO to a clean state. */
 	reset_internal_fifo_pointer();
 
-	register_spi_programmer(&spi_programmer_sb600);
+	register_spi_master(&spi_programmer_sb600);
 	return 0;
 }
 
Index: flashrom-rename_register_programmer_register_master/mcp6x_spi.c
===================================================================
--- flashrom-rename_register_programmer_register_master/mcp6x_spi.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/mcp6x_spi.c	(Arbeitskopie)
@@ -161,7 +161,7 @@
 		 (status >> MCP6X_SPI_GRANT) & 0x1);
 	mcp_gpiostate = status & 0xff;
 
-	if (bitbang_spi_init(&bitbang_spi_master_mcp6x)) {
+	if (register_spi_bitbang_master(&bitbang_spi_master_mcp6x)) {
 		/* This should never happen. */
 		msg_perr("MCP6X bitbang SPI master init failed!\n");
 		return 1;
Index: flashrom-rename_register_programmer_register_master/programmer.c
===================================================================
--- flashrom-rename_register_programmer_register_master/programmer.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/programmer.c	(Arbeitskopie)
@@ -96,10 +96,10 @@
 	return;
 }
 
-int register_par_programmer(const struct par_programmer *pgm,
+int register_par_master(const struct par_master *pgm,
 			    const enum chipbustype buses)
 {
-	struct registered_programmer rpgm;
+	struct registered_master rpgm;
 	if (!pgm->chip_writeb || !pgm->chip_writew || !pgm->chip_writel ||
 	    !pgm->chip_writen || !pgm->chip_readb || !pgm->chip_readw ||
 	    !pgm->chip_readl || !pgm->chip_readn) {
@@ -115,20 +115,20 @@
 }
 
 /* The limit of 4 is totally arbitrary. */
-#define PROGRAMMERS_MAX 4
-struct registered_programmer registered_programmers[PROGRAMMERS_MAX];
-int registered_programmer_count = 0;
+#define MASTERS_MAX 4
+struct registered_master registered_masters[MASTERS_MAX];
+int registered_master_count = 0;
 
-/* This function copies the struct registered_programmer parameter. */
-int register_programmer(struct registered_programmer *pgm)
+/* This function copies the struct registered_master parameter. */
+int register_programmer(struct registered_master *pgm)
 {
-	if (registered_programmer_count >= PROGRAMMERS_MAX) {
+	if (registered_master_count >= MASTERS_MAX) {
 		msg_perr("Tried to register more than %i programmer "
-			 "interfaces.\n", PROGRAMMERS_MAX);
+			 "interfaces.\n", MASTERS_MAX);
 		return ERROR_FLASHROM_LIMIT;
 	}
-	registered_programmers[registered_programmer_count] = *pgm;
-	registered_programmer_count++;
+	registered_masters[registered_master_count] = *pgm;
+	registered_master_count++;
 
 	return 0;
 }
@@ -138,8 +138,8 @@
 	int i;
 	enum chipbustype ret = BUS_NONE;
 
-	for (i = 0; i < registered_programmer_count; i++)
-		ret |= registered_programmers[i].buses_supported;
+	for (i = 0; i < registered_master_count; i++)
+		ret |= registered_masters[i].buses_supported;
 
 	return ret;
 }
Index: flashrom-rename_register_programmer_register_master/flashrom.c
===================================================================
--- flashrom-rename_register_programmer_register_master/flashrom.c	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/flashrom.c	(Arbeitskopie)
@@ -949,7 +949,7 @@
 	return 1;
 }
 
-int probe_flash(struct registered_programmer *pgm, int startchip, struct flashctx *flash, int force)
+int probe_flash(struct registered_master *pgm, int startchip, struct flashctx *flash, int force)
 {
 	const struct flashchip *chip;
 	unsigned long base = 0;
Index: flashrom-rename_register_programmer_register_master/programmer.h
===================================================================
--- flashrom-rename_register_programmer_register_master/programmer.h	(Revision 1587)
+++ flashrom-rename_register_programmer_register_master/programmer.h	(Arbeitskopie)
@@ -445,7 +445,7 @@
 #endif
 
 /* bitbang_spi.c */
-int bitbang_spi_init(const struct bitbang_spi_master *master);
+int register_spi_bitbang_master(const struct bitbang_spi_master *master);
 
 /* buspirate_spi.c */
 #if CONFIG_BUSPIRATE_SPI == 1
@@ -517,7 +517,7 @@
 #define MAX_DATA_UNSPECIFIED 0
 #define MAX_DATA_READ_UNLIMITED 64 * 1024
 #define MAX_DATA_WRITE_UNLIMITED 256
-struct spi_programmer {
+struct spi_master {
 	enum spi_controller type;
 	unsigned int max_data_read;
 	unsigned int max_data_write;
@@ -538,7 +538,7 @@
 int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
 int default_spi_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
 int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
-int register_spi_programmer(const struct spi_programmer *programmer);
+int register_spi_master(const struct spi_master *programmer);
 
 /* The following enum is needed by ich_descriptor_tool and ich* code. */
 enum ich_chipset {
@@ -580,7 +580,7 @@
 #endif
 
 /* opaque.c */
-struct opaque_programmer {
+struct opaque_master {
 	int max_data_read;
 	int max_data_write;
 	/* Specific functions for this programmer */
@@ -590,7 +590,7 @@
 	int (*erase) (struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen);
 	const void *data;
 };
-int register_opaque_programmer(const struct opaque_programmer *pgm);
+int register_opaque_master(const struct opaque_master *pgm);
 
 /* programmer.c */
 int noop_shutdown(void);
@@ -603,7 +603,7 @@
 uint16_t fallback_chip_readw(const struct flashctx *flash, const chipaddr addr);
 uint32_t fallback_chip_readl(const struct flashctx *flash, const chipaddr addr);
 void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len);
-struct par_programmer {
+struct par_master {
 	void (*chip_writeb) (const struct flashctx *flash, uint8_t val, chipaddr addr);
 	void (*chip_writew) (const struct flashctx *flash, uint16_t val, chipaddr addr);
 	void (*chip_writel) (const struct flashctx *flash, uint32_t val, chipaddr addr);
@@ -614,18 +614,18 @@
 	void (*chip_readn) (const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len);
 	const void *data;
 };
-int register_par_programmer(const struct par_programmer *pgm, const enum chipbustype buses);
-struct registered_programmer {
+int register_par_master(const struct par_master *pgm, const enum chipbustype buses);
+struct registered_master {
 	enum chipbustype buses_supported;
 	union {
-		struct par_programmer par;
-		struct spi_programmer spi;
-		struct opaque_programmer opaque;
+		struct par_master par;
+		struct spi_master spi;
+		struct opaque_master opaque;
 	};
 };
-extern struct registered_programmer registered_programmers[];
-extern int registered_programmer_count;
-int register_programmer(struct registered_programmer *pgm);
+extern struct registered_master registered_masters[];
+extern int registered_master_count;
+int register_programmer(struct registered_master *pgm);
 
 /* serprog.c */
 #if CONFIG_SERPROG == 1


-- 
http://www.hailfinger.org/

More information about the flashrom mailing list