Change in ...flashrom[master]: flashchips.c: Whitespace consistency

[Alan Green (Code Review)]

Alan Green has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33828

Change subject: flashchips.c: Whitespace consistency
......................................................................

flashchips.c: Whitespace consistency

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 
Change-Id: Ib2193798cc52641d6c443f8851903c749b31cb74
---
M flashchips.c
1 file changed, 101 insertions(+), 98 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/28/33828/1

diff --git a/flashchips.c b/flashchips.c
index d85ea74..644479e 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1827,7 +1827,7 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.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,
@@ -10392,7 +10392,7 @@
    	.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,
@@ -10426,7 +10426,7 @@
    	.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,
@@ -10459,7 +10459,7 @@
    	.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,
@@ -10492,7 +10492,7 @@
    	.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,
@@ -10531,7 +10531,7 @@
    	.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,
@@ -10988,6 +10988,7 @@
    	.read		= spi_chip_read, /* Fast read (0x0B), dual I/O supported */
    	.voltage	= {2700, 3600},
    },
+
    {
    	.vendor		= "PMC",
    	.name		= "Pm25LD512(C)",
@@ -11677,7 +11678,7 @@
    	.tested		= TEST_UNTESTED,
    	.probe		= probe_jedec,
    	.probe_timing	= TIMING_ZERO,	/* Datasheet has no timing info specified */
-		.block_erasers =
+		.block_erasers	=
    	{
    		{
    			.eraseblocks = { {4 * 1024, 64} },
@@ -11707,7 +11708,7 @@
    	.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} },
@@ -13568,6 +13569,7 @@
    	.read		= spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
    	.voltage	= {2700, 3600},
    },
+
    {
    	.vendor		= "SST",
    	.name		= "SST26VF032B(A)",
@@ -13606,7 +13608,6 @@
    	.voltage	= {2700, 3600},
    },

-
    {
    	.vendor		= "SST",
    	.name		= "SST26VF064B(A)",
@@ -14740,6 +14741,7 @@
    	.read		= read_memmapped,
    	.voltage	= {4500, 5500},
    },
+
    {
    	/* FIXME: this has WORD/BYTE sequences; 2AA for word, 555 for byte */
    	.vendor		= "ST",
@@ -14831,7 +14833,7 @@
    	.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,
@@ -16393,18 +16395,18 @@
    },

{
-		.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} },
@@ -16414,26 +16416,26 @@
    			.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} },
@@ -16443,26 +16445,26 @@
    			.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} },
@@ -16472,12 +16474,13 @@
    			.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",
@@ -17294,18 +17297,18 @@
    },

{
-		.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} },
@@ -17324,26 +17327,26 @@
    			.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} },
@@ -17362,11 +17365,11 @@
    			.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},
    },

{

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33828 )

Change subject: flashchips.c: Whitespace consistency
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

Looks good, just a tiny suggestion for the commit message (easily addressed using the web editor).

https://review.coreboot.org/#/c/33828/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33828/1//COMMIT_MSG@7 
PS1, Line 7: Whitespace consistency
Make whitespace consistent

Change in ...flashrom[master]: flashchips.c: Make whitespace consistency.

[Alan Green (Code Review)]

Hello Edward O'Callaghan, Angel Pons, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/33828

to look at the new patch set (#2).

Change subject: flashchips.c: Make whitespace consistency.
......................................................................

flashchips.c: Make whitespace consistency.

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 
Change-Id: Ib2193798cc52641d6c443f8851903c749b31cb74
---
M flashchips.c
1 file changed, 101 insertions(+), 98 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/28/33828/2

Change in ...flashrom[master]: flashchips.c: Make whitespace consistent

[Alan Green (Code Review)]

Hello Edward O'Callaghan, Angel Pons, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/33828

to look at the new patch set (#3).

Change subject: flashchips.c: Make whitespace consistent
......................................................................

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 
Change-Id: Ib2193798cc52641d6c443f8851903c749b31cb74
---
M flashchips.c
1 file changed, 101 insertions(+), 98 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/28/33828/3

Change in ...flashrom[master]: flashchips.c: Make whitespace consistent

[Alan Green (Code Review)]

Alan Green has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33828 )

Change subject: flashchips.c: Make whitespace consistent
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/33828/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33828/1//COMMIT_MSG@7 
PS1, Line 7: Whitespace consistency
> Make whitespace consistent

Done

Change in ...flashrom[master]: flashchips.c: Make whitespace consistent

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33828 )

Change subject: flashchips.c: Make whitespace consistent
......................................................................

Patch Set 3: Code-Review+2

Change in ...flashrom[master]: flashchips.c: Make whitespace consistent

[Alan Green (Code Review)]

Hello HAOUAS Elyes, Edward O'Callaghan, Angel Pons, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/33828

to look at the new patch set (#6).

Change subject: flashchips.c: Make whitespace consistent
......................................................................

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 
Change-Id: Ib2193798cc52641d6c443f8851903c749b31cb74
---
M flashchips.c
1 file changed, 101 insertions(+), 98 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/28/33828/6

Change in ...flashrom[master]: flashchips.c: Make whitespace consistent

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33828 )

Change subject: flashchips.c: Make whitespace consistent
......................................................................

Patch Set 6: Code-Review+2

Change in ...flashrom[master]: flashchips.c: Make whitespace consistent

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33828 )

Change subject: flashchips.c: Make whitespace consistent
......................................................................

Patch Set 6:

I agree to the changes. Though, if you want to keep
tool compatibility, you have to make this whitespace
style a rule. Otherwise the file may degrade again.
Such a rule would be best implemented as a pre-commit
check, I guess.

Change in ...flashrom[master]: flashchips.c: Make whitespace consistent

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/33828 )

Change subject: flashchips.c: Make whitespace consistent
......................................................................

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 
Change-Id: Ib2193798cc52641d6c443f8851903c749b31cb74
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33828
Reviewed-by: Edward O'Callaghan 
Reviewed-by: HAOUAS Elyes 
Tested-by: build bot (Jenkins) 
---
M flashchips.c
1 file changed, 101 insertions(+), 98 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  HAOUAS Elyes: Looks good to me, approved
  Edward O'Callaghan: Looks good to me, approved

diff --git a/flashchips.c b/flashchips.c
index 09c4f8e..f7ee829 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1827,7 +1827,7 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.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 @@
    	.read		= spi_chip_read, /* Fast read (0x0B), dual I/O supported */
    	.voltage	= {2700, 3600},
    },
+
    {
    	.vendor		= "PMC",
    	.name		= "Pm25LD512(C)",
@@ -11726,7 +11727,7 @@
    	.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 @@
    	.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 @@
    	.read		= spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
    	.voltage	= {2700, 3600},
    },
+
    {
    	.vendor		= "SST",
    	.name		= "SST26VF032B(A)",
@@ -13655,7 +13657,6 @@
    	.voltage	= {2700, 3600},
    },

-
    {
    	.vendor		= "SST",
    	.name		= "SST26VF064B(A)",
@@ -14789,6 +14790,7 @@
    	.read		= read_memmapped,
    	.voltage	= {4500, 5500},
    },
+
    {
    	/* FIXME: this has WORD/BYTE sequences; 2AA for word, 555 for byte */
    	.vendor		= "ST",
@@ -14880,7 +14882,7 @@
    	.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 @@
    },

{
-		.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 @@
    			.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 @@
    			.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 @@
    			.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 @@
    },

{
-		.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 @@
    			.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 @@
    			.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},
    },

{