Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/40324 )
Change subject: const'ify flashctx to align signatures with cros flashrom ......................................................................
const'ify flashctx to align signatures with cros flashrom
The ChromiumOS flashrom fork has since const'ify flashctx in a few places. This aligns the function signatures to match with downstream to ease forward porting patches out of downstream back into mainline flashrom.
This patch is minimum viable alignment and so feedback is welcome.
Change-Id: Iff6dbda13cb0d941481c0d204b9c30895630fbd1 Signed-off-by: Edward O'Callaghan quasisec@google.com --- M bitbang_spi.c M buspirate_spi.c M ch341a_spi.c M chipdrivers.h M dediprog.c M digilent_spi.c M dummyflasher.c M flash.h M ft2232_spi.c M ichspi.c M it85spi.c M it87spi.c M jlink_spi.c M linux_spi.c M lspcon_i2c_spi.c M mstarddc_spi.c M pickit2_spi.c M programmer.h M raiden_debug_spi.c M sb600spi.c M serprog.c M spi.c M spi25_statusreg.c M stlinkv3_spi.c M usbblaster_spi.c M wbsio_spi.c 26 files changed, 52 insertions(+), 52 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/24/40324/1
diff --git a/bitbang_spi.c b/bitbang_spi.c index 7c183c3..ac50e67 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -64,7 +64,7 @@ return master->get_miso(); }
-static int bitbang_spi_send_command(struct flashctx *flash, +static int bitbang_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -145,7 +145,7 @@ } }
-static int bitbang_spi_send_command(struct flashctx *flash, +static int bitbang_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/buspirate_spi.c b/buspirate_spi.c index 826bd84..fdfc0e4 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -128,9 +128,9 @@ return ret; }
-static int buspirate_spi_send_command_v1(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v1(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int buspirate_spi_send_command_v2(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v2(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);
static struct spi_master spi_master_buspirate = { @@ -572,7 +572,7 @@ return 0; }
-static int buspirate_spi_send_command_v1(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v1(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { unsigned int i = 0; @@ -625,7 +625,7 @@ return ret; }
-static int buspirate_spi_send_command_v2(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v2(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { int i = 0, ret = 0; diff --git a/ch341a_spi.c b/ch341a_spi.c index d3af32f..17c37eb 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -335,7 +335,7 @@ stored_delay_us += usecs; }
-static int ch341a_spi_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) +static int ch341a_spi_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { if (handle == NULL) return -1; diff --git a/chipdrivers.h b/chipdrivers.h index cb1e877..3c7d146 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -62,8 +62,8 @@
/* spi25_statusreg.c */ -uint8_t spi_read_status_register(struct flashctx *flash); -int spi_write_status_register(struct flashctx *flash, int status); +uint8_t spi_read_status_register(const struct flashctx *flash); +int spi_write_status_register(const struct flashctx *flash, int status); void spi_prettyprint_status_register_bit(uint8_t status, int bit); int spi_prettyprint_status_register_plain(struct flashctx *flash); int spi_prettyprint_status_register_default_welwip(struct flashctx *flash); diff --git a/dediprog.c b/dediprog.c index 175e099..1f7c3d0 100644 --- a/dediprog.c +++ b/dediprog.c @@ -714,7 +714,7 @@ return dediprog_spi_write(flash, buf, start, len, WRITE_MODE_2B_AAI); }
-static int dediprog_spi_send_command(struct flashctx *flash, +static int dediprog_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, diff --git a/digilent_spi.c b/digilent_spi.c index 13a876e..0f7a9da 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -257,7 +257,7 @@ return 0; }
-static int digilent_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int digilent_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { int ret; diff --git a/dummyflasher.c b/dummyflasher.c index b9f6126..e1a1d80 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -93,7 +93,7 @@
static unsigned int spi_write_256_chunksize = 256;
-static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int dummy_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); @@ -818,7 +818,7 @@ } #endif
-static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int dummy_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/flash.h b/flash.h index 1a9bd9f..2f0143b 100644 --- a/flash.h +++ b/flash.h @@ -415,8 +415,8 @@ unsigned char *readarr; }; #define NULL_SPI_CMD { 0, 0, NULL, NULL, } -int spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -int spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); +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);
enum chipbustype get_buses_supported(void); #endif /* !__FLASH_H__ */ diff --git a/ft2232_spi.c b/ft2232_spi.c index 520eb6e..c416d0f 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -155,7 +155,7 @@ return 0; }
-static int ft2232_spi_send_command(struct flashctx *flash, +static int ft2232_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -459,7 +459,7 @@ }
/* Returns 0 upon success, a negative number upon errors. */ -static int ft2232_spi_send_command(struct flashctx *flash, +static int ft2232_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/ichspi.c b/ichspi.c index 12ee126..c780d52 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1103,7 +1103,7 @@ } }
-static int ich_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int ich_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) @@ -1506,7 +1506,7 @@ return 0; }
-static int ich_spi_send_multicommand(struct flashctx *flash, +static int ich_spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds) { int ret = 0; diff --git a/it85spi.c b/it85spi.c index 5ce9193..b998790 100644 --- a/it85spi.c +++ b/it85spi.c @@ -270,7 +270,7 @@ return 0; }
-static int it85xx_spi_send_command(struct flashctx *flash, +static int it85xx_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -322,7 +322,7 @@ * 3. read date from LPC/FWH address 0xffff_fdxxh (drive CE# low and get * data from MISO) */ -static int it85xx_spi_send_command(struct flashctx *flash, +static int it85xx_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/it87spi.c b/it87spi.c index f5955fe..8224db0 100644 --- a/it87spi.c +++ b/it87spi.c @@ -98,7 +98,7 @@ return; }
-static int it8716f_spi_send_command(struct flashctx *flash, +static int it8716f_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -275,7 +275,7 @@ * commands with the address in inverse wire order. That's why the register * ordering in case 4 and 5 may seem strange. */ -static int it8716f_spi_send_command(struct flashctx *flash, +static int it8716f_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/jlink_spi.c b/jlink_spi.c index 8a69b41..36611bf 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -101,7 +101,7 @@ return true; }
-static int jlink_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int jlink_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { uint32_t length; diff --git a/linux_spi.c b/linux_spi.c index aa73c18..1ef8f2b 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -49,7 +49,7 @@ static size_t max_kernel_buf_size;
static int linux_spi_shutdown(void *data); -static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int linux_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *txbuf, unsigned char *rxbuf); @@ -183,7 +183,7 @@ return 0; }
-static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int linux_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *txbuf, unsigned char *rxbuf) diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c index 4c85426..3402111 100644 --- a/lspcon_i2c_spi.c +++ b/lspcon_i2c_spi.c @@ -251,7 +251,7 @@ return ret; }
-static int lspcon_i2c_spi_send_command(struct flashctx *flash, +static int lspcon_i2c_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/mstarddc_spi.c b/mstarddc_spi.c index db11157..48d6204 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -153,7 +153,7 @@ }
/* Returns 0 upon success, a negative number upon errors. */ -static int mstarddc_spi_send_command(struct flashctx *flash, +static int mstarddc_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, diff --git a/pickit2_spi.c b/pickit2_spi.c index 2936ee8..0bc17af 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -195,7 +195,7 @@ return 0; }
-static int pickit2_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int pickit2_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) {
diff --git a/programmer.h b/programmer.h index f6c5399..49a9d29 100644 --- a/programmer.h +++ b/programmer.h @@ -612,9 +612,9 @@ uint32_t features; unsigned int max_data_read; // (Ideally,) maximum data read size in one go (excluding opcode+address). unsigned int max_data_write; // (Ideally,) maximum data write size in one go (excluding opcode+address). - int (*command)(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, + int (*command)(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); - int (*multicommand)(struct flashctx *flash, struct spi_command *cmds); + int (*multicommand)(const struct flashctx *flash, struct spi_command *cmds);
/* Optimized functions for this master */ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); @@ -623,9 +623,9 @@ const void *data; };
-int default_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +int default_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -int default_spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); +int default_spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index 173e355..2bdb94b 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -284,7 +284,7 @@ return response_packet.status_code; }
-static int send_command(struct flashctx *flash, +static int send_command(const struct flashctx *flash, unsigned int write_count, unsigned int read_count, const unsigned char *write_buffer, diff --git a/sb600spi.c b/sb600spi.c index a649253..5892d57 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -56,9 +56,9 @@ #define FIFO_SIZE_OLD 8 #define FIFO_SIZE_YANGTZE 71
-static int sb600_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int sb600_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int spi100_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int spi100_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);
static struct spi_master spi_master_sb600 = { @@ -190,7 +190,7 @@ }
/* Check the number of bytes to be transmitted and extract opcode. */ -static int check_readwritecnt(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt) +static int check_readwritecnt(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt) { unsigned int maxwritecnt = flash->mst->spi.max_data_write + 3; if (writecnt > maxwritecnt) { @@ -217,7 +217,7 @@ msg_pspew("done\n"); }
-static int sb600_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int sb600_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) @@ -303,7 +303,7 @@ return 0; }
-static int spi100_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int spi100_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/serprog.c b/serprog.c index 37a9db4..1befce1 100644 --- a/serprog.c +++ b/serprog.c @@ -295,7 +295,7 @@ return 0; }
-static int serprog_spi_send_command(struct flashctx *flash, +static int serprog_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -894,7 +894,7 @@ sp_prev_was_write = 0; }
-static int serprog_spi_send_command(struct flashctx *flash, +static int serprog_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/spi.c b/spi.c index 489baf3..aed2a92 100644 --- a/spi.c +++ b/spi.c @@ -26,7 +26,7 @@ #include "programmer.h" #include "spi.h"
-int spi_send_command(struct flashctx *flash, unsigned int writecnt, +int spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { @@ -34,12 +34,12 @@ readarr); }
-int spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds) +int spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds) { return flash->mst->spi.multicommand(flash, cmds); }
-int default_spi_send_command(struct flashctx *flash, unsigned int writecnt, +int default_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) @@ -60,7 +60,7 @@ return spi_send_multicommand(flash, cmd); }
-int default_spi_send_multicommand(struct flashctx *flash, +int default_spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds) { int result = 0; diff --git a/spi25_statusreg.c b/spi25_statusreg.c index 8cd5a28..4b9b2a9 100644 --- a/spi25_statusreg.c +++ b/spi25_statusreg.c @@ -22,7 +22,7 @@ #include "spi.h"
/* === Generic functions === */ -static int spi_write_status_register_flag(struct flashctx *flash, int status, const unsigned char enable_opcode) +static int spi_write_status_register_flag(const struct flashctx *flash, int status, const unsigned char enable_opcode) { int result; int i = 0; @@ -73,7 +73,7 @@ return 0; }
-int spi_write_status_register(struct flashctx *flash, int status) +int spi_write_status_register(const struct flashctx *flash, int status) { int feature_bits = flash->chip->feature_bits; int ret = 1; @@ -90,7 +90,7 @@ return ret; }
-uint8_t spi_read_status_register(struct flashctx *flash) +uint8_t spi_read_status_register(const struct flashctx *flash) { static const unsigned char cmd[JEDEC_RDSR_OUTSIZE] = { JEDEC_RDSR }; /* FIXME: No workarounds for driver/hardware bugs in generic code. */ diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 7338911..39a0c9b 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -323,7 +323,7 @@ return 0; }
-static int stlinkv3_spi_transmit(struct flashctx *flash, +static int stlinkv3_spi_transmit(const struct flashctx *flash, unsigned int write_cnt, unsigned int read_cnt, const unsigned char *write_arr, diff --git a/usbblaster_spi.c b/usbblaster_spi.c index e2a0a4f..46de86c 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -179,7 +179,7 @@ }
/* Returns 0 upon success, a negative number upon errors. */ -static int usbblaster_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int usbblaster_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { uint8_t cmd; diff --git a/wbsio_spi.c b/wbsio_spi.c index f4f6af9..1674825 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -57,7 +57,7 @@ return flashport; }
-static int wbsio_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int wbsio_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -110,7 +110,7 @@ * Would one more byte of RAM in the chip (to get all 24 bits) really make * such a big difference? */ -static int wbsio_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int wbsio_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr)
Hello build bot (Jenkins), Angel Pons,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/40324
to look at the new patch set (#2).
Change subject: const'ify flashctx to align signatures with cros flashrom ......................................................................
const'ify flashctx to align signatures with cros flashrom
The ChromiumOS flashrom fork has since const'ify flashctx in a few places. This aligns the function signatures to match with downstream to ease forward porting patches out of downstream back into mainline flashrom.
This patch is minimum viable alignment and so feedback is welcome.
Change-Id: Iff6dbda13cb0d941481c0d204b9c30895630fbd1 Signed-off-by: Edward O'Callaghan quasisec@google.com --- M bitbang_spi.c M buspirate_spi.c M ch341a_spi.c M chipdrivers.h M dediprog.c M digilent_spi.c M dummyflasher.c M flash.h M ft2232_spi.c M ichspi.c M it85spi.c M it87spi.c M jlink_spi.c M linux_spi.c M lspcon_i2c_spi.c M mstarddc_spi.c M pickit2_spi.c M programmer.h M raiden_debug_spi.c M sb600spi.c M serprog.c M spi.c M spi25_statusreg.c M stlinkv3_spi.c M usbblaster_spi.c M wbsio_spi.c 26 files changed, 53 insertions(+), 53 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/24/40324/2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/40324 )
Change subject: const'ify flashctx to align signatures with cros flashrom ......................................................................
Patch Set 2: Code-Review+1
Hello build bot (Jenkins), Nico Huber, Stefan Reinauer, Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/40324
to look at the new patch set (#3).
Change subject: const'ify flashctx to align signatures with cros flashrom ......................................................................
const'ify flashctx to align signatures with cros flashrom
The ChromiumOS flashrom fork has since const'ify flashctx in a few places. This aligns the function signatures to match with downstream to ease forward porting patches out of downstream back into mainline flashrom.
This patch is minimum viable alignment and so feedback is welcome.
Change-Id: Iff6dbda13cb0d941481c0d204b9c30895630fbd1 Signed-off-by: Edward O'Callaghan quasisec@google.com --- M bitbang_spi.c M buspirate_spi.c M ch341a_spi.c M chipdrivers.h M dediprog.c M digilent_spi.c M dummyflasher.c M flash.h M ft2232_spi.c M ichspi.c M it85spi.c M it87spi.c M jlink_spi.c M linux_spi.c M lspcon_i2c_spi.c M mstarddc_spi.c M pickit2_spi.c M programmer.h M raiden_debug_spi.c M sb600spi.c M serprog.c M spi.c M spi25_statusreg.c M stlinkv3_spi.c M usbblaster_spi.c M wbsio_spi.c 26 files changed, 53 insertions(+), 53 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/24/40324/3
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/40324 )
Change subject: const'ify flashctx to align signatures with cros flashrom ......................................................................
Patch Set 4: Code-Review+2
Angel Pons has submitted this change. ( https://review.coreboot.org/c/flashrom/+/40324 )
Change subject: const'ify flashctx to align signatures with cros flashrom ......................................................................
const'ify flashctx to align signatures with cros flashrom
The ChromiumOS flashrom fork has since const'ify flashctx in a few places. This aligns the function signatures to match with downstream to ease forward porting patches out of downstream back into mainline flashrom.
This patch is minimum viable alignment and so feedback is welcome.
Change-Id: Iff6dbda13cb0d941481c0d204b9c30895630fbd1 Signed-off-by: Edward O'Callaghan quasisec@google.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/40324 Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M bitbang_spi.c M buspirate_spi.c M ch341a_spi.c M chipdrivers.h M dediprog.c M digilent_spi.c M dummyflasher.c M flash.h M ft2232_spi.c M ichspi.c M it85spi.c M it87spi.c M jlink_spi.c M linux_spi.c M lspcon_i2c_spi.c M mstarddc_spi.c M pickit2_spi.c M programmer.h M raiden_debug_spi.c M sb600spi.c M serprog.c M spi.c M spi25_statusreg.c M stlinkv3_spi.c M usbblaster_spi.c M wbsio_spi.c 26 files changed, 53 insertions(+), 53 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/bitbang_spi.c b/bitbang_spi.c index 7c183c3..ac50e67 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -64,7 +64,7 @@ return master->get_miso(); }
-static int bitbang_spi_send_command(struct flashctx *flash, +static int bitbang_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -145,7 +145,7 @@ } }
-static int bitbang_spi_send_command(struct flashctx *flash, +static int bitbang_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/buspirate_spi.c b/buspirate_spi.c index 826bd84..fdfc0e4 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -128,9 +128,9 @@ return ret; }
-static int buspirate_spi_send_command_v1(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v1(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int buspirate_spi_send_command_v2(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v2(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);
static struct spi_master spi_master_buspirate = { @@ -572,7 +572,7 @@ return 0; }
-static int buspirate_spi_send_command_v1(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v1(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { unsigned int i = 0; @@ -625,7 +625,7 @@ return ret; }
-static int buspirate_spi_send_command_v2(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int buspirate_spi_send_command_v2(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { int i = 0, ret = 0; diff --git a/ch341a_spi.c b/ch341a_spi.c index d3af32f..17c37eb 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -335,7 +335,7 @@ stored_delay_us += usecs; }
-static int ch341a_spi_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) +static int ch341a_spi_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { if (handle == NULL) return -1; diff --git a/chipdrivers.h b/chipdrivers.h index aa24085..04963c2 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -65,8 +65,8 @@ int spi_set_extended_address(struct flashctx *, uint8_t addr_high);
/* spi25_statusreg.c */ -uint8_t spi_read_status_register(struct flashctx *flash); -int spi_write_status_register(struct flashctx *flash, int status); +uint8_t spi_read_status_register(const struct flashctx *flash); +int spi_write_status_register(const struct flashctx *flash, int status); int s25fs_read_cr(struct flashctx *const flash, uint32_t addr); int s25fs_write_cr(struct flashctx *const flash, uint32_t addr, uint8_t data); int s25fs_restore_cr3nv(struct flashctx *const flash, uint8_t cfg); diff --git a/dediprog.c b/dediprog.c index 175e099..1f7c3d0 100644 --- a/dediprog.c +++ b/dediprog.c @@ -714,7 +714,7 @@ return dediprog_spi_write(flash, buf, start, len, WRITE_MODE_2B_AAI); }
-static int dediprog_spi_send_command(struct flashctx *flash, +static int dediprog_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, diff --git a/digilent_spi.c b/digilent_spi.c index 13a876e..0f7a9da 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -257,7 +257,7 @@ return 0; }
-static int digilent_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int digilent_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { int ret; diff --git a/dummyflasher.c b/dummyflasher.c index b9f6126..e1a1d80 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -93,7 +93,7 @@
static unsigned int spi_write_256_chunksize = 256;
-static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int dummy_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); @@ -818,7 +818,7 @@ } #endif
-static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int dummy_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/flash.h b/flash.h index 1ee0f0f..1278e86 100644 --- a/flash.h +++ b/flash.h @@ -418,8 +418,8 @@ unsigned char *readarr; }; #define NULL_SPI_CMD { 0, 0, NULL, NULL, } -int spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -int spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); +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);
enum chipbustype get_buses_supported(void); #endif /* !__FLASH_H__ */ diff --git a/ft2232_spi.c b/ft2232_spi.c index 9f4c7f0..87e6057 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -155,7 +155,7 @@ return 0; }
-static int ft2232_spi_send_command(struct flashctx *flash, +static int ft2232_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -459,7 +459,7 @@ }
/* Returns 0 upon success, a negative number upon errors. */ -static int ft2232_spi_send_command(struct flashctx *flash, +static int ft2232_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/ichspi.c b/ichspi.c index 12ee126..c780d52 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1103,7 +1103,7 @@ } }
-static int ich_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int ich_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) @@ -1506,7 +1506,7 @@ return 0; }
-static int ich_spi_send_multicommand(struct flashctx *flash, +static int ich_spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds) { int ret = 0; diff --git a/it85spi.c b/it85spi.c index 5ce9193..b998790 100644 --- a/it85spi.c +++ b/it85spi.c @@ -270,7 +270,7 @@ return 0; }
-static int it85xx_spi_send_command(struct flashctx *flash, +static int it85xx_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -322,7 +322,7 @@ * 3. read date from LPC/FWH address 0xffff_fdxxh (drive CE# low and get * data from MISO) */ -static int it85xx_spi_send_command(struct flashctx *flash, +static int it85xx_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/it87spi.c b/it87spi.c index f5955fe..8224db0 100644 --- a/it87spi.c +++ b/it87spi.c @@ -98,7 +98,7 @@ return; }
-static int it8716f_spi_send_command(struct flashctx *flash, +static int it8716f_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -275,7 +275,7 @@ * commands with the address in inverse wire order. That's why the register * ordering in case 4 and 5 may seem strange. */ -static int it8716f_spi_send_command(struct flashctx *flash, +static int it8716f_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/jlink_spi.c b/jlink_spi.c index 8a69b41..36611bf 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -101,7 +101,7 @@ return true; }
-static int jlink_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int jlink_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { uint32_t length; diff --git a/linux_spi.c b/linux_spi.c index aa73c18..1ef8f2b 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -49,7 +49,7 @@ static size_t max_kernel_buf_size;
static int linux_spi_shutdown(void *data); -static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int linux_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *txbuf, unsigned char *rxbuf); @@ -183,7 +183,7 @@ return 0; }
-static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int linux_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *txbuf, unsigned char *rxbuf) diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c index 8de2c14..72ed78a 100644 --- a/lspcon_i2c_spi.c +++ b/lspcon_i2c_spi.c @@ -98,7 +98,7 @@ return i2c_read(fd, addr, &data) == len ? 0 : SPI_GENERIC_ERROR; }
-static int get_fd_from_context(struct flashctx *flash) +static int get_fd_from_context(const struct flashctx *flash) { if (!flash || !flash->mst || !flash->mst->spi.data) { msg_perr("Unable to extract fd from flash context.\n"); @@ -251,7 +251,7 @@ return ret; }
-static int lspcon_i2c_spi_send_command(struct flashctx *flash, +static int lspcon_i2c_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/mstarddc_spi.c b/mstarddc_spi.c index db11157..48d6204 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -153,7 +153,7 @@ }
/* Returns 0 upon success, a negative number upon errors. */ -static int mstarddc_spi_send_command(struct flashctx *flash, +static int mstarddc_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, diff --git a/pickit2_spi.c b/pickit2_spi.c index 2936ee8..0bc17af 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -195,7 +195,7 @@ return 0; }
-static int pickit2_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int pickit2_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) {
diff --git a/programmer.h b/programmer.h index f6c5399..49a9d29 100644 --- a/programmer.h +++ b/programmer.h @@ -612,9 +612,9 @@ uint32_t features; unsigned int max_data_read; // (Ideally,) maximum data read size in one go (excluding opcode+address). unsigned int max_data_write; // (Ideally,) maximum data write size in one go (excluding opcode+address). - int (*command)(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, + int (*command)(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); - int (*multicommand)(struct flashctx *flash, struct spi_command *cmds); + int (*multicommand)(const struct flashctx *flash, struct spi_command *cmds);
/* Optimized functions for this master */ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); @@ -623,9 +623,9 @@ const void *data; };
-int default_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +int default_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -int default_spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); +int default_spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index a0d6578..306d8fb 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -284,7 +284,7 @@ return response_packet.status_code; }
-static int send_command(struct flashctx *flash, +static int send_command(const struct flashctx *flash, unsigned int write_count, unsigned int read_count, const unsigned char *write_buffer, diff --git a/sb600spi.c b/sb600spi.c index a649253..5892d57 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -56,9 +56,9 @@ #define FIFO_SIZE_OLD 8 #define FIFO_SIZE_YANGTZE 71
-static int sb600_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int sb600_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int spi100_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int spi100_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);
static struct spi_master spi_master_sb600 = { @@ -190,7 +190,7 @@ }
/* Check the number of bytes to be transmitted and extract opcode. */ -static int check_readwritecnt(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt) +static int check_readwritecnt(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt) { unsigned int maxwritecnt = flash->mst->spi.max_data_write + 3; if (writecnt > maxwritecnt) { @@ -217,7 +217,7 @@ msg_pspew("done\n"); }
-static int sb600_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int sb600_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) @@ -303,7 +303,7 @@ return 0; }
-static int spi100_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int spi100_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/serprog.c b/serprog.c index 37a9db4..1befce1 100644 --- a/serprog.c +++ b/serprog.c @@ -295,7 +295,7 @@ return 0; }
-static int serprog_spi_send_command(struct flashctx *flash, +static int serprog_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -894,7 +894,7 @@ sp_prev_was_write = 0; }
-static int serprog_spi_send_command(struct flashctx *flash, +static int serprog_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) diff --git a/spi.c b/spi.c index 489baf3..aed2a92 100644 --- a/spi.c +++ b/spi.c @@ -26,7 +26,7 @@ #include "programmer.h" #include "spi.h"
-int spi_send_command(struct flashctx *flash, unsigned int writecnt, +int spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { @@ -34,12 +34,12 @@ readarr); }
-int spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds) +int spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds) { return flash->mst->spi.multicommand(flash, cmds); }
-int default_spi_send_command(struct flashctx *flash, unsigned int writecnt, +int default_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) @@ -60,7 +60,7 @@ return spi_send_multicommand(flash, cmd); }
-int default_spi_send_multicommand(struct flashctx *flash, +int default_spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds) { int result = 0; diff --git a/spi25_statusreg.c b/spi25_statusreg.c index aa574d5..083a832 100644 --- a/spi25_statusreg.c +++ b/spi25_statusreg.c @@ -22,7 +22,7 @@ #include "spi.h"
/* === Generic functions === */ -static int spi_write_status_register_flag(struct flashctx *flash, int status, const unsigned char enable_opcode) +static int spi_write_status_register_flag(const struct flashctx *flash, int status, const unsigned char enable_opcode) { int result; int i = 0; @@ -73,7 +73,7 @@ return 0; }
-int spi_write_status_register(struct flashctx *flash, int status) +int spi_write_status_register(const struct flashctx *flash, int status) { int feature_bits = flash->chip->feature_bits; int ret = 1; @@ -90,7 +90,7 @@ return ret; }
-uint8_t spi_read_status_register(struct flashctx *flash) +uint8_t spi_read_status_register(const struct flashctx *flash) { static const unsigned char cmd[JEDEC_RDSR_OUTSIZE] = { JEDEC_RDSR }; /* FIXME: No workarounds for driver/hardware bugs in generic code. */ diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 114c0ca..ae865be 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -323,7 +323,7 @@ return 0; }
-static int stlinkv3_spi_transmit(struct flashctx *flash, +static int stlinkv3_spi_transmit(const struct flashctx *flash, unsigned int write_cnt, unsigned int read_cnt, const unsigned char *write_arr, diff --git a/usbblaster_spi.c b/usbblaster_spi.c index e2a0a4f..46de86c 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -179,7 +179,7 @@ }
/* Returns 0 upon success, a negative number upon errors. */ -static int usbblaster_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, +static int usbblaster_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { uint8_t cmd; diff --git a/wbsio_spi.c b/wbsio_spi.c index f4f6af9..1674825 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -57,7 +57,7 @@ return flashport; }
-static int wbsio_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int wbsio_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -110,7 +110,7 @@ * Would one more byte of RAM in the chip (to get all 24 bits) really make * such a big difference? */ -static int wbsio_spi_send_command(struct flashctx *flash, unsigned int writecnt, +static int wbsio_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr)
-
Angel Pons (Code Review) -
Edward O'Callaghan (Code Review)