Revert "Update all programmer init functions to register bus programmers into common list"
This reverts commit 63b92f99a9d43dd637bcce564cd372be3c81c5d8.
BUG=chromium:635405
Change-Id: I94ae18b547d2aedd74fc7103a38dcbfd2f57be66
Reviewed-on: https://chromium-review.googlesource.com/367504
Commit-Ready: David Hendricks <dhendrix@chromium.org>
Tested-by: David Hendricks <dhendrix@chromium.org>
Reviewed-by: David Hendricks <dhendrix@chromium.org>
diff --git a/flash.h b/flash.h
index c96147d..21100a4 100644
--- a/flash.h
+++ b/flash.h
@@ -210,7 +210,6 @@
chipaddr virtual_memory;
/* Some flash devices have an additional register space. */
chipaddr virtual_registers;
- struct registered_programmer *pgm;
};
@@ -286,7 +285,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(int startchip, struct flashctx *fill_flash, int force);
int read_flash(struct flashctx *flash, uint8_t *buf,
unsigned int start, unsigned int len);
int read_flash_to_file(struct flashctx *flash, const char *filename);
@@ -321,13 +320,6 @@
/* Something happened that shouldn't happen, we'll abort. */
#define ERROR_FATAL -0xee
-#define ERROR_FLASHROM_BUG -200
-/* We reached one of the hardcoded limits of flashrom. This can be fixed by
- * increasing the limit of a compile-time allocation or by switching to dynamic
- * allocation.
- * Note: If this warning is triggered, check first for runaway registrations.
- */
-#define ERROR_FLASHROM_LIMIT -201
/* Operation failed due to access restriction set in programmer or flash chip */
#define ACCESS_DENIED -7
@@ -414,5 +406,4 @@
/* returns number of unique voltage ranges, or <0 to indicate failure */
extern int flash_supported_voltage_ranges(enum chipbustype bus);
-enum chipbustype get_buses_supported(void);
#endif /* !__FLASH_H__ */