diff options
author | Alan Green <avg@google.com> | 2019-06-27 15:41:50 +1000 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2019-07-02 09:45:53 +0000 |
commit | fa3fcd3ab353deb959130ee82f72f845f0fd8209 (patch) | |
tree | 1b0839e1cb7b8e257ded1dd9d132b043c76f486a | |
parent | f75d8c558778a47e90f814860b3c664115aefc36 (diff) | |
download | flashrom-fa3fcd3ab353deb959130ee82f72f845f0fd8209.tar.gz flashrom-fa3fcd3ab353deb959130ee82f72f845f0fd8209.tar.bz2 flashrom-fa3fcd3ab353deb959130ee82f72f845f0fd8209.zip |
flashchips.c: Make whitespace consistent
For consistency, and to make the file amenable to manipulation by tools,
use only tabs when indenting. Some previous changes had introduced
spaces for indenting.
Also ensure that every table entry is separated by a single blank line.
Signed-off-by: Alan Green <avg@google.com>
Change-Id: Ib2193798cc52641d6c443f8851903c749b31cb74
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33828
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r-- | flashchips.c | 199 |
1 files changed, 101 insertions, 98 deletions
diff --git a/flashchips.c b/flashchips.c index 09c4f8e0..f7ee8295 100644 --- a/flashchips.c +++ b/flashchips.c @@ -1827,7 +1827,7 @@ const struct flashchip flashchips[] = { .vendor = "Atmel", .name = "AT25DL081", .bustype = BUS_SPI, - .manufacture_id = ATMEL_ID, + .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF081, .total_size = 1024, .page_size = 256, @@ -1866,7 +1866,7 @@ const struct flashchip flashchips[] = { .vendor = "Atmel", .name = "AT25DL161", .bustype = BUS_SPI, - .manufacture_id = ATMEL_ID, + .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DL161, .total_size = 2048, .page_size = 256, @@ -7428,7 +7428,7 @@ const struct flashchip flashchips[] = { .vendor = "ISSI", .name = "IS25WP032", .bustype = BUS_SPI, - .manufacture_id = ISSI_ID_SPI, + .manufacture_id = ISSI_ID_SPI, .model_id = ISSI_IS25WP032, .total_size = 4096, .page_size = 256, @@ -7470,7 +7470,7 @@ const struct flashchip flashchips[] = { .vendor = "ISSI", .name = "IS25WP064", .bustype = BUS_SPI, - .manufacture_id = ISSI_ID_SPI, + .manufacture_id = ISSI_ID_SPI, .model_id = ISSI_IS25WP064, .total_size = 8192, .page_size = 256, @@ -10441,7 +10441,7 @@ const struct flashchip flashchips[] = { .vendor = "Micron/Numonyx/ST", .name = "N25Q064..3E", /* ..3E = 3V, uniform 64KB/4KB blocks/sectors */ .bustype = BUS_SPI, - .manufacture_id = ST_ID, + .manufacture_id = ST_ID, .model_id = ST_N25Q064__3E, .total_size = 8192, .page_size = 256, @@ -10475,7 +10475,7 @@ const struct flashchip flashchips[] = { .vendor = "Micron/Numonyx/ST", .name = "N25Q128..1E", /* ..1E = 1.8V, uniform 64KB/4KB blocks/sectors */ .bustype = BUS_SPI, - .manufacture_id = ST_ID, + .manufacture_id = ST_ID, .model_id = ST_N25Q128__1E, .total_size = 16384, .page_size = 256, @@ -10508,7 +10508,7 @@ const struct flashchip flashchips[] = { .vendor = "Micron/Numonyx/ST", .name = "N25Q128..3E", /* ..3E = 3V, uniform 64KB/4KB blocks/sectors */ .bustype = BUS_SPI, - .manufacture_id = ST_ID, + .manufacture_id = ST_ID, .model_id = ST_N25Q128__3E, .total_size = 16384, .page_size = 256, @@ -10541,7 +10541,7 @@ const struct flashchip flashchips[] = { .vendor = "Micron", .name = "N25Q256..3E/MT25QL256", /* ..3E/L = 3V, uniform 64KB/4KB blocks/sectors */ .bustype = BUS_SPI, - .manufacture_id = ST_ID, + .manufacture_id = ST_ID, .model_id = ST_N25Q256__3E, .total_size = 32768, .page_size = 256, @@ -10580,7 +10580,7 @@ const struct flashchip flashchips[] = { .vendor = "Micron", .name = "N25Q512..3E/MT25QL512", /* ..3E/L = 3V, uniform 64KB/4KB blocks/sectors */ .bustype = BUS_SPI, - .manufacture_id = ST_ID, + .manufacture_id = ST_ID, .model_id = ST_N25Q512__3E, .total_size = 65536, .page_size = 256, @@ -11037,6 +11037,7 @@ const struct flashchip flashchips[] = { .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, }, + { .vendor = "PMC", .name = "Pm25LD512(C)", @@ -11726,7 +11727,7 @@ const struct flashchip flashchips[] = { .tested = TEST_UNTESTED, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ - .block_erasers = + .block_erasers = { { .eraseblocks = { {4 * 1024, 64} }, @@ -11756,7 +11757,7 @@ const struct flashchip flashchips[] = { .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ - .block_erasers = + .block_erasers = { { .eraseblocks = { {4 * 1024, 128} }, @@ -13617,6 +13618,7 @@ const struct flashchip flashchips[] = { .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, + { .vendor = "SST", .name = "SST26VF032B(A)", @@ -13655,7 +13657,6 @@ const struct flashchip flashchips[] = { .voltage = {2700, 3600}, }, - { .vendor = "SST", .name = "SST26VF064B(A)", @@ -14789,6 +14790,7 @@ const struct flashchip flashchips[] = { .read = read_memmapped, .voltage = {4500, 5500}, }, + { /* FIXME: this has WORD/BYTE sequences; 2AA for word, 555 for byte */ .vendor = "ST", @@ -14880,7 +14882,7 @@ const struct flashchip flashchips[] = { .vendor = "ST", .name = "M29W512B", .bustype = BUS_PARALLEL, - .manufacture_id = ST_ID, + .manufacture_id = ST_ID, .model_id = ST_M29W512B, .total_size = 64, .page_size = 64 * 1024, @@ -16442,18 +16444,18 @@ const struct flashchip flashchips[] = { }, { - .vendor = "Winbond", - .name = "W25P80", - .bustype = BUS_SPI, - .manufacture_id = WINBOND_NEX_ID, - .model_id = WINBOND_NEX_W25P80, - .total_size = 1024, - .page_size = 256, - .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, - .probe_timing = TIMING_ZERO, - .block_erasers = + .vendor = "Winbond", + .name = "W25P80", + .bustype = BUS_SPI, + .manufacture_id = WINBOND_NEX_ID, + .model_id = WINBOND_NEX_W25P80, + .total_size = 1024, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = { { .eraseblocks = { {64 * 1024, 16} }, @@ -16463,26 +16465,26 @@ const struct flashchip flashchips[] = { .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ - .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ - .voltage = {2700, 3600}, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) supported */ + .voltage = {2700, 3600}, }, { - .vendor = "Winbond", - .name = "W25P16", - .bustype = BUS_SPI, - .manufacture_id = WINBOND_NEX_ID, - .model_id = WINBOND_NEX_W25P16, - .total_size = 2048, - .page_size = 256, - .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, - .probe_timing = TIMING_ZERO, - .block_erasers = + .vendor = "Winbond", + .name = "W25P16", + .bustype = BUS_SPI, + .manufacture_id = WINBOND_NEX_ID, + .model_id = WINBOND_NEX_W25P16, + .total_size = 2048, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = { { .eraseblocks = { {64 * 1024, 32} }, @@ -16492,26 +16494,26 @@ const struct flashchip flashchips[] = { .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ - .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ - .voltage = {2700, 3600}, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) supported */ + .voltage = {2700, 3600}, }, { - .vendor = "Winbond", - .name = "W25P32", - .bustype = BUS_SPI, - .manufacture_id = WINBOND_NEX_ID, - .model_id = WINBOND_NEX_W25P32, - .total_size = 4096, - .page_size = 256, - .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, - .probe_timing = TIMING_ZERO, - .block_erasers = + .vendor = "Winbond", + .name = "W25P32", + .bustype = BUS_SPI, + .manufacture_id = WINBOND_NEX_ID, + .model_id = WINBOND_NEX_W25P32, + .total_size = 4096, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = { { .eraseblocks = { {64 * 1024, 64} }, @@ -16521,12 +16523,13 @@ const struct flashchip flashchips[] = { .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ - .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ - .voltage = {2700, 3600}, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) supported */ + .voltage = {2700, 3600}, }, + { .vendor = "Winbond", .name = "W29C512A/W29EE512", @@ -17343,18 +17346,18 @@ const struct flashchip flashchips[] = { }, { - .vendor = "Zetta Device", - .name = "ZD25D20", - .bustype = BUS_SPI, - .manufacture_id = ZETTADEVICE_ID, - .model_id = ZETTADEVICE_ZD25D20, - .total_size = 256, - .page_size = 256, - .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, - .probe_timing = TIMING_ZERO, - .block_erasers = + .vendor = "Zetta Device", + .name = "ZD25D20", + .bustype = BUS_SPI, + .manufacture_id = ZETTADEVICE_ID, + .model_id = ZETTADEVICE_ZD25D20, + .total_size = 256, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = { { .eraseblocks = { {4 * 1024, 64} }, @@ -17373,26 +17376,26 @@ const struct flashchip flashchips[] = { .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ - .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, - .read = spi_chip_read, - .voltage = {2700, 3600}, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, }, { - .vendor = "Zetta Device", - .name = "ZD25D40", - .bustype = BUS_SPI, - .manufacture_id = ZETTADEVICE_ID, - .model_id = ZETTADEVICE_ZD25D40, - .total_size = 512, - .page_size = 256, - .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, - .probe_timing = TIMING_ZERO, - .block_erasers = + .vendor = "Zetta Device", + .name = "ZD25D40", + .bustype = BUS_SPI, + .manufacture_id = ZETTADEVICE_ID, + .model_id = ZETTADEVICE_ZD25D40, + .total_size = 512, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = { { .eraseblocks = { {4 * 1024, 128} }, @@ -17411,11 +17414,11 @@ const struct flashchip flashchips[] = { .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ - .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, - .read = spi_chip_read, - .voltage = {2700, 3600}, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, }, { |