diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2020-11-17 18:38:15 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2020-11-22 23:25:03 +0000 |
| commit | b2b45076576e107a6054c8997dc6f738bd4a4003 (patch) | |
| tree | 2613855eeac55ee02ad94d30c4ee029993c0bef3 /it87spi.c | |
| parent | f65b9dee2348c1959e67d3fe9a683291257507e8 (diff) | |
| download | flashrom-b2b45076576e107a6054c8997dc6f738bd4a4003.tar.gz flashrom-b2b45076576e107a6054c8997dc6f738bd4a4003.tar.bz2 flashrom-b2b45076576e107a6054c8997dc6f738bd4a4003.zip | |
it87spi.c: Remove 'it8716f_' prefix from local state tracker
The local state inhabited within the state tracker has now obvious scope
and therefore we can drop the redundant prefix for readability.
BUG=b:173477683
TEST=builds
Change-Id: Ic1c9647ef640152417a66dbb411554b83e30ad75
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/47663
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Sam McNally <sammc@google.com>
Diffstat (limited to 'it87spi.c')
| -rw-r--r-- | it87spi.c | 42 |
1 files changed, 21 insertions, 21 deletions
@@ -38,7 +38,7 @@ #define CHIP_VER_REG 0x22 struct it8716f_spi_data { - uint16_t it8716f_flashport; + uint16_t flashport; /* use fast 33MHz SPI (<>0) or slow 16MHz (0) */ int fast_spi; }; @@ -127,11 +127,11 @@ static int it8716f_spi_page_program(struct flashctx *flash, const uint8_t *buf, if (result) return result; /* FIXME: The command below seems to be redundant or wrong. */ - OUTB(0x06, data->it8716f_flashport + 1); - OUTB(((2 + (data->fast_spi ? 1 : 0)) << 4), data->it8716f_flashport); + OUTB(0x06, data->flashport + 1); + OUTB(((2 + (data->fast_spi ? 1 : 0)) << 4), data->flashport); for (i = 0; i < flash->chip->page_size; i++) mmio_writeb(buf[i], (void *)(bios + start + i)); - OUTB(0, data->it8716f_flashport); + OUTB(0, data->flashport); /* Wait until the Write-In-Progress bit is cleared. * This usually takes 1-10 ms, so wait in 1 ms steps. */ @@ -161,7 +161,7 @@ static int it8716f_spi_send_command(const struct flashctx *flash, return SPI_GENERIC_ERROR; do { - busy = INB(data->it8716f_flashport) & 0x80; + busy = INB(data->flashport) & 0x80; } while (busy); if (readcnt > 3) { msg_pinfo("%s called with unsupported readcnt %i.\n", @@ -170,27 +170,27 @@ static int it8716f_spi_send_command(const struct flashctx *flash, } switch (writecnt) { case 1: - OUTB(writearr[0], data->it8716f_flashport + 1); + OUTB(writearr[0], data->flashport + 1); writeenc = 0x0; break; case 2: - OUTB(writearr[0], data->it8716f_flashport + 1); - OUTB(writearr[1], data->it8716f_flashport + 7); + OUTB(writearr[0], data->flashport + 1); + OUTB(writearr[1], data->flashport + 7); writeenc = 0x1; break; case 4: - OUTB(writearr[0], data->it8716f_flashport + 1); - OUTB(writearr[1], data->it8716f_flashport + 4); - OUTB(writearr[2], data->it8716f_flashport + 3); - OUTB(writearr[3], data->it8716f_flashport + 2); + OUTB(writearr[0], data->flashport + 1); + OUTB(writearr[1], data->flashport + 4); + OUTB(writearr[2], data->flashport + 3); + OUTB(writearr[3], data->flashport + 2); writeenc = 0x2; break; case 5: - OUTB(writearr[0], data->it8716f_flashport + 1); - OUTB(writearr[1], data->it8716f_flashport + 4); - OUTB(writearr[2], data->it8716f_flashport + 3); - OUTB(writearr[3], data->it8716f_flashport + 2); - OUTB(writearr[4], data->it8716f_flashport + 7); + OUTB(writearr[0], data->flashport + 1); + OUTB(writearr[1], data->flashport + 4); + OUTB(writearr[2], data->flashport + 3); + OUTB(writearr[3], data->flashport + 2); + OUTB(writearr[4], data->flashport + 7); writeenc = 0x3; break; default: @@ -204,17 +204,17 @@ static int it8716f_spi_send_command(const struct flashctx *flash, * We can't use writecnt directly, but have to use a strange encoding. */ OUTB(((0x4 + (data->fast_spi ? 1 : 0)) << 4) - | ((readcnt & 0x3) << 2) | (writeenc), data->it8716f_flashport); + | ((readcnt & 0x3) << 2) | (writeenc), data->flashport); if (readcnt > 0) { unsigned int i; do { - busy = INB(data->it8716f_flashport) & 0x80; + busy = INB(data->flashport) & 0x80; } while (busy); for (i = 0; i < readcnt; i++) - readarr[i] = INB(data->it8716f_flashport + 5 + i); + readarr[i] = INB(data->flashport + 5 + i); } return 0; @@ -417,7 +417,7 @@ static uint16_t it87spi_probe(uint16_t port) return SPI_GENERIC_ERROR; } - data->it8716f_flashport = flashport; + data->flashport = flashport; data->fast_spi = 1; spi_master_it87xx.data = data; |