Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/85539?usp=email )
Change subject: Move SPI declarations from flash.h to spi.h ......................................................................
Move SPI declarations from flash.h to spi.h
As a consecuence, some of the files that used to include flash.h no longer need to do so. For this reason, flash.h includes are also deleted in this commit.
Change-Id: I794a71536a3b85fde39f83c802fa0f5dd8d428e0 Signed-off-by: Antonio Vázquez Blanco antoniovazquezblanco@gmail.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/85539 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Anastasia Klimchuk aklm@chromium.org Reviewed-by: Peter Marheine pmarheine@chromium.org Reviewed-by: David Reguera Garcia (Dreg) regueragarciadavid@gmail.com Reviewed-by: Matti Finder matti.finder@gmail.com --- M amd_imc.c M at45db.c M bitbang_spi.c M buspirate_spi.c M dediprog.c M dummyflasher.c M edi.c M ft2232_spi.c M ichspi.c M include/cli_output.h M include/flash.h M include/programmer.h M include/spi.h M it87spi.c M jlink_spi.c M linux_spi.c M mediatek_i2c_spi.c M mstarddc_spi.c M ni845x_spi.c M nicintel_eeprom.c M pickit2_spi.c M rpmc.c M sb600spi.c M sfdp.c M spi.c M spi25.c M spi25_statusreg.c M stlinkv3_spi.c M usbblaster_spi.c M wbsio_spi.c M writeprotect.c 31 files changed, 18 insertions(+), 42 deletions(-)
Approvals: Matti Finder: Looks good to me, approved David Reguera Garcia (Dreg): Looks good to me, approved build bot (Jenkins): Verified Peter Marheine: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved
diff --git a/amd_imc.c b/amd_imc.c index d57728e..0696732 100644 --- a/amd_imc.c +++ b/amd_imc.c @@ -15,7 +15,6 @@ * GNU General Public License for more details. */
-#include "flash.h" #include "programmer.h" #include "hwaccess_x86_io.h" #include "spi.h" diff --git a/at45db.c b/at45db.c index c0c6eaf..baa2bff 100644 --- a/at45db.c +++ b/at45db.c @@ -16,7 +16,6 @@ */
#include <string.h> -#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" diff --git a/bitbang_spi.c b/bitbang_spi.c index dde5dbc..ef36653 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -17,7 +17,6 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include "flash.h" #include "programmer.h" #include "spi.h"
diff --git a/buspirate_spi.c b/buspirate_spi.c index 3a1e414..a9df8ed 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -20,7 +20,6 @@ #include <stdlib.h> #include <ctype.h> #include <unistd.h> -#include "flash.h" #include "programmer.h" #include "spi.h"
diff --git a/dediprog.c b/dediprog.c index 05031fd..223946a 100644 --- a/dediprog.c +++ b/dediprog.c @@ -22,7 +22,6 @@ #include <limits.h> #include <errno.h> #include <libusb.h> -#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" diff --git a/dummyflasher.c b/dummyflasher.c index ef49f48..1cfdd80 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -22,7 +22,6 @@ #include <errno.h> #include <sys/types.h> #include <sys/stat.h> -#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "flashchips.h" diff --git a/edi.c b/edi.c index 56ed62c..340688f 100644 --- a/edi.c +++ b/edi.c @@ -15,7 +15,7 @@ */
#include <string.h> -#include "flash.h" +#include "spi.h" #include "chipdrivers.h" #include "ene.h" #include "edi.h" diff --git a/ft2232_spi.c b/ft2232_spi.c index 7d7283b..023507b 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -20,7 +20,6 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include "flash.h" #include "programmer.h" #include "spi.h" #include <ftdi.h> diff --git a/ichspi.c b/ichspi.c index 94227de..ac70eed 100644 --- a/ichspi.c +++ b/ichspi.c @@ -22,7 +22,6 @@ #include <string.h> #include <stdbool.h> #include <stdlib.h> -#include "flash.h" #include "programmer.h" #include "hwaccess_physmap.h" #include "spi.h" diff --git a/include/cli_output.h b/include/cli_output.h index 3a3db88..311c85e 100644 --- a/include/cli_output.h +++ b/include/cli_output.h @@ -18,7 +18,7 @@ #define __CLI_OUTPUT_H__
#include <stdarg.h> -#include <flash.h> +#include "flash.h"
extern enum flashrom_log_level verbose_screen; extern enum flashrom_log_level verbose_logfile; diff --git a/include/flash.h b/include/flash.h index a845186..80ee5f6 100644 --- a/include/flash.h +++ b/include/flash.h @@ -758,15 +758,4 @@ void init_progress(struct flashctx *flash, enum flashrom_progress_stage stage, size_t total); void update_progress(struct flashctx *flash, enum flashrom_progress_stage stage, size_t increment);
-/* spi.c */ -struct spi_command { - unsigned int writecnt; - unsigned int readcnt; - const unsigned char *writearr; - unsigned char *readarr; -}; -#define NULL_SPI_CMD { 0, 0, NULL, NULL, } -int spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -int spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds); - #endif /* !__FLASH_H__ */ diff --git a/include/programmer.h b/include/programmer.h index e0630b8..e9c132e 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -23,7 +23,7 @@ #include <stdbool.h> #include <stdint.h>
-#include "flash.h" /* for chipaddr and flashctx */ +#include "spi.h"
enum programmer_type { PCI = 1, /* to detect uninitialized values */ diff --git a/include/spi.h b/include/spi.h index 505aecd..a44aaaf 100644 --- a/include/spi.h +++ b/include/spi.h @@ -16,6 +16,8 @@ #ifndef __SPI_H__ #define __SPI_H__ 1
+#include "flash.h" + /* * Contains the generic SPI headers */ @@ -235,6 +237,16 @@ #define SPI_FLASHROM_BUG -5 #define SPI_PROGRAMMER_ERROR -6
+struct spi_command { + unsigned int writecnt; + unsigned int readcnt; + const unsigned char *writearr; + unsigned char *readarr; +}; +#define NULL_SPI_CMD { 0, 0, NULL, NULL, } +int spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); +int spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds); + void clear_spi_id_cache(void);
#endif /* !__SPI_H__ */ diff --git a/it87spi.c b/it87spi.c index fddae3b..fc008d6 100644 --- a/it87spi.c +++ b/it87spi.c @@ -23,7 +23,6 @@ #include <stdbool.h> #include <stdlib.h> #include <errno.h> -#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "hwaccess_physmap.h" diff --git a/jlink_spi.c b/jlink_spi.c index 447629c..6c5a524 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -26,7 +26,6 @@ #include <errno.h> #include <libjaylink/libjaylink.h>
-#include "flash.h" #include "programmer.h" #include "spi.h"
diff --git a/linux_spi.c b/linux_spi.c index ceca05f..a84c770 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -24,7 +24,6 @@ #include <unistd.h> #include <sys/ioctl.h> #include <linux/types.h> -#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c index d28e478..792815a 100644 --- a/mediatek_i2c_spi.c +++ b/mediatek_i2c_spi.c @@ -21,7 +21,6 @@ #include <sys/ioctl.h> #include <unistd.h>
-#include "flash.h" #include "i2c_helper.h" #include "programmer.h" #include "spi.h" diff --git a/mstarddc_spi.c b/mstarddc_spi.c index 44ebd05..13881f0 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -26,7 +26,6 @@ #include <sys/ioctl.h> #include <linux/i2c-dev.h> #include <linux/i2c.h> -#include "flash.h" #include "programmer.h" #include "spi.h"
diff --git a/ni845x_spi.c b/ni845x_spi.c index 1948387..5032a34 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -29,8 +29,6 @@ #include <stdlib.h> #include <ni845x.h> #include <unistd.h> - -#include "flash.h" #include "programmer.h" #include "spi.h"
diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 6a734b0..e3f2643 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -31,7 +31,6 @@
#include <stdlib.h> #include <unistd.h> -#include "flash.h" #include "spi.h" #include "programmer.h" #include "hwaccess_physmap.h" diff --git a/pickit2_spi.c b/pickit2_spi.c index a072a20..1aa13ed 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -39,7 +39,6 @@ #include <errno.h> #include <libusb.h>
-#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" diff --git a/rpmc.c b/rpmc.c index 72b0f2f..d0b7d4d 100644 --- a/rpmc.c +++ b/rpmc.c @@ -15,7 +15,6 @@ */
#include "rpmc.h" -#include "flash.h" #include <stdint.h> #include <stddef.h> #include <unistd.h> @@ -23,6 +22,7 @@ #include <openssl/evp.h> #include <openssl/rand.h> #include <string.h> +#include "spi.h"
// OP1 commands #define RPMC_WRITE_ROOT_KEY_MSG_LENGTH (RPMC_OP1_MSG_HEADER_LENGTH + RPMC_HMAC_KEY_LENGTH + RPMC_TRUNCATED_SIG_LENGTH) diff --git a/sb600spi.c b/sb600spi.c index cec7e0a..37e45f1 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -21,7 +21,6 @@ #include <stdbool.h> #include <string.h> #include <stdlib.h> -#include "flash.h" #include "programmer.h" #include "hwaccess_physmap.h" #include "spi.h" diff --git a/sfdp.c b/sfdp.c index df05d97..e635954 100644 --- a/sfdp.c +++ b/sfdp.c @@ -16,7 +16,6 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include "flash.h" #include "spi.h" #include "chipdrivers.h"
diff --git a/spi.c b/spi.c index b2ffc33..a9ad938 100644 --- a/spi.c +++ b/spi.c @@ -18,13 +18,13 @@ * Contains the generic SPI framework */
+#include "spi.h" + #include <strings.h> #include <string.h> -#include "flash.h" #include "flashchips.h" #include "chipdrivers.h" #include "programmer.h" -#include "spi.h"
static int default_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, diff --git a/spi25.c b/spi25.c index ab479e5..84ea7cb 100644 --- a/spi25.c +++ b/spi25.c @@ -21,7 +21,6 @@ #include <stddef.h> #include <string.h> #include <stdbool.h> -#include "flash.h" #include "flashchips.h" #include "chipdrivers.h" #include "programmer.h" diff --git a/spi25_statusreg.c b/spi25_statusreg.c index ceb2c77..bf73488 100644 --- a/spi25_statusreg.c +++ b/spi25_statusreg.c @@ -19,7 +19,6 @@
#include <stdlib.h>
-#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index a5c2289..2afc862 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -23,7 +23,6 @@ * https://www.st.com/en/development-tools/stlink-v3-bridge.html */
-#include "flash.h" #include "programmer.h" #include "spi.h" #include "usbdev.h" diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 43acaad..7350cde 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -35,7 +35,6 @@ #include <stdlib.h> #include <ctype.h> #include <ftdi.h> -#include "flash.h" #include "programmer.h" #include "spi.h"
diff --git a/wbsio_spi.c b/wbsio_spi.c index 9f33b18..1481cba 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -16,7 +16,6 @@
#include <stdlib.h>
-#include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "hwaccess_physmap.h" diff --git a/writeprotect.c b/writeprotect.c index 964c311..7420e39 100644 --- a/writeprotect.c +++ b/writeprotect.c @@ -20,7 +20,6 @@ #include <string.h>
#include "spi.h" -#include "flash.h" #include "libflashrom.h" #include "chipdrivers.h" #include "writeprotect.h"
-
Anastasia Klimchuk (Code Review)