November 2022 - flashrom-gerrit

[S] Change in flashrom[master]: chipdrivers: Rename s/erase_sector_stm50/stm50_sector_erase
by Edward O'Callaghan (Code Review) Nov. 1, 2022

Nov. 1, 2022

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69047 ) Change subject: chipdrivers: Rename s/erase_sector_stm50/stm50_sector_erase ...................................................................... chipdrivers: Rename s/erase_sector_stm50/stm50_sector_erase Change-Id: Ia916b5782abf04499ab46a540820acbe4a171068 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c M include/chipdrivers.h M stm50.c 3 files changed, 13 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/47/69047/1 diff --git a/flashrom.c b/flashrom.c index ec4ddbc..0f10ad4 100644 --- a/flashrom.c +++ b/flashrom.c @@ -371,7 +371,7 @@ case ERASE_SECTOR_28SF040: return &erase_sector_28sf040; case ERASE_BLOCK_82802AB: return &erase_block_82802ab; case ERASE_SECTOR_49LFXXXC: return &erase_sector_49lfxxxc; - case STM50_SECTOR_ERASE: return &erase_sector_stm50; // TODO rename to &stm50_sector_erase; + case STM50_SECTOR_ERASE: return &stm50_sector_erase; case EDI_CHIP_BLOCK_ERASE: return &edi_chip_block_erase; case TEST_ERASE_INJECTOR: return g_test_erase_injector; /* default: total function, 0 indicates no erase function set. diff --git a/include/chipdrivers.h b/include/chipdrivers.h index 3b07afe..9d1db76 100644 --- a/include/chipdrivers.h +++ b/include/chipdrivers.h @@ -198,7 +198,7 @@ bool w29ee011_can_override(const char *const chip_name, const char *const override_chip); /* stm50.c */ -int erase_sector_stm50(struct flashctx *flash, unsigned int block, unsigned int blocksize); +int stm50_sector_erase(struct flashctx *flash, unsigned int block, unsigned int blocksize); /* en29lv640b.c */ int probe_en29lv640b(struct flashctx *flash); diff --git a/stm50.c b/stm50.c index d495e09..9092a0f 100644 --- a/stm50.c +++ b/stm50.c @@ -47,7 +47,7 @@ * the block erase function instead. FIXME: This duplicates the behavior of the remaining erasers for blocks and * might be fixed when flashrom supports multiple functions per eraser or erasers that do erase parts of the * chip only. */ -int erase_sector_stm50(struct flashctx *flash, unsigned int addr, unsigned int len) +int stm50_sector_erase(struct flashctx *flash, unsigned int addr, unsigned int len) { if (len == 4096) return stm50_erase_sector(flash, addr); -- To view, visit https://review.coreboot.org/c/flashrom/+/69047 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia916b5782abf04499ab46a540820acbe4a171068 Gerrit-Change-Number: 69047 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: chipdrivers: Rename s/erase_opaque/opqaue_erase
by Edward O'Callaghan (Code Review) Nov. 1, 2022

Nov. 1, 2022

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69048 ) Change subject: chipdrivers: Rename s/erase_opaque/opqaue_erase ...................................................................... chipdrivers: Rename s/erase_opaque/opqaue_erase Change-Id: Icac7a3d2dfa1b00a12a1e151ea7a730cd25110a3 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c M include/chipdrivers.h M opaque.c 3 files changed, 13 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/48/69048/1 diff --git a/flashrom.c b/flashrom.c index 0f10ad4..a05dac0 100644 --- a/flashrom.c +++ b/flashrom.c @@ -361,7 +361,7 @@ case JEDEC_SECTOR_ERASE: return &erase_sector_jedec; // TODO rename to &jedec_sector_erase; case JEDEC_BLOCK_ERASE: return &erase_block_jedec; // TODO rename to &jedec_block_erase; case JEDEC_CHIP_BLOCK_ERASE: return &erase_chip_block_jedec; // TODO rename to &jedec_chip_block_erase; - case OPAQUE_ERASE: return &erase_opaque; // TODO rename to &opqaue_erase; + case OPAQUE_ERASE: return &opqaue_erase; case SPI_ERASE_AT45CS_SECTOR: return &spi_erase_at45cs_sector; case SPI_ERASE_AT45DB_BLOCK: return &spi_erase_at45db_block; case SPI_ERASE_AT45DB_CHIP: return &spi_erase_at45db_chip; diff --git a/include/chipdrivers.h b/include/chipdrivers.h index 9d1db76..657c902 100644 --- a/include/chipdrivers.h +++ b/include/chipdrivers.h @@ -114,7 +114,7 @@ int probe_opaque(struct flashctx *flash); int read_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int write_opaque(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); -int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); +int opqaue_erase(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); /* at45db.c */ int probe_spi_at45db(struct flashctx *flash); diff --git a/opaque.c b/opaque.c index 7704ec7..e794035 100644 --- a/opaque.c +++ b/opaque.c @@ -41,7 +41,7 @@ return flash->mst->opaque.write(flash, buf, start, len); } -int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen) +int opqaue_erase(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen) { return flash->mst->opaque.erase(flash, blockaddr, blocklen); } -- To view, visit https://review.coreboot.org/c/flashrom/+/69048 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icac7a3d2dfa1b00a12a1e151ea7a730cd25110a3 Gerrit-Change-Number: 69048 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: flashrom.c: Make 'chip_to_probe' a param to probe_flash()
by Anastasia Klimchuk (Code Review) Nov. 1, 2022

Nov. 1, 2022

Attention is currently required from: Edward O'Callaghan. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67091 ) Change subject: flashrom.c: Make 'chip_to_probe' a param to probe_flash() ...................................................................... Patch Set 14: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/67091 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifcdace07ea2135d83dea92cfa5c6bec8d7ddf05d Gerrit-Change-Number: 67091 Gerrit-PatchSet: 14 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 01:44:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: flashrom_tester: Use Path type for test data
by Evan Benn (Code Review) Nov. 1, 2022

Nov. 1, 2022

Evan Benn has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/68643 ) Change subject: flashrom_tester: Use Path type for test data ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/flashrom/+/68643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4a0b25c8c70fa6dfd682fba3db7d3bf06b2eb7ac Gerrit-Change-Number: 68643 Gerrit-PatchSet: 3 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: abandon

1 0

[M] Change in flashrom[master]: flashrom.c: Make 'chip_to_probe' a param to probe_flash()
by Felix Singer (Code Review) Nov. 1, 2022

Nov. 1, 2022

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67091 ) Change subject: flashrom.c: Make 'chip_to_probe' a param to probe_flash() ...................................................................... Patch Set 14: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/67091 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifcdace07ea2135d83dea92cfa5c6bec8d7ddf05d Gerrit-Change-Number: 67091 Gerrit-PatchSet: 14 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 01:28:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: flashrom.c: Make 'chip_to_probe' a param to probe_flash()
by Edward O'Callaghan (Code Review) Nov. 1, 2022

Nov. 1, 2022

Attention is currently required from: Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67091 ) Change subject: flashrom.c: Make 'chip_to_probe' a param to probe_flash() ...................................................................... Patch Set 13: (2 comments) File flashrom.c: https://review.coreboot.org/c/flashrom/+/67091/comment/f0177a99_09c3aa40 PS13, Line 868: goto notfound; > Please a line after that Done File w29ee011.c: https://review.coreboot.org/c/flashrom/+/67091/comment/cdf54eb1_d3b07caa PS13, Line 25: override_chip || strcmp(override_chip, chip_name) > Just an idea, a nit: How about moving this to a variable `can_override`? This also would allow us ha […] I think there is no need to be overly clever here and possibly make bugs unrelated to the objective of this patch. Marking as resolved. -- To view, visit https://review.coreboot.org/c/flashrom/+/67091 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifcdace07ea2135d83dea92cfa5c6bec8d7ddf05d Gerrit-Change-Number: 67091 Gerrit-PatchSet: 13 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 01:25:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: flashrom.c: Make 'chip_to_probe' a param to probe_flash()
by Edward O'Callaghan (Code Review) Nov. 1, 2022

Nov. 1, 2022

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk. Hello Felix Singer, build bot (Jenkins), Nikolai Artemiev, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/67091 to look at the new patch set (#14). Change subject: flashrom.c: Make 'chip_to_probe' a param to probe_flash() ...................................................................... flashrom.c: Make 'chip_to_probe' a param to probe_flash() Apart from the very bespoke case of 'probe_w29ee011()' the override 'chip_to_probe' name is a nature parameter to 'probe_flash()'. However we can deal with w29ee011 by providing a probe specific validation function to check if the chip can indeed be overriden. TEST=`./flashrom -p internal --flash-name`. Change-Id: Ifcdace07ea2135d83dea92cfa5c6bec8d7ddf05d Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M cli_classic.c M flashrom.c M include/chipdrivers.h M include/flash.h M libflashrom.c M w29ee011.c 6 files changed, 45 insertions(+), 18 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/91/67091/14 -- To view, visit https://review.coreboot.org/c/flashrom/+/67091 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifcdace07ea2135d83dea92cfa5c6bec8d7ddf05d Gerrit-Change-Number: 67091 Gerrit-PatchSet: 14 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[XL] Change in flashrom[master]: tree/: Convert flashchip read func ptr to enumerate
by Felix Singer (Code Review) Nov. 1, 2022

Nov. 1, 2022

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66788 ) ( 15 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tree/: Convert flashchip read func ptr to enumerate ...................................................................... tree/: Convert flashchip read func ptr to enumerate This forges the way for flashchips.c to be pure declarative data and lookup functions for dispatch to be pure. This means that the flashchips data could be extracted out to be agnostic data of the flashrom code and algorithms. TEST='R|W|E && --flash-name' on ARM, AMD & Intel DUT's. Change-Id: I612d46fefedf2b69e7e2064aa857fa0756efb4e7 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66788 Reviewed-by: Nikolai Artemiev <nartemiev(a)google.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M flashchips.c M flashrom.c M fmap.c M include/flash.h M libflashrom.c M tests/chip.c M tests/chip_wp.c 7 files changed, 675 insertions(+), 607 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Nikolai Artemiev: Looks good to me, but someone else must approve diff --git a/flashchips.c b/flashchips.c index 5003fab..6fc3a84 100644 --- a/flashchips.c +++ b/flashchips.c @@ -84,7 +84,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -116,7 +116,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -143,7 +143,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -170,7 +170,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -197,7 +197,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -224,7 +224,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -251,7 +251,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -278,7 +278,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -305,7 +305,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -336,7 +336,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -45R, others 2.7-3.6V */ }, @@ -367,7 +367,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -45R, others 2.7-3.6V */ }, @@ -399,7 +399,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -55, others 2.7-3.6V */ }, @@ -431,7 +431,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -55, others 2.7-3.6V */ }, @@ -463,7 +463,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -495,7 +495,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -527,7 +527,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70R, others 2.7-3.6V */ }, @@ -559,7 +559,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70R, others 2.7-3.6V */ }, @@ -586,7 +586,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -60R, others 2.7-3.6V*/ }, @@ -613,7 +613,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70R, others 2.7-3.6V */ }, @@ -645,7 +645,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -677,7 +677,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -709,7 +709,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -748,7 +748,7 @@ .printlock = spi_prettyprint_status_register_amic_a25l032, /* bit5: T/B, bit6: prot size */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -780,7 +780,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -814,7 +814,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -848,7 +848,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -880,7 +880,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -915,7 +915,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -950,7 +950,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -988,7 +988,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1026,7 +1026,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1061,7 +1061,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1096,7 +1096,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1136,7 +1136,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1171,7 +1171,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1203,7 +1203,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1238,7 +1238,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1278,7 +1278,7 @@ .printlock = spi_prettyprint_status_register_amic_a25l032, /* bit5: T/B, bit6: prot size */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1318,7 +1318,7 @@ .printlock = spi_prettyprint_status_register_amic_a25l032, /* bit5: T/B, bit6: prot size */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1359,7 +1359,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enhance (sic!) */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1391,7 +1391,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -1423,7 +1423,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -1450,7 +1450,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -1478,7 +1478,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -1517,7 +1517,7 @@ .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, /* 2.3-3.6V & 2.7-3.6V models available */ }, @@ -1556,7 +1556,7 @@ .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 3600}, }, @@ -1594,7 +1594,7 @@ .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, /* 2.3-3.6V & 2.7-3.6V models available */ }, @@ -1632,7 +1632,7 @@ .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1600, 2000}, /* Datasheet says range is 1.65-1.95 V */ }, @@ -1670,7 +1670,7 @@ .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1708,7 +1708,7 @@ .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1747,7 +1747,7 @@ .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1786,7 +1786,7 @@ .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1824,7 +1824,7 @@ .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1863,7 +1863,7 @@ .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, .write = SPI_CHIP_WRITE256, /* Dual I/O (0xA2) supported */ - .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {1650, 1950}, }, @@ -1902,7 +1902,7 @@ .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, .write = SPI_CHIP_WRITE256, /* Dual I/O (0xA2) supported */ - .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {1650, 1950}, }, @@ -1941,7 +1941,7 @@ .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -1972,7 +1972,7 @@ .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2001,7 +2001,7 @@ .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2031,7 +2031,7 @@ /* "Bits 5-6 are 0s when device is not in an internal write cycle." Better leave them alone: */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2060,7 +2060,7 @@ .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2090,7 +2090,7 @@ /* FIXME: It is not correct to use this one, because the BP1 bit is N/A. */ .unlock = spi_disable_blockprotect_at25f512a, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2132,7 +2132,7 @@ .printlock = spi_prettyprint_status_register_at25f512b, .unlock = spi_disable_blockprotect_at25f512b, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2173,7 +2173,7 @@ .printlock = spi_prettyprint_status_register_at25fs010, .unlock = spi_disable_blockprotect_at25fs010, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2211,7 +2211,7 @@ .printlock = spi_prettyprint_status_register_at25fs040, .unlock = spi_disable_blockprotect_at25fs040, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2249,7 +2249,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2500, 3600}, }, @@ -2287,7 +2287,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -2325,7 +2325,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, }, @@ -2363,7 +2363,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2500, 3600}, }, @@ -2401,7 +2401,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2500, 3600}, }, @@ -2440,7 +2440,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, .reg_bits = { @@ -2482,7 +2482,7 @@ .printlock = spi_prettyprint_status_register_plain, /* Supports also an incompatible page write (of exactly 256 B) and an auto-erasing write. */ .write = SPI_CHIP_WRITE1, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 3.0-3.6V for higher speed, 2.7-3.6V normal */ }, @@ -2520,7 +2520,7 @@ .printlock = spi_prettyprint_status_register_at26df081a, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2558,7 +2558,7 @@ .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2596,7 +2596,7 @@ .printlock = spi_prettyprint_status_register_at26df081a, .unlock = spi_disable_blockprotect_at2x_global_unprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2633,7 +2633,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .write = 0, /* Incompatible Page write */ - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -2657,7 +2657,7 @@ } }, .write = WRITE_JEDEC, /* FIXME */ - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -2681,7 +2681,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -2705,7 +2705,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -2729,7 +2729,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -2760,7 +2760,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, + .read = SPI_READ_AT45DB, .voltage = {2700, 3600}, .gran = write_gran_1056bytes, }, @@ -2803,7 +2803,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -2845,7 +2845,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -2887,7 +2887,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -2929,7 +2929,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -2971,7 +2971,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -3013,7 +3013,7 @@ }, .printlock = spi_prettyprint_status_register_at45db, /* Bit 0 is undefined, no lockdown */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db_e8, /* 3 address and 4 dummy bytes */ + .read = SPI_READ_AT45DB_E8, /* 3 address and 4 dummy bytes */ .voltage = {2700, 3600}, .gran = write_gran_528bytes, }, @@ -3056,7 +3056,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -3098,7 +3098,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2500, 3600}, /* 2.3-3.6V & 2.5-3.6V models available */ }, @@ -3140,7 +3140,7 @@ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = SPI_WRITE_AT45DB, - .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .read = SPI_READ_AT45DB, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3165,7 +3165,7 @@ }, .printlock = printlock_at49f, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3189,7 +3189,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -3221,7 +3221,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3253,7 +3253,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3284,7 +3284,7 @@ }, .printlock = printlock_at49f, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3315,7 +3315,7 @@ }, .printlock = printlock_at49f, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3346,7 +3346,7 @@ }, .printlock = printlock_at49f, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3378,7 +3378,7 @@ }, .printlock = printlock_at49f, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3414,7 +3414,7 @@ .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -3450,7 +3450,7 @@ .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -3486,7 +3486,7 @@ .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -3524,7 +3524,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -3562,7 +3562,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect_at25fs040, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -3589,7 +3589,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3613,7 +3613,7 @@ }, }, .write = 0, /* TODO */ - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3636,7 +3636,7 @@ }, }, .write = EDI_CHIP_WRITE, - .read = edi_chip_read, + .read = EDI_CHIP_READ, .voltage = {2700, 3600}, .gran = write_gran_128bytes, }, @@ -3668,7 +3668,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast Read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3699,7 +3699,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast Read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3730,7 +3730,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast Read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3765,7 +3765,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -3800,7 +3800,7 @@ .printlock = spi_prettyprint_status_register_bp2_bpl, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -3832,7 +3832,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -3866,7 +3866,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3900,7 +3900,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3934,7 +3934,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3968,7 +3968,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4003,7 +4003,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4038,7 +4038,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4073,7 +4073,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4108,7 +4108,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4144,7 +4144,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4180,7 +4180,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4215,7 +4215,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4250,7 +4250,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4286,7 +4286,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4322,7 +4322,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4357,7 +4357,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4392,7 +4392,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4430,7 +4430,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4468,7 +4468,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4503,7 +4503,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4541,7 +4541,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4576,7 +4576,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4611,7 +4611,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4646,7 +4646,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4681,7 +4681,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -4711,7 +4711,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4740,7 +4740,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4769,7 +4769,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4798,7 +4798,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4828,7 +4828,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4857,7 +4857,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4887,7 +4887,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4916,7 +4916,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4952,7 +4952,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, }, { @@ -4993,7 +4993,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5029,7 +5029,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5065,7 +5065,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5101,7 +5101,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5137,7 +5137,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5175,7 +5175,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -5220,7 +5220,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5258,7 +5258,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5296,7 +5296,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -5332,7 +5332,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -5371,7 +5371,7 @@ .printlock = spi_prettyprint_status_register_en25s_wp, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -5407,7 +5407,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -5446,7 +5446,7 @@ .printlock = spi_prettyprint_status_register_en25s_wp, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -5482,7 +5482,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -5518,7 +5518,7 @@ .printlock = spi_prettyprint_status_register_en25s_wp, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -5554,7 +5554,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -5586,7 +5586,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -5618,7 +5618,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -5646,7 +5646,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -5676,7 +5676,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -5706,7 +5706,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -5733,7 +5733,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -5760,7 +5760,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -5787,7 +5787,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -45R and 55R, others 2.7-3.6V */ }, @@ -5817,7 +5817,7 @@ }, }, .write = WRITE_EN29LV640B, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -5855,7 +5855,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, /* 2.3-2.7V acceptable results in lower performance */ }, @@ -5893,7 +5893,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, /* 2.3-2.7V acceptable results in lower performance */ }, @@ -5931,7 +5931,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, /* 2.3-2.7V acceptable results in lower performance */ }, @@ -5969,7 +5969,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -6009,7 +6009,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, /* bit6 selects size of protected blocks; TODO: SR2 */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6049,7 +6049,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, /* bit6 selects size of protected blocks; TODO: SR2 */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6089,7 +6089,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, /* bit6 selects size of protected blocks; TODO: SR2 */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6121,7 +6121,7 @@ }, }, .write = 0, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -6153,7 +6153,7 @@ }, }, .write = 0, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -6186,7 +6186,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -6218,7 +6218,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -6250,7 +6250,7 @@ }, }, .write = WRITE_JEDEC1, /* Supports a fast mode too */ - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70, others 2.7-3.6V */ }, @@ -6282,7 +6282,7 @@ }, }, .write = WRITE_JEDEC1, /* Supports a fast mode too */ - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70, others 2.7-3.6V */ }, @@ -6321,7 +6321,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6360,7 +6360,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, .reg_bits = { @@ -6409,7 +6409,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6448,7 +6448,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6487,7 +6487,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6526,7 +6526,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, .reg_bits = { @@ -6575,7 +6575,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6613,7 +6613,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6654,7 +6654,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, .reg_bits = { @@ -6703,7 +6703,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6741,7 +6741,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6789,7 +6789,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -6836,7 +6836,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, .reg_bits = { @@ -6884,7 +6884,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6919,7 +6919,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6958,7 +6958,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, .reg_bits = { @@ -7007,7 +7007,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -7046,7 +7046,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -7086,7 +7086,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7125,7 +7125,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7165,7 +7165,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7204,7 +7204,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7244,7 +7244,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7282,7 +7282,7 @@ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 3600}, }, @@ -7314,7 +7314,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -45, others 4.5-5.5V */ }, @@ -7346,7 +7346,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -45, others 4.5-5.5V */ }, @@ -7373,7 +7373,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -7414,7 +7414,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -7455,7 +7455,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -7505,7 +7505,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -7547,7 +7547,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -7589,7 +7589,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -7631,7 +7631,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -7681,7 +7681,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -7711,7 +7711,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -7738,7 +7738,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -7768,7 +7768,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -7795,7 +7795,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -7834,7 +7834,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* also fast read 0x0B */ + .read = SPI_CHIP_READ, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7873,7 +7873,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* also fast read 0x0B */ + .read = SPI_CHIP_READ, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7912,7 +7912,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* also fast read 0x0B */ + .read = SPI_CHIP_READ, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7951,7 +7951,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* also fast read 0x0B */ + .read = SPI_CHIP_READ, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7990,7 +7990,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* also fast read 0x0B */ + .read = SPI_CHIP_READ, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -8029,7 +8029,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* also fast read 0x0B */ + .read = SPI_CHIP_READ, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -8056,7 +8056,7 @@ }, }, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -8083,7 +8083,7 @@ }, }, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -8111,7 +8111,7 @@ }, }, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -8138,7 +8138,7 @@ }, }, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -8165,7 +8165,7 @@ }, }, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -8188,7 +8188,7 @@ }, .unlock = unlock_28f004s5, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -8216,7 +8216,7 @@ }, }, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -8244,7 +8244,7 @@ }, }, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -8268,7 +8268,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -8293,7 +8293,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -8309,7 +8309,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, /* MX23L12854 is a mask ROM, so it is read-only */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8325,7 +8325,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, /* MX23L1654 is a mask ROM, so it is read-only */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8341,7 +8341,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, /* MX23L3254 is a mask ROM, so it is read-only */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8357,7 +8357,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, /* MX23L6454 is a mask ROM, so it is read-only */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8393,7 +8393,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L1006E supports dual I/O */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported, MX25L1006E supports dual I/O */ .voltage = {2700, 3600}, }, @@ -8429,7 +8429,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8469,7 +8469,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8504,7 +8504,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8543,7 +8543,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* MX25L1605A bp2 only */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported (MX25L1608E supports dual-I/O read) */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported (MX25L1608E supports dual-I/O read) */ .voltage = {2700, 3600}, }, @@ -8578,7 +8578,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: Continuously Program (CP) mode, for 73E is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, }, @@ -8614,7 +8614,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -8650,7 +8650,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -8688,7 +8688,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8737,7 +8737,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8772,7 +8772,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8808,7 +8808,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: continuously program mode */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, }, @@ -8847,7 +8847,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, }, @@ -8883,7 +8883,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -8922,7 +8922,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, /* 33F 2.65V..3.6V */ }, @@ -8960,7 +8960,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8999,7 +8999,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L512E supports dual I/O */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported, MX25L512E supports dual I/O */ .voltage = {2700, 3600}, /* 2.35-3.6V for MX25V512(C) */ }, @@ -9037,7 +9037,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -9073,7 +9073,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -9109,7 +9109,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: continuously program mode */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0xBB) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O read (0xBB) supported */ .voltage = {2700, 3600}, }, @@ -9149,7 +9149,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O read supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O read supported */ .voltage = {2700, 3600}, }, @@ -9189,7 +9189,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -9227,7 +9227,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -9267,7 +9267,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.35-3.6V for MX25V8005 */ }, @@ -9306,7 +9306,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit 6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 3600}, }, @@ -9345,7 +9345,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 3600}, }, @@ -9385,7 +9385,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9426,7 +9426,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9475,7 +9475,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9517,7 +9517,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9566,7 +9566,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9608,7 +9608,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9648,7 +9648,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9681,7 +9681,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -9714,7 +9714,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -9746,7 +9746,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -9778,7 +9778,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -9810,7 +9810,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -9842,7 +9842,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -9869,7 +9869,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -9896,7 +9896,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -9926,7 +9926,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -9953,7 +9953,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -9983,7 +9983,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -10013,7 +10013,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -10040,7 +10040,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -10070,7 +10070,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -10097,7 +10097,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -10146,7 +10146,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10195,7 +10195,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10229,7 +10229,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE1, /* 128 */ - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10258,7 +10258,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10288,7 +10288,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE1, /* 128 */ - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10317,7 +10317,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10346,7 +10346,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10375,7 +10375,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10404,7 +10404,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10433,7 +10433,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10462,7 +10462,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10491,7 +10491,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10520,7 +10520,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, }, { @@ -10548,7 +10548,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10577,7 +10577,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10609,7 +10609,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10641,7 +10641,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10673,7 +10673,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10705,7 +10705,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10737,7 +10737,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10770,7 +10770,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -10803,7 +10803,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10836,7 +10836,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10869,7 +10869,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -10897,7 +10897,7 @@ .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10925,7 +10925,7 @@ .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10953,7 +10953,7 @@ .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10981,7 +10981,7 @@ .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ .write = SPI_CHIP_WRITE256, /* Page write supported (similar to PP but allows 0->1 changes) */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -11009,7 +11009,7 @@ .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -11049,7 +11049,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11089,7 +11089,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11126,7 +11126,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11160,7 +11160,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11194,7 +11194,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11228,7 +11228,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11262,7 +11262,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11296,7 +11296,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11330,7 +11330,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11370,7 +11370,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11410,7 +11410,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11450,7 +11450,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11490,7 +11490,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11536,7 +11536,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11582,7 +11582,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11628,7 +11628,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11674,7 +11674,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11714,7 +11714,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11754,7 +11754,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11803,7 +11803,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11852,7 +11852,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11901,7 +11901,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11950,7 +11950,7 @@ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11977,7 +11977,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -12004,7 +12004,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -12031,7 +12031,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -12058,7 +12058,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -12085,7 +12085,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -12112,7 +12112,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -12139,7 +12139,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -12180,7 +12180,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12215,7 +12215,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12256,7 +12256,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12297,7 +12297,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12335,7 +12335,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12373,7 +12373,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, /* 2.3-3.6V for Pm25LD010 */ }, @@ -12411,7 +12411,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, /* 2.3-3.6V for Pm25LD020 */ }, @@ -12449,7 +12449,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, /* 2.3-3.6V for Pm25LD040 */ }, @@ -12487,7 +12487,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, }, @@ -12525,7 +12525,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual I/O supported */ .voltage = {2300, 3600}, }, @@ -12564,7 +12564,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -12603,7 +12603,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -12642,7 +12642,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -12681,7 +12681,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -12720,7 +12720,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -12752,7 +12752,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12784,7 +12784,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12822,7 +12822,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12854,7 +12854,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -12886,7 +12886,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12924,7 +12924,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12956,7 +12956,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12988,7 +12988,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -13020,7 +13020,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -13050,7 +13050,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -13080,7 +13080,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -13110,7 +13110,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -13140,7 +13140,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -13171,7 +13171,7 @@ }, .unlock = unlock_regspace2_uniform_32k, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -13202,7 +13202,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -13234,7 +13234,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -13266,7 +13266,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {3000, 3600}, }, @@ -13298,7 +13298,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {3000, 3600}, }, @@ -13336,7 +13336,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ - .read = spi_chip_read, /* Fast read (0x0B) supported by SST25VF010A only */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported by SST25VF010A only */ .voltage = {2700, 3600}, }, @@ -13374,7 +13374,7 @@ .printlock = spi_prettyprint_status_register_sst25vf016, .unlock = spi_disable_blockprotect, .write = SPI_WRITE_AAI, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -13406,7 +13406,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ - .read = spi_chip_read, /* only */ + .read = SPI_CHIP_READ, /* only */ .voltage = {2700, 3600}, }, @@ -13444,7 +13444,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 and 2nd SR */ .unlock = spi_disable_blockprotect, /* FIXME: 2nd SR */ .write = SPI_WRITE_AAI, /* AAI supported (0xAD) */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -13482,7 +13482,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = SPI_WRITE_AAI, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -13514,7 +13514,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -13552,7 +13552,7 @@ .printlock = spi_prettyprint_status_register_sst25vf040b, .unlock = spi_disable_blockprotect, .write = SPI_WRITE_AAI, /* AAI supported (0xAD) */ - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -13590,7 +13590,7 @@ .printlock = spi_prettyprint_status_register_sst25vf040b, .unlock = spi_disable_blockprotect, .write = SPI_WRITE_AAI, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -13628,7 +13628,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -13666,7 +13666,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = SPI_WRITE_AAI, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -13704,7 +13704,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ - .read = spi_chip_read, /* Fast read (0x0B) supported by SST25VF512A only */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported by SST25VF512A only */ .voltage = {2700, 3600}, }, @@ -13739,7 +13739,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_WRITE_AAI, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13777,7 +13777,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_WRITE_AAI, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13812,7 +13812,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13850,7 +13850,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_WRITE_AAI, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13885,7 +13885,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual O (0x3B), dual I/O read (0xBB) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual O (0x3B), dual I/O read (0xBB) supported */ .voltage = {1650, 1950}, }, @@ -13923,7 +13923,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* *does* have a BP3 but it is useless */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_WRITE_AAI, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13958,7 +13958,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual O (0x3B), dual I/O read (0xBB) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual O (0x3B), dual I/O read (0xBB) supported */ .voltage = {1650, 1950}, }, @@ -13993,7 +13993,7 @@ .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_WRITE_AAI, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -14031,7 +14031,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect_sst26_global_unprotect, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -14069,7 +14069,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect_sst26_global_unprotect, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -14107,7 +14107,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect_sst26_global_unprotect, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -14135,7 +14135,7 @@ }, .unlock = unprotect_28sf040, .write = WRITE_28SF040, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -14159,7 +14159,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -14183,7 +14183,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -14207,7 +14207,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14231,7 +14231,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14258,7 +14258,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -14285,7 +14285,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -14312,7 +14312,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -14339,7 +14339,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -14366,7 +14366,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -14393,7 +14393,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -14420,7 +14420,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -14450,7 +14450,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -14477,7 +14477,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -14509,7 +14509,7 @@ .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14541,7 +14541,7 @@ .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14576,7 +14576,7 @@ .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14610,7 +14610,7 @@ .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14642,7 +14642,7 @@ .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14676,7 +14676,7 @@ .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14710,7 +14710,7 @@ .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14740,7 +14740,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14770,7 +14770,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14800,7 +14800,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14831,7 +14831,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14861,7 +14861,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14895,7 +14895,7 @@ .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -14927,7 +14927,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -X, others 4.5-5.5V */ }, @@ -14959,7 +14959,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4750, 5250}, /* 4.75-5.25V for type -X, others 4.5-5.5V */ }, @@ -14986,7 +14986,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -15019,7 +15019,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -15052,7 +15052,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -15079,7 +15079,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -15106,7 +15106,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -15130,7 +15130,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -15163,7 +15163,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15196,7 +15196,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15230,7 +15230,7 @@ .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15264,7 +15264,7 @@ .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15298,7 +15298,7 @@ .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15323,7 +15323,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15348,7 +15348,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15373,7 +15373,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15398,7 +15398,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15430,7 +15430,7 @@ .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15457,7 +15457,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect_bp1_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2500, 5500}, }, @@ -15491,7 +15491,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect_bp1_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -15523,7 +15523,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect_bp1_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -15560,7 +15560,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -15592,7 +15592,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -15630,7 +15630,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B), dual read (0x3B) and dual I/O (0xBB) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B), dual read (0x3B) and dual I/O (0xBB) supported */ .voltage = {2300, 3600}, }, @@ -15662,7 +15662,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, /* FIXME: Add ERSER error flag. */ .unlock = spi_disable_blockprotect_bp1_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -15693,7 +15693,7 @@ .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -15724,7 +15724,7 @@ .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -15756,7 +15756,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -15788,7 +15788,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* some quad-read supported ("HD_READ mode") */ + .read = SPI_CHIP_READ, /* some quad-read supported ("HD_READ mode") */ .voltage = {2700, 3600}, }, @@ -15823,7 +15823,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -15855,7 +15855,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* some quad-read supported ("HD_READ mode") */ + .read = SPI_CHIP_READ, /* some quad-read supported ("HD_READ mode") */ .voltage = {2700, 3600}, }, @@ -15885,7 +15885,7 @@ }, .unlock = unlock_lh28f008bjt, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -15918,7 +15918,7 @@ }, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_82802AB, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -15947,7 +15947,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -15976,7 +15976,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -16005,7 +16005,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -16034,7 +16034,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -16063,7 +16063,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -16099,7 +16099,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -16133,7 +16133,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16178,7 +16178,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16217,7 +16217,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, .reg_bits = { @@ -16270,7 +16270,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -16299,7 +16299,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -16342,7 +16342,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16376,7 +16376,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16407,7 +16407,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, }, @@ -16438,7 +16438,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, }, @@ -16487,7 +16487,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: Configuration register */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16520,7 +16520,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: Configuration register */ .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16556,7 +16556,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* TODO: improve */ .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16592,7 +16592,7 @@ .printlock = spi_prettyprint_status_register_bp2_srwd, /* TODO: improve */ .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16627,7 +16627,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -16662,7 +16662,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) and dual I/O (0x3B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -16711,7 +16711,7 @@ .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, .reg_bits = { @@ -16756,7 +16756,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, }, @@ -16784,7 +16784,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, }, @@ -16830,7 +16830,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16867,7 +16867,7 @@ .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ .write = SPI_CHIP_WRITE256, /* Multi I/O supported, IGNORE for now */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16898,7 +16898,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, }, @@ -16929,7 +16929,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 2000}, }, @@ -16956,7 +16956,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -16983,7 +16983,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -17010,7 +17010,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -17036,7 +17036,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -17062,7 +17062,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -17089,7 +17089,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -17116,7 +17116,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -17143,7 +17143,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -17175,7 +17175,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -17207,7 +17207,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -17236,7 +17236,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -17265,7 +17265,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -17294,7 +17294,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, /* Fast read (0x0B) supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -17335,7 +17335,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -17384,7 +17384,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -17434,7 +17434,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, .reg_bits = { @@ -17482,7 +17482,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, .reg_bits = { @@ -17532,7 +17532,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -17572,7 +17572,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -17611,7 +17611,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -17653,7 +17653,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -17708,7 +17708,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -17763,7 +17763,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -17818,7 +17818,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -17864,7 +17864,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, }, @@ -17904,7 +17904,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -17944,7 +17944,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -17982,7 +17982,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, }, @@ -18022,7 +18022,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ - .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .read = SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -18061,7 +18061,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18100,7 +18100,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18144,7 +18144,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18187,7 +18187,7 @@ }, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -18227,7 +18227,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -18278,7 +18278,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -18329,7 +18329,7 @@ .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18369,7 +18369,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ .reg_bits = { @@ -18419,7 +18419,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18459,7 +18459,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18498,7 +18498,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18537,7 +18537,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18569,7 +18569,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2300, 3600}, }, @@ -18601,7 +18601,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18639,7 +18639,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18671,7 +18671,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18709,7 +18709,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18741,7 +18741,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18779,7 +18779,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18811,7 +18811,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -18836,7 +18836,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -18859,7 +18859,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, }, { @@ -18882,7 +18882,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -18906,7 +18906,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -18930,7 +18930,7 @@ } }, .write = WRITE_JEDEC, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -18960,7 +18960,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -18987,7 +18987,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -19017,7 +19017,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -19047,7 +19047,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -19074,7 +19074,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -19104,7 +19104,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -19131,7 +19131,7 @@ }, }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {2700, 3600}, }, @@ -19159,7 +19159,7 @@ }, .printlock = printlock_w39f010, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -19187,7 +19187,7 @@ }, .printlock = printlock_w39l010, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19218,7 +19218,7 @@ }, .printlock = printlock_w39l020, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19249,7 +19249,7 @@ }, .printlock = printlock_w39l040, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19277,7 +19277,7 @@ }, .printlock = printlock_w39v040a, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19305,7 +19305,7 @@ }, .printlock = printlock_w39v040b, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19333,7 +19333,7 @@ }, .printlock = printlock_w39v040c, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19365,7 +19365,7 @@ .printlock = printlock_w39v040fa, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19394,7 +19394,7 @@ .printlock = printlock_w39v040fb, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19422,7 +19422,7 @@ }, .printlock = printlock_w39v040fc, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19450,7 +19450,7 @@ }, .printlock = printlock_w39v080a, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19479,7 +19479,7 @@ .printlock = printlock_w39v080fa, .unlock = unlock_regspace2_uniform_64k, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19507,7 +19507,7 @@ }, .printlock = printlock_w39v080fa_dual, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19539,7 +19539,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -19563,7 +19563,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {4500, 5500}, }, @@ -19595,7 +19595,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19627,7 +19627,7 @@ } }, .write = WRITE_JEDEC1, - .read = read_memmapped, + .read = READ_MEMMAPPED, .voltage = {3000, 3600}, }, @@ -19665,7 +19665,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -19703,7 +19703,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -19741,7 +19741,7 @@ .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -19791,7 +19791,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -19833,7 +19833,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, .reg_bits = { @@ -19882,7 +19882,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {1650, 1950}, }, @@ -19920,7 +19920,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -19958,7 +19958,7 @@ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, .write = SPI_CHIP_WRITE256, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .voltage = {2700, 3600}, }, @@ -19979,7 +19979,7 @@ .block_erasers = {}, /* set by probing function */ .unlock = spi_disable_blockprotect, /* is this safe? */ .write = 0, /* set by probing function */ - .read = spi_chip_read, + .read = SPI_CHIP_READ, /* FIXME: some vendor extensions define this */ .voltage = {0}, }, @@ -20003,7 +20003,7 @@ } }, .write = WRITE_OPAQUE, - .read = read_opaque, + .read = READ_OPAQUE, }, { @@ -20018,7 +20018,7 @@ .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20033,7 +20033,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20048,7 +20048,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20063,7 +20063,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20078,7 +20078,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20093,7 +20093,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20108,7 +20108,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20123,7 +20123,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { @@ -20138,7 +20138,7 @@ .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = 0, - .read = NULL, + .read = 0, }, { diff --git a/flashrom.c b/flashrom.c index 3ddc4b0..694e2c5 100644 --- a/flashrom.c +++ b/flashrom.c @@ -411,6 +411,35 @@ return ret; } +/* special unit-test hook */ +read_func_t *g_test_read_injector; + +static read_func_t *lookup_read_func_ptr(const struct flashchip *chip) +{ + switch (chip->read) { + case SPI_CHIP_READ: return &spi_chip_read; + case READ_OPAQUE: return &read_opaque; + case READ_MEMMAPPED: return &read_memmapped; + case EDI_CHIP_READ: return &edi_chip_read; + case SPI_READ_AT45DB: return spi_read_at45db; + case SPI_READ_AT45DB_E8: return spi_read_at45db_e8; + case TEST_READ_INJECTOR: return g_test_read_injector; + /* default: total function, 0 indicates no read function set. + * We explicitly do not want a default catch-all case in the switch + * to ensure unhandled enum's are compiler warnings. + */ + case NO_READ_FUNC: return NULL; + }; + + return NULL; +} + +int read_flash(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +{ + read_func_t *read_func = lookup_read_func_ptr(flash->chip); + return read_func(flash, buf, start, len); +} + /* * @cmpbuf buffer to compare against, cmpbuf[0] is expected to match the * flash content at location start @@ -430,7 +459,7 @@ return -1; } - if (!flash->chip->read) { + if (!lookup_read_func_ptr(flash->chip)) { msg_cerr("ERROR: flashrom has no read function for this flash chip.\n"); return -1; } @@ -441,7 +470,7 @@ return -1; } - int ret = flash->chip->read(flash, readbuf, start, len); + int ret = read_flash(flash, readbuf, start, len); if (ret) { msg_gerr("Verification impossible because read failed " "at 0x%x (len 0x%x)\n", start, len); @@ -930,7 +959,7 @@ const chipoff_t region_start = entry->start; const chipsize_t region_len = entry->end - entry->start + 1; - if (flashctx->chip->read(flashctx, buffer + region_start, region_start, region_len)) + if (read_flash(flashctx, buffer + region_start, region_start, region_len)) return 1; } return 0; @@ -1159,7 +1188,7 @@ if (info->region_start > info->erase_start) { const chipoff_t start = info->erase_start; const chipsize_t len = info->region_start - info->erase_start; - if (flashctx->chip->read(flashctx, backup_contents, start, len)) { + if (read_flash(flashctx, backup_contents, start, len)) { msg_cerr("Can't read! Aborting.\n"); goto _free_ret; } @@ -1169,7 +1198,7 @@ const chipoff_t start = info->region_end + 1; const chipoff_t rel_start = start - info->erase_start; /* within this erase block */ const chipsize_t len = info->erase_end - info->region_end; - if (flashctx->chip->read(flashctx, backup_contents + rel_start, start, len)) { + if (read_flash(flashctx, backup_contents + rel_start, start, len)) { msg_cerr("Can't read! Aborting.\n"); goto _free_ret; } @@ -1256,7 +1285,7 @@ if (info->region_start > info->erase_start) { const chipoff_t start = info->erase_start; const chipsize_t len = info->region_start - info->erase_start; - if (flashctx->chip->read(flashctx, newc, start, len)) { + if (read_flash(flashctx, newc, start, len)) { msg_cerr("Can't read! Aborting.\n"); goto _free_ret; } @@ -1267,7 +1296,7 @@ const chipoff_t start = info->region_end + 1; const chipoff_t rel_start = start - info->erase_start; /* within this erase block */ const chipsize_t len = info->erase_end - info->region_end; - if (flashctx->chip->read(flashctx, newc + rel_start, start, len)) { + if (read_flash(flashctx, newc + rel_start, start, len)) { msg_cerr("Can't read! Aborting.\n"); goto _free_ret; } @@ -1367,7 +1396,7 @@ const chipoff_t region_start = entry->start; const chipsize_t region_len = entry->end - entry->start + 1; - if (flashctx->chip->read(flashctx, curcontents + region_start, region_start, region_len)) + if (read_flash(flashctx, curcontents + region_start, region_start, region_len)) return 1; if (compare_range(newcontents + region_start, curcontents + region_start, region_start, region_len)) @@ -1554,7 +1583,7 @@ return 1; msg_cerr("Continuing anyway.\n"); } - if (!chip->read) { + if (!lookup_read_func_ptr(chip)) { msg_cerr("flashrom has no read function for this " "flash chip.\n"); return 1; @@ -1775,7 +1804,7 @@ */ msg_cinfo("Reading old flash chip contents... "); if (verify_all) { - if (flashctx->chip->read(flashctx, oldcontents, 0, flash_size)) { + if (read_flash(flashctx, oldcontents, 0, flash_size)) { msg_cinfo("FAILED.\n"); goto _finalize_ret; } @@ -1795,7 +1824,7 @@ if (verify_all) { msg_cerr("Checking if anything has changed.\n"); msg_cinfo("Reading current flash chip contents... "); - if (!flashctx->chip->read(flashctx, curcontents, 0, flash_size)) { + if (!read_flash(flashctx, curcontents, 0, flash_size)) { msg_cinfo("done.\n"); if (!memcmp(oldcontents, curcontents, flash_size)) { nonfatal_help_message(); diff --git a/fmap.c b/fmap.c index 69824ea..7f5df2b 100644 --- a/fmap.c +++ b/fmap.c @@ -167,7 +167,7 @@ goto _finalize_ret; } - ret = flashctx->chip->read(flashctx, buf + rom_offset, rom_offset, len); + ret = read_flash(flashctx, buf + rom_offset, rom_offset, len); if (ret) { msg_pdbg("Cannot read ROM contents.\n"); goto _free_ret; @@ -232,7 +232,7 @@ /* Read errors are considered non-fatal since we may * encounter locked regions and want to continue. */ - if (flashctx->chip->read(flashctx, (uint8_t *)fmap, offset, sig_len)) { + if (read_flash(flashctx, (uint8_t *)fmap, offset, sig_len)) { /* * Print in verbose mode only to avoid excessive * messages for benign errors. Subsequent error @@ -245,7 +245,7 @@ if (memcmp(fmap, FMAP_SIGNATURE, sig_len) != 0) continue; - if (flashctx->chip->read(flashctx, (uint8_t *)fmap + sig_len, + if (read_flash(flashctx, (uint8_t *)fmap + sig_len, offset + sig_len, sizeof(*fmap) - sig_len)) { msg_cerr("Cannot read %zu bytes at offset %06zx\n", sizeof(*fmap) - sig_len, offset + sig_len); @@ -277,7 +277,7 @@ goto _free_ret; } - if (flashctx->chip->read(flashctx, (uint8_t *)fmap + sizeof(*fmap), + if (read_flash(flashctx, (uint8_t *)fmap + sizeof(*fmap), offset + sizeof(*fmap), fmap_len - sizeof(*fmap))) { msg_cerr("Cannot read %zu bytes at offset %06zx\n", fmap_len - sizeof(*fmap), offset + sizeof(*fmap)); diff --git a/include/flash.h b/include/flash.h index b61b7ea..2ba235d 100644 --- a/include/flash.h +++ b/include/flash.h @@ -255,6 +255,19 @@ }; typedef int (write_func_t)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +enum read_func { + NO_READ_FUNC = 0, /* 0 indicates no read function set. */ + SPI_CHIP_READ = 1, + READ_OPAQUE, + READ_MEMMAPPED, + EDI_CHIP_READ, + SPI_READ_AT45DB, + SPI_READ_AT45DB_E8, + TEST_READ_INJECTOR, /* special case must come last. */ +}; +typedef int (read_func_t)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int read_flash(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + struct flashchip { const char *vendor; const char *name; @@ -323,7 +336,7 @@ int (*printlock) (struct flashctx *flash); int (*unlock) (struct flashctx *flash); enum write_func write; - int (*read) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + enum read_func read; struct voltage { uint16_t min; uint16_t max; diff --git a/libflashrom.c b/libflashrom.c index 3e28938..cbc6243 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -299,7 +299,7 @@ goto _free_ret; msg_cinfo("Reading ich descriptor... "); - if (flashctx->chip->read(flashctx, desc, 0, 0x1000)) { + if (read_flash(flashctx, desc, 0, 0x1000)) { msg_cerr("Read operation failed!\n"); msg_cinfo("FAILED.\n"); ret = 2; diff --git a/tests/chip.c b/tests/chip.c index 284b7e4..79d0c87 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -147,12 +147,13 @@ } extern write_func_t *g_test_write_injector; +extern read_func_t *g_test_read_injector; static const struct flashchip chip_8MiB = { .vendor = "aklm", .total_size = MOCK_CHIP_SIZE / KiB, .tested = TEST_OK_PREW, - .read = read_chip, + .read = TEST_READ_INJECTOR, .write = TEST_WRITE_INJECTOR, .unlock = unlock_chip, .block_erasers = @@ -168,7 +169,7 @@ .vendor = "aklm&dummyflasher", .total_size = 16 * 1024, .tested = TEST_OK_PREW, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .write = SPI_CHIP_WRITE256, .unlock = spi_disable_blockprotect, .page_size = 256, @@ -206,6 +207,7 @@ }; g_test_write_injector = write_chip; + g_test_read_injector = read_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -265,6 +267,7 @@ }; g_test_write_injector = write_chip; + g_test_read_injector = read_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -337,6 +340,7 @@ }; g_test_write_injector = write_chip; + g_test_read_injector = read_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -435,6 +439,7 @@ }; g_test_write_injector = write_chip; + g_test_read_injector = read_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; diff --git a/tests/chip_wp.c b/tests/chip_wp.c index 3c9be40..8f6cb5f 100644 --- a/tests/chip_wp.c +++ b/tests/chip_wp.c @@ -64,7 +64,7 @@ .vendor = "aklm&dummyflasher", .total_size = 16 * 1024, .tested = TEST_OK_PREW, - .read = spi_chip_read, + .read = SPI_CHIP_READ, .write = SPI_CHIP_WRITE256, .unlock = spi_disable_blockprotect, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR_EXT2 | FEATURE_WRSR2 | FEATURE_WRSR3, -- To view, visit https://review.coreboot.org/c/flashrom/+/66788 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I612d46fefedf2b69e7e2064aa857fa0756efb4e7 Gerrit-Change-Number: 66788 Gerrit-PatchSet: 18 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: merged

1 0

[XL] Change in flashrom[master]: tree/: Convert flashchip write func ptr to enumerate
by Felix Singer (Code Review) Nov. 1, 2022

Nov. 1, 2022

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66782 ) ( 14 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tree/: Convert flashchip write func ptr to enumerate ...................................................................... tree/: Convert flashchip write func ptr to enumerate This forges the way for flashchips.c to be pure declarative data and lookup functions for dispatch to be pure. This means that the flashchips data could be extracted out to be agnostic data of the flashrom code and algorithms. TEST='R|W|E && --flash-name' on ARM, AMD & Intel DUT's. Change-Id: I80149de169464b204fb09f1424a86fc645b740fd Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66782 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nikolai Artemiev <nartemiev(a)google.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M flashchips.c M flashrom.c M include/flash.h M sfdp.c M tests/chip.c M tests/chip_wp.c M tests/spi25.c 7 files changed, 677 insertions(+), 599 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Nikolai Artemiev: Looks good to me, but someone else must approve diff --git a/flashchips.c b/flashchips.c index 3b1c3d5..5003fab 100644 --- a/flashchips.c +++ b/flashchips.c @@ -83,7 +83,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -115,7 +115,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -142,7 +142,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -169,7 +169,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -196,7 +196,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -223,7 +223,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -250,7 +250,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -277,7 +277,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -304,7 +304,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -335,7 +335,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -45R, others 2.7-3.6V */ }, @@ -366,7 +366,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -45R, others 2.7-3.6V */ }, @@ -398,7 +398,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -55, others 2.7-3.6V */ }, @@ -430,7 +430,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -55, others 2.7-3.6V */ }, @@ -462,7 +462,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -494,7 +494,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -526,7 +526,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70R, others 2.7-3.6V */ }, @@ -558,7 +558,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70R, others 2.7-3.6V */ }, @@ -585,7 +585,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -60R, others 2.7-3.6V*/ }, @@ -612,7 +612,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70R, others 2.7-3.6V */ }, @@ -644,7 +644,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -676,7 +676,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -708,7 +708,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -747,7 +747,7 @@ }, .printlock = spi_prettyprint_status_register_amic_a25l032, /* bit5: T/B, bit6: prot size */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -779,7 +779,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -813,7 +813,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -847,7 +847,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -879,7 +879,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -914,7 +914,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -949,7 +949,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -987,7 +987,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1025,7 +1025,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1060,7 +1060,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1095,7 +1095,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1135,7 +1135,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1170,7 +1170,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1202,7 +1202,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1237,7 +1237,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1277,7 +1277,7 @@ }, .printlock = spi_prettyprint_status_register_amic_a25l032, /* bit5: T/B, bit6: prot size */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1317,7 +1317,7 @@ }, .printlock = spi_prettyprint_status_register_amic_a25l032, /* bit5: T/B, bit6: prot size */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1358,7 +1358,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enhance (sic!) */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1390,7 +1390,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -1422,7 +1422,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -1449,7 +1449,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -1477,7 +1477,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -1516,7 +1516,7 @@ }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, /* 2.3-3.6V & 2.7-3.6V models available */ }, @@ -1555,7 +1555,7 @@ }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 3600}, }, @@ -1593,7 +1593,7 @@ }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, /* 2.3-3.6V & 2.7-3.6V models available */ }, @@ -1631,7 +1631,7 @@ }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1600, 2000}, /* Datasheet says range is 1.65-1.95 V */ }, @@ -1669,7 +1669,7 @@ }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1707,7 +1707,7 @@ }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1746,7 +1746,7 @@ }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1785,7 +1785,7 @@ }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1823,7 +1823,7 @@ }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1862,7 +1862,7 @@ }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, - .write = spi_chip_write_256, /* Dual I/O (0xA2) supported */ + .write = SPI_CHIP_WRITE256, /* Dual I/O (0xA2) supported */ .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {1650, 1950}, }, @@ -1901,7 +1901,7 @@ }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, - .write = spi_chip_write_256, /* Dual I/O (0xA2) supported */ + .write = SPI_CHIP_WRITE256, /* Dual I/O (0xA2) supported */ .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {1650, 1950}, }, @@ -1940,7 +1940,7 @@ }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at2x_global_unprotect_sec, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1971,7 +1971,7 @@ }, .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2000,7 +2000,7 @@ }, .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2030,7 +2030,7 @@ .printlock = spi_prettyprint_status_register_at25f4096, /* "Bits 5-6 are 0s when device is not in an internal write cycle." Better leave them alone: */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2059,7 +2059,7 @@ }, .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2089,7 +2089,7 @@ .printlock = spi_prettyprint_status_register_at25f512a, /* FIXME: It is not correct to use this one, because the BP1 bit is N/A. */ .unlock = spi_disable_blockprotect_at25f512a, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2131,7 +2131,7 @@ }, .printlock = spi_prettyprint_status_register_at25f512b, .unlock = spi_disable_blockprotect_at25f512b, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2172,7 +2172,7 @@ }, .printlock = spi_prettyprint_status_register_at25fs010, .unlock = spi_disable_blockprotect_at25fs010, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2210,7 +2210,7 @@ }, .printlock = spi_prettyprint_status_register_at25fs040, .unlock = spi_disable_blockprotect_at25fs040, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2248,7 +2248,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2500, 3600}, }, @@ -2286,7 +2286,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -2324,7 +2324,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, }, @@ -2362,7 +2362,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2500, 3600}, }, @@ -2400,7 +2400,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2500, 3600}, }, @@ -2439,7 +2439,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, .reg_bits = @@ -2481,7 +2481,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* Supports also an incompatible page write (of exactly 256 B) and an auto-erasing write. */ - .write = spi_chip_write_1, + .write = SPI_CHIP_WRITE1, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 3.0-3.6V for higher speed, 2.7-3.6V normal */ }, @@ -2519,7 +2519,7 @@ }, .printlock = spi_prettyprint_status_register_at26df081a, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2557,7 +2557,7 @@ }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2595,7 +2595,7 @@ }, .printlock = spi_prettyprint_status_register_at26df081a, .unlock = spi_disable_blockprotect_at2x_global_unprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2632,7 +2632,7 @@ } }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ - .write = NULL, /* Incompatible Page write */ + .write = 0, /* Incompatible Page write */ .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2656,7 +2656,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, /* FIXME */ + .write = WRITE_JEDEC, /* FIXME */ .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -2680,7 +2680,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -2704,7 +2704,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -2728,7 +2728,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -2759,7 +2759,7 @@ } }, .printlock = spi_prettyprint_status_register_plain, - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, .voltage = {2700, 3600}, .gran = write_gran_1056bytes, @@ -2802,7 +2802,7 @@ .printlock = spi_prettyprint_status_register_at45db, .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -2844,7 +2844,7 @@ .printlock = spi_prettyprint_status_register_at45db, .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -2886,7 +2886,7 @@ .printlock = spi_prettyprint_status_register_at45db, .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -2928,7 +2928,7 @@ .printlock = spi_prettyprint_status_register_at45db, .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -2970,7 +2970,7 @@ .printlock = spi_prettyprint_status_register_at45db, .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -3012,7 +3012,7 @@ } }, .printlock = spi_prettyprint_status_register_at45db, /* Bit 0 is undefined, no lockdown */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db_e8, /* 3 address and 4 dummy bytes */ .voltage = {2700, 3600}, .gran = write_gran_528bytes, @@ -3055,7 +3055,7 @@ .printlock = spi_prettyprint_status_register_at45db, .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -3097,7 +3097,7 @@ .printlock = spi_prettyprint_status_register_at45db, /* has a 2nd status register */ .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2500, 3600}, /* 2.3-3.6V & 2.5-3.6V models available */ }, @@ -3139,7 +3139,7 @@ .printlock = spi_prettyprint_status_register_at45db, .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ - .write = spi_write_at45db, + .write = SPI_WRITE_AT45DB, .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3164,7 +3164,7 @@ } }, .printlock = printlock_at49f, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3188,7 +3188,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -3220,7 +3220,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3252,7 +3252,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3283,7 +3283,7 @@ */ }, .printlock = printlock_at49f, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3314,7 +3314,7 @@ */ }, .printlock = printlock_at49f, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3345,7 +3345,7 @@ */ }, .printlock = printlock_at49f, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3377,7 +3377,7 @@ */ }, .printlock = printlock_at49f, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3413,7 +3413,7 @@ }, .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -3449,7 +3449,7 @@ }, .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -3485,7 +3485,7 @@ }, .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -3523,7 +3523,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3561,7 +3561,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect_at25fs040, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3588,7 +3588,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3612,7 +3612,7 @@ .block_erase = NULL, /* TODO */ }, }, - .write = NULL, /* TODO */ + .write = 0, /* TODO */ .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3635,7 +3635,7 @@ .block_erase = edi_chip_block_erase, }, }, - .write = edi_chip_write, + .write = EDI_CHIP_WRITE, .read = edi_chip_read, .voltage = {2700, 3600}, .gran = write_gran_128bytes, @@ -3667,7 +3667,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast Read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3698,7 +3698,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast Read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3729,7 +3729,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast Read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3764,7 +3764,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, + .write = SPI_CHIP_WRITE1, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3799,7 +3799,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_bpl, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3831,7 +3831,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -3865,7 +3865,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3899,7 +3899,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3933,7 +3933,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -3967,7 +3967,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4002,7 +4002,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4037,7 +4037,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4072,7 +4072,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4107,7 +4107,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4143,7 +4143,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4179,7 +4179,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4214,7 +4214,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4249,7 +4249,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4285,7 +4285,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4321,7 +4321,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4356,7 +4356,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4391,7 +4391,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4429,7 +4429,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4467,7 +4467,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4502,7 +4502,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4540,7 +4540,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4575,7 +4575,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4610,7 +4610,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4645,7 +4645,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4680,7 +4680,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4710,7 +4710,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4739,7 +4739,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4768,7 +4768,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4797,7 +4797,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4827,7 +4827,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4856,7 +4856,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4886,7 +4886,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4915,7 +4915,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -4951,7 +4951,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, }, @@ -4992,7 +4992,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5028,7 +5028,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5064,7 +5064,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5100,7 +5100,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5136,7 +5136,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5174,7 +5174,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -5219,7 +5219,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5257,7 +5257,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5295,7 +5295,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5331,7 +5331,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -5370,7 +5370,7 @@ }, .printlock = spi_prettyprint_status_register_en25s_wp, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -5406,7 +5406,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -5445,7 +5445,7 @@ }, .printlock = spi_prettyprint_status_register_en25s_wp, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -5481,7 +5481,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -5517,7 +5517,7 @@ }, .printlock = spi_prettyprint_status_register_en25s_wp, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -5553,7 +5553,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -5585,7 +5585,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -5617,7 +5617,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -5645,7 +5645,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -5675,7 +5675,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -5705,7 +5705,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -5732,7 +5732,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -5759,7 +5759,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -5786,7 +5786,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -45R and 55R, others 2.7-3.6V */ }, @@ -5816,7 +5816,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_en29lv640b, + .write = WRITE_EN29LV640B, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -5854,7 +5854,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, /* 2.3-2.7V acceptable results in lower performance */ }, @@ -5892,7 +5892,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, /* 2.3-2.7V acceptable results in lower performance */ }, @@ -5930,7 +5930,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, /* 2.3-2.7V acceptable results in lower performance */ }, @@ -5968,7 +5968,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -6008,7 +6008,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, /* bit6 selects size of protected blocks; TODO: SR2 */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6048,7 +6048,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, /* bit6 selects size of protected blocks; TODO: SR2 */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6088,7 +6088,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, /* bit6 selects size of protected blocks; TODO: SR2 */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6120,7 +6120,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = NULL, + .write = 0, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -6152,7 +6152,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = NULL, + .write = 0, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -6185,7 +6185,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -6217,7 +6217,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -55, others 4.5-5.5V */ }, @@ -6249,7 +6249,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, /* Supports a fast mode too */ + .write = WRITE_JEDEC1, /* Supports a fast mode too */ .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70, others 2.7-3.6V */ }, @@ -6281,7 +6281,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, /* Supports a fast mode too */ + .write = WRITE_JEDEC1, /* Supports a fast mode too */ .read = read_memmapped, .voltage = {3000, 3600}, /* 3.0-3.6V for type -70, others 2.7-3.6V */ }, @@ -6320,7 +6320,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6359,7 +6359,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, .reg_bits = @@ -6408,7 +6408,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6447,7 +6447,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6486,7 +6486,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6525,7 +6525,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, .reg_bits = @@ -6574,7 +6574,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1695, 1950}, }, @@ -6612,7 +6612,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6653,7 +6653,7 @@ /* TODO: 2nd status reg (read 0x35, write 0x31) and 3rd status reg (read 0x15, write 0x11) */ .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, .reg_bits = @@ -6702,7 +6702,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6740,7 +6740,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6788,7 +6788,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -6835,7 +6835,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, .reg_bits = @@ -6883,7 +6883,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6918,7 +6918,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6957,7 +6957,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, .reg_bits = @@ -7006,7 +7006,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -7045,7 +7045,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7085,7 +7085,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7124,7 +7124,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7164,7 +7164,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7203,7 +7203,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7243,7 +7243,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -7281,7 +7281,7 @@ }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 3600}, }, @@ -7313,7 +7313,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -45, others 4.5-5.5V */ }, @@ -7345,7 +7345,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -45, others 4.5-5.5V */ }, @@ -7372,7 +7372,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -7413,7 +7413,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -7454,7 +7454,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -7504,7 +7504,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -7546,7 +7546,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -7588,7 +7588,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -7630,7 +7630,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -7680,7 +7680,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -7710,7 +7710,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -7737,7 +7737,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -7767,7 +7767,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -7794,7 +7794,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -7833,7 +7833,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7872,7 +7872,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7911,7 +7911,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7950,7 +7950,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -7989,7 +7989,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -8028,7 +8028,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, .unlock = spi_disable_blockprotect_bp2_ep_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -8055,7 +8055,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -8082,7 +8082,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -8110,7 +8110,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, }, @@ -8137,7 +8137,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, }, @@ -8164,7 +8164,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, }, @@ -8187,7 +8187,7 @@ }, }, .unlock = unlock_28f004s5, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, }, @@ -8215,7 +8215,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, }, @@ -8243,7 +8243,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, }, @@ -8267,7 +8267,7 @@ }, }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -8292,7 +8292,7 @@ }, }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -8308,7 +8308,7 @@ .tested = {.probe = NT, .read = NT, .erase = NA, .write = NA}, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, /* MX23L12854 is a mask ROM, so it is read-only */ + .write = 0, /* MX23L12854 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8324,7 +8324,7 @@ .tested = {.probe = NT, .read = NT, .erase = NA, .write = NA}, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, /* MX23L1654 is a mask ROM, so it is read-only */ + .write = 0, /* MX23L1654 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8340,7 +8340,7 @@ .tested = {.probe = OK, .read = OK, .erase = NA, .write = NA}, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, /* MX23L3254 is a mask ROM, so it is read-only */ + .write = 0, /* MX23L3254 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8356,7 +8356,7 @@ .tested = {.probe = OK, .read = OK, .erase = NA, .write = NA}, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, /* MX23L6454 is a mask ROM, so it is read-only */ + .write = 0, /* MX23L6454 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {3000, 3600}, }, @@ -8392,7 +8392,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L1006E supports dual I/O */ .voltage = {2700, 3600}, }, @@ -8428,7 +8428,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8468,7 +8468,7 @@ /* TODO: security register and SBLK/SBULK; MX25L12835F: configuration register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8503,7 +8503,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8542,7 +8542,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* MX25L1605A bp2 only */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported (MX25L1608E supports dual-I/O read) */ .voltage = {2700, 3600}, }, @@ -8577,7 +8577,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: Continuously Program (CP) mode, for 73E is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, }, @@ -8613,7 +8613,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -8649,7 +8649,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -8687,7 +8687,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8736,7 +8736,7 @@ /* TODO: security register and SBLK/SBULK; MX25L12835F: configuration register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8771,7 +8771,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8807,7 +8807,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: continuously program mode */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, }, @@ -8846,7 +8846,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, }, @@ -8882,7 +8882,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8921,7 +8921,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, /* 33F 2.65V..3.6V */ }, @@ -8959,7 +8959,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8998,7 +8998,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L512E supports dual I/O */ .voltage = {2700, 3600}, /* 2.35-3.6V for MX25V512(C) */ }, @@ -9036,7 +9036,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -9072,7 +9072,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -9108,7 +9108,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: continuously program mode */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0xBB) supported */ .voltage = {2700, 3600}, }, @@ -9148,7 +9148,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read supported */ .voltage = {2700, 3600}, }, @@ -9188,7 +9188,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -9226,7 +9226,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -9266,7 +9266,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.35-3.6V for MX25V8005 */ }, @@ -9305,7 +9305,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit 6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 3600}, }, @@ -9344,7 +9344,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 3600}, }, @@ -9384,7 +9384,7 @@ /* TODO: security register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9425,7 +9425,7 @@ /* TODO: security register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9474,7 +9474,7 @@ /* TODO: security register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9516,7 +9516,7 @@ /* TODO: security register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9565,7 +9565,7 @@ /* TODO: security register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9607,7 +9607,7 @@ /* TODO: security register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9647,7 +9647,7 @@ /* TODO: security register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -9680,7 +9680,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -9713,7 +9713,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -9745,7 +9745,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -9777,7 +9777,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -9809,7 +9809,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -9841,7 +9841,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -9868,7 +9868,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -9895,7 +9895,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -9925,7 +9925,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -9952,7 +9952,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -9982,7 +9982,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -10012,7 +10012,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -10039,7 +10039,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -10069,7 +10069,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -10096,7 +10096,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -10145,7 +10145,7 @@ /* TODO: security register and SBLK/SBULK; MX25L12835F: configuration register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10194,7 +10194,7 @@ /* TODO: security register and SBLK/SBULK, configuration register */ .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10228,7 +10228,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_1, /* 128 */ + .write = SPI_CHIP_WRITE1, /* 128 */ .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10257,7 +10257,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10287,7 +10287,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_1, /* 128 */ + .write = SPI_CHIP_WRITE1, /* 128 */ .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10316,7 +10316,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10345,7 +10345,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10374,7 +10374,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10403,7 +10403,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10432,7 +10432,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10461,7 +10461,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10490,7 +10490,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10519,7 +10519,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, }, @@ -10547,7 +10547,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10576,7 +10576,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10608,7 +10608,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10640,7 +10640,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10672,7 +10672,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10704,7 +10704,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10736,7 +10736,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10769,7 +10769,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -10802,7 +10802,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10835,7 +10835,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10868,7 +10868,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit5: T/B */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10896,7 +10896,7 @@ }, .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ - .write = spi_chip_write_256, /* Page write (similar to PP but allows 0->1 changes) */ + .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10924,7 +10924,7 @@ }, .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ - .write = spi_chip_write_256, /* Page write (similar to PP but allows 0->1 changes) */ + .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10952,7 +10952,7 @@ }, .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ - .write = spi_chip_write_256, /* Page write (similar to PP but allows 0->1 changes) */ + .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -10980,7 +10980,7 @@ }, .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ - .write = spi_chip_write_256, /* Page write supported (similar to PP but allows 0->1 changes) */ + .write = SPI_CHIP_WRITE256, /* Page write supported (similar to PP but allows 0->1 changes) */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -11008,7 +11008,7 @@ }, .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ - .write = spi_chip_write_256, /* Page write (similar to PP but allows 0->1 changes) */ + .write = SPI_CHIP_WRITE256, /* Page write (similar to PP but allows 0->1 changes) */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -11048,7 +11048,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11088,7 +11088,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11125,7 +11125,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11159,7 +11159,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11193,7 +11193,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11227,7 +11227,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11261,7 +11261,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11295,7 +11295,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11329,7 +11329,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11369,7 +11369,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11409,7 +11409,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11449,7 +11449,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11489,7 +11489,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11535,7 +11535,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11581,7 +11581,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11627,7 +11627,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11673,7 +11673,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11713,7 +11713,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11753,7 +11753,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11802,7 +11802,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11851,7 +11851,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11900,7 +11900,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -11949,7 +11949,7 @@ }, .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -11976,7 +11976,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -12003,7 +12003,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -12030,7 +12030,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -12057,7 +12057,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -12084,7 +12084,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -12111,7 +12111,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -12138,7 +12138,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -12179,7 +12179,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12214,7 +12214,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12255,7 +12255,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12296,7 +12296,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12334,7 +12334,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -12372,7 +12372,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, /* 2.3-3.6V for Pm25LD010 */ }, @@ -12410,7 +12410,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, /* 2.3-3.6V for Pm25LD020 */ }, @@ -12448,7 +12448,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, /* 2.3-3.6V for Pm25LD040 */ }, @@ -12486,7 +12486,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, }, @@ -12524,7 +12524,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2300, 3600}, }, @@ -12563,7 +12563,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -12602,7 +12602,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -12641,7 +12641,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -12680,7 +12680,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -12719,7 +12719,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2300, 3600}, }, @@ -12751,7 +12751,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12783,7 +12783,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12821,7 +12821,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12853,7 +12853,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -12885,7 +12885,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12923,7 +12923,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12955,7 +12955,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -12987,7 +12987,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -13019,7 +13019,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -13049,7 +13049,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -13079,7 +13079,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -13109,7 +13109,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -13139,7 +13139,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -13170,7 +13170,7 @@ } }, .unlock = unlock_regspace2_uniform_32k, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -13201,7 +13201,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -13233,7 +13233,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ + .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -13265,7 +13265,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ + .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, .voltage = {3000, 3600}, }, @@ -13297,7 +13297,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ + .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, .voltage = {3000, 3600}, }, @@ -13335,7 +13335,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ + .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, /* Fast read (0x0B) supported by SST25VF010A only */ .voltage = {2700, 3600}, }, @@ -13373,7 +13373,7 @@ }, .printlock = spi_prettyprint_status_register_sst25vf016, .unlock = spi_disable_blockprotect, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -13405,7 +13405,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ + .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, /* only */ .voltage = {2700, 3600}, }, @@ -13443,7 +13443,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 and 2nd SR */ .unlock = spi_disable_blockprotect, /* FIXME: 2nd SR */ - .write = spi_aai_write, /* AAI supported (0xAD) */ + .write = SPI_WRITE_AAI, /* AAI supported (0xAD) */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -13481,7 +13481,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -13513,7 +13513,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ + .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -13551,7 +13551,7 @@ }, .printlock = spi_prettyprint_status_register_sst25vf040b, .unlock = spi_disable_blockprotect, - .write = spi_aai_write, /* AAI supported (0xAD) */ + .write = SPI_WRITE_AAI, /* AAI supported (0xAD) */ .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -13589,7 +13589,7 @@ }, .printlock = spi_prettyprint_status_register_sst25vf040b, .unlock = spi_disable_blockprotect, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -13627,7 +13627,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -13665,7 +13665,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -13703,7 +13703,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: No BP2 & 3 */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ + .write = SPI_CHIP_WRITE1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, /* Fast read (0x0B) supported by SST25VF512A only */ .voltage = {2700, 3600}, }, @@ -13738,7 +13738,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13776,7 +13776,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13811,7 +13811,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13849,7 +13849,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13884,7 +13884,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual O (0x3B), dual I/O read (0xBB) supported */ .voltage = {1650, 1950}, }, @@ -13922,7 +13922,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* *does* have a BP3 but it is useless */ .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -13957,7 +13957,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual O (0x3B), dual I/O read (0xBB) supported */ .voltage = {1650, 1950}, }, @@ -13992,7 +13992,7 @@ }, .printlock = spi_prettyprint_status_register_sst25, /* FIXME: does not have a BP3 */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_aai_write, + .write = SPI_WRITE_AAI, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {1650, 1950}, }, @@ -14030,7 +14030,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect_sst26_global_unprotect, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -14068,7 +14068,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect_sst26_global_unprotect, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -14106,7 +14106,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect_sst26_global_unprotect, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -14134,7 +14134,7 @@ } }, .unlock = unprotect_28sf040, - .write = write_28sf040, + .write = WRITE_28SF040, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -14158,7 +14158,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -14182,7 +14182,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -14206,7 +14206,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14230,7 +14230,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14257,7 +14257,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -14284,7 +14284,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -14311,7 +14311,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -14338,7 +14338,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -14365,7 +14365,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -14392,7 +14392,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -14419,7 +14419,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -14449,7 +14449,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -14476,7 +14476,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -14508,7 +14508,7 @@ }, .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14540,7 +14540,7 @@ }, .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14575,7 +14575,7 @@ }, .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14609,7 +14609,7 @@ }, .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14641,7 +14641,7 @@ }, .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14675,7 +14675,7 @@ }, .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14709,7 +14709,7 @@ }, .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14739,7 +14739,7 @@ .block_erase = NULL, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14769,7 +14769,7 @@ .block_erase = NULL, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14799,7 +14799,7 @@ .block_erase = NULL, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14830,7 +14830,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14860,7 +14860,7 @@ .block_erase = NULL, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14894,7 +14894,7 @@ }, .printlock = printlock_regspace2_block_eraser_1, .unlock = unlock_regspace2_block_eraser_1, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -14926,7 +14926,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -X, others 4.5-5.5V */ }, @@ -14958,7 +14958,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4750, 5250}, /* 4.75-5.25V for type -X, others 4.5-5.5V */ }, @@ -14985,7 +14985,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -15018,7 +15018,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -15051,7 +15051,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -15078,7 +15078,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -15105,7 +15105,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -15129,7 +15129,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -15162,7 +15162,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15195,7 +15195,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15229,7 +15229,7 @@ }, .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15263,7 +15263,7 @@ }, .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15297,7 +15297,7 @@ }, .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15322,7 +15322,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15347,7 +15347,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15372,7 +15372,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15397,7 +15397,7 @@ } }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15429,7 +15429,7 @@ }, .printlock = printlock_regspace2_block_eraser_0, .unlock = unlock_regspace2_block_eraser_0, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -15456,7 +15456,7 @@ .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect_bp1_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2500, 5500}, }, @@ -15490,7 +15490,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect_bp1_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -15522,7 +15522,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect_bp1_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -15559,7 +15559,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -15591,7 +15591,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -15629,7 +15629,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B), dual read (0x3B) and dual I/O (0xBB) supported */ .voltage = {2300, 3600}, }, @@ -15661,7 +15661,7 @@ }, .printlock = spi_prettyprint_status_register_bp1_srwd, /* FIXME: Add ERSER error flag. */ .unlock = spi_disable_blockprotect_bp1_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -15692,7 +15692,7 @@ }, .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -15723,7 +15723,7 @@ }, .printlock = spi_prettyprint_status_register_default_welwip, .unlock = NULL, /* #WP pin write-protects lower 64kB. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -15755,7 +15755,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -15787,7 +15787,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* some quad-read supported ("HD_READ mode") */ .voltage = {2700, 3600}, }, @@ -15822,7 +15822,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -15854,7 +15854,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* some quad-read supported ("HD_READ mode") */ .voltage = {2700, 3600}, }, @@ -15884,7 +15884,7 @@ } }, .unlock = unlock_lh28f008bjt, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -15917,7 +15917,7 @@ }, }, .unlock = unlock_regspace2_uniform_64k, - .write = write_82802ab, + .write = WRITE_82802AB, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -15946,7 +15946,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -15975,7 +15975,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -16004,7 +16004,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -16033,7 +16033,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -16062,7 +16062,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -16098,7 +16098,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -16132,7 +16132,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16177,7 +16177,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16216,7 +16216,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, .reg_bits = @@ -16269,7 +16269,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -16298,7 +16298,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -16341,7 +16341,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16375,7 +16375,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16406,7 +16406,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, }, @@ -16437,7 +16437,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, }, @@ -16486,7 +16486,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: Configuration register */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16519,7 +16519,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: Configuration register */ .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16555,7 +16555,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* TODO: improve */ .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16591,7 +16591,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_srwd, /* TODO: improve */ .unlock = spi_disable_blockprotect_bp2_srwd, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16626,7 +16626,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -16661,7 +16661,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O (0x3B) supported */ .voltage = {2700, 3600}, }, @@ -16710,7 +16710,7 @@ }, .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, .reg_bits = @@ -16755,7 +16755,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, }, @@ -16783,7 +16783,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, }, @@ -16829,7 +16829,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16866,7 +16866,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_ep_srwd, /* TODO: SR2 and many others */ .unlock = spi_disable_blockprotect_bp2_srwd, /* TODO: various other locks */ - .write = spi_chip_write_256, /* Multi I/O supported, IGNORE for now */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported, IGNORE for now */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -16897,7 +16897,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, }, @@ -16928,7 +16928,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 2000}, }, @@ -16955,7 +16955,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -16982,7 +16982,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -17009,7 +17009,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, }, @@ -17035,7 +17035,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, }, @@ -17061,7 +17061,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -17088,7 +17088,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -17115,7 +17115,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -17142,7 +17142,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -17174,7 +17174,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -17206,7 +17206,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -17235,7 +17235,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -17264,7 +17264,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -17293,7 +17293,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -17334,7 +17334,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -17383,7 +17383,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -17433,7 +17433,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, .reg_bits = @@ -17481,7 +17481,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, .reg_bits = @@ -17531,7 +17531,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -17571,7 +17571,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -17610,7 +17610,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -17652,7 +17652,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -17707,7 +17707,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -17762,7 +17762,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -17817,7 +17817,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -17863,7 +17863,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, }, @@ -17903,7 +17903,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -17943,7 +17943,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -17981,7 +17981,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, }, @@ -18021,7 +18021,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, /* Multi I/O supported */ + .write = SPI_CHIP_WRITE256, /* Multi I/O supported */ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -18060,7 +18060,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18099,7 +18099,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18143,7 +18143,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18186,7 +18186,7 @@ } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -18226,7 +18226,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -18277,7 +18277,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -18328,7 +18328,7 @@ }, .printlock = spi_prettyprint_status_register_bp2_tb_bpl, .unlock = spi_disable_blockprotect_bp2_srwd, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18368,7 +18368,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ .reg_bits = @@ -18418,7 +18418,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18458,7 +18458,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18497,7 +18497,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1700, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18536,7 +18536,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, /* Fast read (0x0B) and multi I/O supported */ }, @@ -18568,7 +18568,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2300, 3600}, }, @@ -18600,7 +18600,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18638,7 +18638,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18670,7 +18670,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18708,7 +18708,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18740,7 +18740,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18778,7 +18778,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18810,7 +18810,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -18835,7 +18835,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, }, @@ -18858,7 +18858,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, }, @@ -18881,7 +18881,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -18905,7 +18905,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -18929,7 +18929,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec, + .write = WRITE_JEDEC, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -18959,7 +18959,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -18986,7 +18986,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -19016,7 +19016,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -19046,7 +19046,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -19073,7 +19073,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -19103,7 +19103,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -19130,7 +19130,7 @@ .block_erase = erase_chip_block_jedec, }, }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {2700, 3600}, }, @@ -19158,7 +19158,7 @@ } }, .printlock = printlock_w39f010, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -19186,7 +19186,7 @@ } }, .printlock = printlock_w39l010, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19217,7 +19217,7 @@ } }, .printlock = printlock_w39l020, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19248,7 +19248,7 @@ } }, .printlock = printlock_w39l040, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19276,7 +19276,7 @@ } }, .printlock = printlock_w39v040a, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19304,7 +19304,7 @@ } }, .printlock = printlock_w39v040b, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19332,7 +19332,7 @@ } }, .printlock = printlock_w39v040c, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19364,7 +19364,7 @@ }, .printlock = printlock_w39v040fa, .unlock = unlock_regspace2_uniform_64k, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19393,7 +19393,7 @@ }, .printlock = printlock_w39v040fb, .unlock = unlock_regspace2_uniform_64k, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19421,7 +19421,7 @@ } }, .printlock = printlock_w39v040fc, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19449,7 +19449,7 @@ } }, .printlock = printlock_w39v080a, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19478,7 +19478,7 @@ }, .printlock = printlock_w39v080fa, .unlock = unlock_regspace2_uniform_64k, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19506,7 +19506,7 @@ } }, .printlock = printlock_w39v080fa_dual, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, @@ -19538,7 +19538,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -19562,7 +19562,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {4500, 5500}, }, @@ -19594,7 +19594,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19626,7 +19626,7 @@ .block_erase = erase_chip_block_jedec, } }, - .write = write_jedec_1, + .write = WRITE_JEDEC1, .read = read_memmapped, .voltage = {3000, 3600}, }, @@ -19664,7 +19664,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -19702,7 +19702,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -19740,7 +19740,7 @@ }, .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -19790,7 +19790,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -19832,7 +19832,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, .reg_bits = @@ -19881,7 +19881,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {1650, 1950}, }, @@ -19919,7 +19919,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -19957,7 +19957,7 @@ }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -19978,7 +19978,7 @@ .probe = PROBE_SPI_SFDP, .block_erasers = {}, /* set by probing function */ .unlock = spi_disable_blockprotect, /* is this safe? */ - .write = NULL, /* set by probing function */ + .write = 0, /* set by probing function */ .read = spi_chip_read, /* FIXME: some vendor extensions define this */ .voltage = {0}, @@ -20002,7 +20002,7 @@ .block_erase = erase_opaque, } }, - .write = write_opaque, + .write = WRITE_OPAQUE, .read = read_opaque, }, @@ -20017,7 +20017,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20032,7 +20032,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20047,7 +20047,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20062,7 +20062,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20077,7 +20077,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20092,7 +20092,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20107,7 +20107,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20122,7 +20122,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20137,7 +20137,7 @@ .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, - .write = NULL, + .write = 0, .read = NULL, }, @@ -20151,7 +20151,7 @@ .page_size = 256, .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, - .write = NULL, + .write = 0, }, { @@ -20164,7 +20164,7 @@ .page_size = 256, .tested = TEST_BAD_PREW, .probe = PROBE_SPI_REMS, - .write = NULL, + .write = 0, }, {0} diff --git a/flashrom.c b/flashrom.c index c8c7dd5..3ddc4b0 100644 --- a/flashrom.c +++ b/flashrom.c @@ -729,6 +729,40 @@ return 0; } +/* special unit-test hook */ +write_func_t *g_test_write_injector; + +static write_func_t *lookup_write_func_ptr(const struct flashchip *chip) +{ + switch (chip->write) { + case WRITE_JEDEC: return &write_jedec; + case WRITE_JEDEC1: return &write_jedec_1; + case WRITE_OPAQUE: return &write_opaque; + case SPI_CHIP_WRITE1: return &spi_chip_write_1; + case SPI_CHIP_WRITE256: return &spi_chip_write_256; + case SPI_WRITE_AAI: return &spi_aai_write; + case SPI_WRITE_AT45DB: return &spi_write_at45db; + case WRITE_28SF040: return &write_28sf040; + case WRITE_82802AB: return &write_82802ab; + case WRITE_EN29LV640B: return &write_en29lv640b; + case EDI_CHIP_WRITE: return &edi_chip_write; + case TEST_WRITE_INJECTOR: return g_test_write_injector; + /* default: total function, 0 indicates no write function set. + * We explicitly do not want a default catch-all case in the switch + * to ensure unhandled enum's are compiler warnings. + */ + case NO_WRITE_FUNC: return NULL; + }; + + return NULL; +} + +static int write_flash(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) +{ + write_func_t *write_func = lookup_write_func_ptr(flash->chip); + return write_func(flash, buf, start, len); +} + typedef int (probe_func_t)(struct flashctx *flash); static probe_func_t *lookup_probe_func_ptr(const struct flashchip *chip) @@ -1161,7 +1195,7 @@ if (!writecount++) msg_cdbg("W"); /* Needs the partial write function signature. */ - if (flashctx->chip->write(flashctx, backup_contents + starthere, + if (write_flash(flashctx, backup_contents + starthere, info->erase_start + starthere, lenhere)) goto _free_ret; starthere += lenhere; @@ -1265,7 +1299,7 @@ if (!writecount++) msg_cdbg("W"); /* Needs the partial write function signature. */ - if (flashctx->chip->write(flashctx, newcontents + starthere, + if (write_flash(flashctx, newcontents + starthere, info->erase_start + starthere, lenhere)) goto _free_ret; starthere += lenhere; @@ -1555,7 +1589,7 @@ return 1; msg_cerr("Continuing anyway.\n"); } - if (!chip->write) { + if (!lookup_write_func_ptr(chip)) { msg_cerr("flashrom has no write function for this " "flash chip.\n"); return 1; diff --git a/include/flash.h b/include/flash.h index 37f21ac..b61b7ea 100644 --- a/include/flash.h +++ b/include/flash.h @@ -238,6 +238,23 @@ PROBE_SPI_ST95, }; +enum write_func { + NO_WRITE_FUNC = 0, /* 0 indicates no write function set. */ + WRITE_JEDEC = 1, + WRITE_JEDEC1, + WRITE_OPAQUE, + SPI_CHIP_WRITE1, + SPI_CHIP_WRITE256, + SPI_WRITE_AAI, + SPI_WRITE_AT45DB, + WRITE_28SF040, + WRITE_82802AB, + WRITE_EN29LV640B, + EDI_CHIP_WRITE, + TEST_WRITE_INJECTOR, /* special case must come last. */ +}; +typedef int (write_func_t)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); + struct flashchip { const char *vendor; const char *name; @@ -305,7 +322,7 @@ int (*printlock) (struct flashctx *flash); int (*unlock) (struct flashctx *flash); - int (*write) (struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); + enum write_func write; int (*read) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); struct voltage { uint16_t min; diff --git a/sfdp.c b/sfdp.c index b549417..8fea4c9 100644 --- a/sfdp.c +++ b/sfdp.c @@ -179,11 +179,11 @@ if (tmp32 & (1 << 2)) { msg_cdbg2("at least 64 B.\n"); chip->page_size = 64; - chip->write = spi_chip_write_256; + chip->write = SPI_CHIP_WRITE256; } else { msg_cdbg2("1 B only.\n"); chip->page_size = 256; - chip->write = spi_chip_write_1; + chip->write = SPI_CHIP_WRITE1; } if ((tmp32 & 0x3) == 0x1) { diff --git a/tests/chip.c b/tests/chip.c index 6f03172..284b7e4 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -146,12 +146,14 @@ io_mock_register(NULL); } +extern write_func_t *g_test_write_injector; + static const struct flashchip chip_8MiB = { .vendor = "aklm", .total_size = MOCK_CHIP_SIZE / KiB, .tested = TEST_OK_PREW, .read = read_chip, - .write = write_chip, + .write = TEST_WRITE_INJECTOR, .unlock = unlock_chip, .block_erasers = {{ @@ -167,7 +169,7 @@ .total_size = 16 * 1024, .tested = TEST_OK_PREW, .read = spi_chip_read, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .unlock = spi_disable_blockprotect, .page_size = 256, .block_erasers = @@ -203,6 +205,7 @@ .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -261,6 +264,7 @@ .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -332,6 +336,7 @@ .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -429,6 +434,7 @@ .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; diff --git a/tests/chip_wp.c b/tests/chip_wp.c index e4eff99..3c9be40 100644 --- a/tests/chip_wp.c +++ b/tests/chip_wp.c @@ -65,7 +65,7 @@ .total_size = 16 * 1024, .tested = TEST_OK_PREW, .read = spi_chip_read, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .unlock = spi_disable_blockprotect, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR_EXT2 | FEATURE_WRSR2 | FEATURE_WRSR3, .block_erasers = diff --git a/tests/spi25.c b/tests/spi25.c index 5cd84fb..8729593 100644 --- a/tests/spi25.c +++ b/tests/spi25.c @@ -32,7 +32,7 @@ .page_size = 256, .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, - .write = NULL, + .write = NO_WRITE_FUNC, }; /* -- To view, visit https://review.coreboot.org/c/flashrom/+/66782 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I80149de169464b204fb09f1424a86fc645b740fd Gerrit-Change-Number: 66782 Gerrit-PatchSet: 17 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: merged

1 0

[XL] Change in flashrom[master]: tree/: Convert flashchip probe func ptr to enumerate
by Felix Singer (Code Review) Nov. 1, 2022

Nov. 1, 2022

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66781 ) ( 13 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tree/: Convert flashchip probe func ptr to enumerate ...................................................................... tree/: Convert flashchip probe func ptr to enumerate This forges the way for flashchips.c to be pure declarative data and lookup functions for dispatch to be pure. This means that the flashchips data could be extracted out to be agnostic data of the flashrom code and algorithms. TEST='R|W|E && --flash-name' on ARM, AMD & Intel DUT's. Change-Id: I00aaab9c83f305cd47e78c36d9c2867f2b73c396 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66781 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nikolai Artemiev <nartemiev(a)google.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M flashchips.c M flashrom.c M include/flash.h M tests/spi25.c 4 files changed, 671 insertions(+), 596 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Nikolai Artemiev: Looks good to me, but someone else must approve diff --git a/flashchips.c b/flashchips.c index cbfbc7b..3b1c3d5 100644 --- a/flashchips.c +++ b/flashchips.c @@ -66,7 +66,7 @@ .page_size = 256, .feature_bits = FEATURE_SHORT_RESET | FEATURE_ADDR_2AA, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -98,7 +98,7 @@ .page_size = 256, .feature_bits = FEATURE_EITHER_RESET | FEATURE_ADDR_2AA, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -130,7 +130,7 @@ .page_size = 16 * 1024, .feature_bits = FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -157,7 +157,7 @@ .page_size = 16 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -184,7 +184,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -211,7 +211,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -238,7 +238,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -265,7 +265,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -292,7 +292,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -319,7 +319,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -350,7 +350,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -381,7 +381,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -413,7 +413,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -445,7 +445,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -477,7 +477,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -509,7 +509,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -541,7 +541,7 @@ .page_size = 64 * 1024, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -573,7 +573,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -600,7 +600,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, /* datasheet specifies address as don't care */ .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -627,7 +627,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -659,7 +659,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -691,7 +691,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -724,7 +724,7 @@ /* OTP: 64B total; read 0x4B, 0x48; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -762,7 +762,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -794,7 +794,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -828,7 +828,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -862,7 +862,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -894,7 +894,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -929,7 +929,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -964,7 +964,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1002,7 +1002,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PR, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1040,7 +1040,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1075,7 +1075,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1115,7 +1115,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PR, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1150,7 +1150,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1185,7 +1185,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1217,7 +1217,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PRE, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1254,7 +1254,7 @@ /* OTP: 64B total; read 0x4B, 0x48; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1294,7 +1294,7 @@ /* OTP: 64B total; read 0x4B, 0x48; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1335,7 +1335,7 @@ /* QPI enable 0x35, disable 0xF5 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1373,7 +1373,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1405,7 +1405,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1437,7 +1437,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1464,7 +1464,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PR, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .block_erasers = { @@ -1493,7 +1493,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1532,7 +1532,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1570,7 +1570,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1608,7 +1608,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1646,7 +1646,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1684,7 +1684,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1723,7 +1723,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1762,7 +1762,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1800,7 +1800,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1839,7 +1839,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1878,7 +1878,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1917,7 +1917,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1957,7 +1957,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_at25f, + .probe = PROBE_SPI_AT25F, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -1986,7 +1986,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_at25f, + .probe = PROBE_SPI_AT25F, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2015,7 +2015,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_at25f, + .probe = PROBE_SPI_AT25F, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2045,7 +2045,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_at25f, + .probe = PROBE_SPI_AT25F, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2074,7 +2074,7 @@ .page_size = 128, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_at25f, + .probe = PROBE_SPI_AT25F, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2105,7 +2105,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2146,7 +2146,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2187,7 +2187,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2225,7 +2225,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2263,7 +2263,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2301,7 +2301,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PR, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2339,7 +2339,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2377,7 +2377,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PR, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2416,7 +2416,7 @@ /* supports SFDP */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_WRSR2, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2464,7 +2464,7 @@ .page_size = 256, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2496,7 +2496,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2534,7 +2534,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2572,7 +2572,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2610,7 +2610,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = {.probe = NT, .read = NT, .erase = NT, .write = BAD}, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2647,7 +2647,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10000, /* 10mS, Enter=Exec */ .block_erasers = { @@ -2671,7 +2671,7 @@ .page_size = 256, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10000, /* 10ms */ .block_erasers = { @@ -2695,7 +2695,7 @@ .page_size = 256, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10000, /* 10 ms */ .block_erasers = { @@ -2719,7 +2719,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10000, /* 10mS, Enter=Exec */ .block_erasers = { @@ -2745,7 +2745,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77 (4 dummy bytes); write 0x9A (via buffer) */ .feature_bits = FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2777,7 +2777,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2819,7 +2819,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2861,7 +2861,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2903,7 +2903,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2945,7 +2945,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -2987,7 +2987,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77 (4 dummy bytes); write 0x9A (via buffer) */ .feature_bits = FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3030,7 +3030,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3072,7 +3072,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3114,7 +3114,7 @@ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_at45db, + .probe = PROBE_SPI_AT45DB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3154,7 +3154,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3179,7 +3179,7 @@ .page_size = 64, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3203,7 +3203,7 @@ .page_size = 256, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3235,7 +3235,7 @@ .page_size = 256, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PR, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3267,7 +3267,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3298,7 +3298,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3329,7 +3329,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3361,7 +3361,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3392,7 +3392,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3428,7 +3428,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3464,7 +3464,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3500,7 +3500,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PR, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3538,7 +3538,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3576,7 +3576,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PR, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3603,7 +3603,7 @@ .page_size = 0, /* unused */ .feature_bits = 0, .tested = {.probe = OK, .read = OK, .erase = BAD, .write = BAD}, - .probe = probe_jedec, /* FIXME! */ + .probe = PROBE_JEDEC, /* FIXME! */ .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3626,7 +3626,7 @@ .feature_bits = FEATURE_ERASED_ZERO, .tested = TEST_OK_PREW, .spi_cmd_set = SPI_EDI, - .probe = edi_probe_kb9012, + .probe = PROBE_EDI_KB9012, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3653,7 +3653,7 @@ * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3684,7 +3684,7 @@ * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3715,7 +3715,7 @@ * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3744,7 +3744,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3779,7 +3779,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3814,7 +3814,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -3846,7 +3846,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3880,7 +3880,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3914,7 +3914,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3948,7 +3948,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3982,7 +3982,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4017,7 +4017,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4052,7 +4052,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4087,7 +4087,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4123,7 +4123,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4159,7 +4159,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4194,7 +4194,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4229,7 +4229,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4265,7 +4265,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4301,7 +4301,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4336,7 +4336,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4371,7 +4371,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4406,7 +4406,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4444,7 +4444,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4482,7 +4482,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4517,7 +4517,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4555,7 +4555,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4590,7 +4590,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4625,7 +4625,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4660,7 +4660,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4695,7 +4695,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4725,7 +4725,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4754,7 +4754,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4783,7 +4783,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4813,7 +4813,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4842,7 +4842,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4872,7 +4872,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4901,7 +4901,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4931,7 +4931,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -4968,7 +4968,7 @@ /* OTP: D16 512B/Q16 128B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5008,7 +5008,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5044,7 +5044,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5080,7 +5080,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5116,7 +5116,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5154,7 +5154,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5199,7 +5199,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5237,7 +5237,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5275,7 +5275,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5311,7 +5311,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5347,7 +5347,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5386,7 +5386,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5422,7 +5422,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5461,7 +5461,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5497,7 +5497,7 @@ /* OTP: 512B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5533,7 +5533,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5568,7 +5568,7 @@ .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -5600,7 +5600,7 @@ .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -5632,7 +5632,7 @@ .page_size = 128, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -5660,7 +5660,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5690,7 +5690,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5720,7 +5720,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5747,7 +5747,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5773,7 +5773,7 @@ .total_size = 512, .page_size = 4 * 1024, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -5801,7 +5801,7 @@ .page_size = 8192, .feature_bits = FEATURE_ADDR_SHIFTED, .tested = TEST_OK_PREW, - .probe = probe_en29lv640b, + .probe = PROBE_EN29LV640B, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -5832,7 +5832,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { { @@ -5870,7 +5870,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { { @@ -5908,7 +5908,7 @@ /* OTP: 256B total; enter 0x3A, (A version only:) read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { { @@ -5946,7 +5946,7 @@ /* OTP: 256B total; enter 0x3A, (A version only:) read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { { @@ -5986,7 +5986,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { { @@ -6026,7 +6026,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { { @@ -6066,7 +6066,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { { @@ -6103,7 +6103,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -6135,7 +6135,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -6168,7 +6168,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, // FIXME: check datasheet. Using the 10 us from probe_m29f400bt .block_erasers = { @@ -6200,7 +6200,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, // FIXME: check datasheet. Using the 10 us from probe_m29f400bt .block_erasers = { @@ -6232,7 +6232,7 @@ .page_size = 0, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, // FIXME: check datasheet. Using the 10 us from probe_m29f400bt .block_erasers = { @@ -6264,7 +6264,7 @@ .page_size = 0, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, // FIXME: check datasheet. Using the 10 us from probe_m29f400bt .block_erasers = { @@ -6297,7 +6297,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6336,7 +6336,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR_EXT2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6385,7 +6385,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6424,7 +6424,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6463,7 +6463,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6502,7 +6502,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR_EXT2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6551,7 +6551,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6589,7 +6589,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6629,7 +6629,7 @@ /* QPI: enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_WRSR2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6679,7 +6679,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 (B version only) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6717,7 +6717,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6756,7 +6756,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN | FEATURE_WRSR_EXT2 | FEATURE_WRSR2 | FEATURE_WRSR3, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6812,7 +6812,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6860,7 +6860,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6898,7 +6898,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6934,7 +6934,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -6983,7 +6983,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 (B version only) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7022,7 +7022,7 @@ /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7062,7 +7062,7 @@ /* OTP: 1024B total; read 0x48, write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7101,7 +7101,7 @@ /* OTP: 1536B total; read 0x48, write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7141,7 +7141,7 @@ /* OTP: 1024B total; read 0x48, write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7180,7 +7180,7 @@ /* OTP: 1536B total; read 0x48, write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7220,7 +7220,7 @@ /* OTP: 1024B total; read 0x48, write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7258,7 +7258,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7296,7 +7296,7 @@ .page_size = 256 * 1024, .feature_bits = FEATURE_EITHER_RESET, /* Some revisions may need FEATURE_ADDR_2AA */ .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -7328,7 +7328,7 @@ .page_size = 256 * 1024, .feature_bits = FEATURE_EITHER_RESET, /* Some revisions may need FEATURE_ADDR_2AA */ .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -7360,7 +7360,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7388,7 +7388,7 @@ /* OTP: 1024B total; read 0x48; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7429,7 +7429,7 @@ /* OTP: 1024B total; read 0x48; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7472,7 +7472,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA | FEATURE_4BA_ENTER_EAR7 | FEATURE_4BA_EAR_1716, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7521,7 +7521,7 @@ /* QPI enable 0x35, disable 0xF5 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7563,7 +7563,7 @@ /* QPI enable 0x35, disable 0xF5 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7605,7 +7605,7 @@ /* QPI enable 0x35, disable 0xF5 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7648,7 +7648,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA | FEATURE_4BA_ENTER_EAR7 | FEATURE_4BA_EAR_1716, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7695,7 +7695,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7725,7 +7725,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7752,7 +7752,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7782,7 +7782,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7810,7 +7810,7 @@ /* OTP: 506B total (2x 8B, 30x 16B, 1x 10B); read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7849,7 +7849,7 @@ /* OTP: 506B total (2x 8B, 30x 16B, 1x 10B); read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7888,7 +7888,7 @@ /* OTP: 506B total (2x 8B, 30x 16B, 1x 10B); read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7927,7 +7927,7 @@ /* OTP: 506B total (2x 8B, 30x 16B, 1x 10B); read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -7966,7 +7966,7 @@ /* OTP: 506B total (2x 8B, 30x 16B, 1x 10B); read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8005,7 +8005,7 @@ /* OTP: 506B total (2x 8B, 30x 16B, 1x 10B); read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8042,7 +8042,7 @@ .total_size = 128, .page_size = 128 * 1024, /* 8k + 2x4k + 112k */ .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8069,7 +8069,7 @@ .total_size = 128, .page_size = 128 * 1024, /* 112k + 2x4k + 8k */ .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8096,7 +8096,7 @@ .total_size = 256, .page_size = 256 * 1024, .tested = TEST_OK_PRE, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8123,7 +8123,7 @@ .total_size = 512, .page_size = 128 * 1024, /* maximal block size */ .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8150,7 +8150,7 @@ .total_size = 512, .page_size = 128 * 1024, /* maximal block size */ .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8177,7 +8177,7 @@ .total_size = 512, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8201,7 +8201,7 @@ .page_size = 128 * 1024, /* maximal block size */ .feature_bits = FEATURE_ADDR_SHIFTED, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8229,7 +8229,7 @@ .page_size = 128 * 1024, /* maximal block size */ .feature_bits = FEATURE_ADDR_SHIFTED, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -8249,7 +8249,7 @@ { .vendor = "Intel", - .name = "82802AB", + .name = "AT82802AB", .bustype = BUS_FWH, .manufacture_id = INTEL_ID, .model_id = INTEL_82802AB, @@ -8257,7 +8257,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine does not use probe_timing (82802ab.c) */ .block_erasers = { @@ -8282,7 +8282,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PR, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine does not use probe_timing (82802ab.c) */ .block_erasers = { @@ -8306,7 +8306,7 @@ .total_size = 16384, .page_size = 256, .tested = {.probe = NT, .read = NT, .erase = NA, .write = NA}, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, /* MX23L12854 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8322,7 +8322,7 @@ .total_size = 2048, .page_size = 256, .tested = {.probe = NT, .read = NT, .erase = NA, .write = NA}, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, /* MX23L1654 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8338,7 +8338,7 @@ .total_size = 4096, .page_size = 256, .tested = {.probe = OK, .read = OK, .erase = NA, .write = NA}, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, /* MX23L3254 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8354,7 +8354,7 @@ .total_size = 8192, .page_size = 256, .tested = {.probe = OK, .read = OK, .erase = NA, .write = NA}, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, /* MX23L6454 is a mask ROM, so it is read-only */ .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8372,7 +8372,7 @@ /* MX25L1006E supports SFDP */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8408,7 +8408,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8444,7 +8444,7 @@ /* OTP: MX25L12833F has 1KB total, others have 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8483,7 +8483,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8519,7 +8519,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 (MX25L1606E and MX25L1608E only) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8557,7 +8557,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8593,7 +8593,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8629,7 +8629,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8664,7 +8664,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8703,7 +8703,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8751,7 +8751,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8787,7 +8787,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8823,7 +8823,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8862,7 +8862,7 @@ /* OTP: 256B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8898,7 +8898,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8936,7 +8936,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -8975,7 +8975,7 @@ /* MX25L512E supports SFDP */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9013,7 +9013,7 @@ .page_size = 32, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9052,7 +9052,7 @@ /* Has an additional 512B EEPROM sector */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9088,7 +9088,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9125,7 +9125,7 @@ /* OTP: 06E 64B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9165,7 +9165,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9204,7 +9204,7 @@ /* OTP: 1024B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9243,7 +9243,7 @@ /* OTP: 64B total; enter 0xB1, exit 0xC1 (MX25L8006E, MX25L8008E only) */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9282,7 +9282,7 @@ /* OTP: 1024B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9321,7 +9321,7 @@ /* OTP: 1024B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9360,7 +9360,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9401,7 +9401,7 @@ /* QPI enable 0x35, disable 0xF5 (0xFF et al. work too) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PR, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9441,7 +9441,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9492,7 +9492,7 @@ /* QPI enable 0x35, disable 0xF5 (0xFF et al. work too) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9532,7 +9532,7 @@ /* OTP: 512B factory programmed and 512B customer programmed; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9583,7 +9583,7 @@ /* QPI enable 0x35, disable 0xF5 (0xFF et al. work too) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9623,7 +9623,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9662,7 +9662,7 @@ .page_size = 32 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9695,7 +9695,7 @@ .page_size = 32 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9728,7 +9728,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9760,7 +9760,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9792,7 +9792,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9824,7 +9824,7 @@ .page_size = 0, /* unused */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9856,7 +9856,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9883,7 +9883,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9910,7 +9910,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9940,7 +9940,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9967,7 +9967,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -9997,7 +9997,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10027,7 +10027,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10054,7 +10054,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10084,7 +10084,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10112,7 +10112,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10161,7 +10161,7 @@ /* OTP: 512B total; enter 0xB1, exit 0xC1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10201,7 +10201,7 @@ /* The ST M25P05 is a bit of a problem. It has the same ID as the * ST M25P05-A in RES mode, but supports only 128 byte writes instead - * of 256 byte writes. We rely heavily on the fact that probe_spi_res1 + * of 256 byte writes. We rely heavily on the fact that PROBE_SPI_RES1 * only is successful if RDID does not work. */ { @@ -10214,7 +10214,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res1, + .probe = PROBE_SPI_RES1, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10243,7 +10243,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10273,7 +10273,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res1, + .probe = PROBE_SPI_RES1, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10302,7 +10302,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10331,7 +10331,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10360,7 +10360,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10389,7 +10389,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10418,7 +10418,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_res1, + .probe = PROBE_SPI_RES1, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10447,7 +10447,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10476,7 +10476,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10505,7 +10505,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res1, + .probe = PROBE_SPI_RES1, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10533,7 +10533,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10562,7 +10562,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10591,7 +10591,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10623,7 +10623,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10655,7 +10655,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10687,7 +10687,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10719,7 +10719,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10752,7 +10752,7 @@ /* OTP: 64B total; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10785,7 +10785,7 @@ /* OTP: 64B total; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PRE, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10818,7 +10818,7 @@ /* OTP: 64B total; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10851,7 +10851,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10882,7 +10882,7 @@ .total_size = 128, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10910,7 +10910,7 @@ .total_size = 2048, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10938,7 +10938,7 @@ .total_size = 256, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10966,7 +10966,7 @@ .total_size = 512, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -10994,7 +10994,7 @@ .total_size = 1024, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11025,7 +11025,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11065,7 +11065,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11105,7 +11105,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11142,7 +11142,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11176,7 +11176,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11210,7 +11210,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11244,7 +11244,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11278,7 +11278,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11312,7 +11312,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11346,7 +11346,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11386,7 +11386,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11426,7 +11426,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11466,7 +11466,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11506,7 +11506,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11552,7 +11552,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11598,7 +11598,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11644,7 +11644,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11690,7 +11690,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11730,7 +11730,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11770,7 +11770,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11819,7 +11819,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11868,7 +11868,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11917,7 +11917,7 @@ /* OTP: 64B total; read 0x4B, write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11964,7 +11964,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -11991,7 +11991,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12018,7 +12018,7 @@ .page_size = 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12045,7 +12045,7 @@ .page_size = 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12072,7 +12072,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12099,7 +12099,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12126,7 +12126,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12153,7 +12153,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12194,7 +12194,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12229,7 +12229,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12270,7 +12270,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12311,7 +12311,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12349,7 +12349,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12387,7 +12387,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12425,7 +12425,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12463,7 +12463,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12501,7 +12501,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12540,7 +12540,7 @@ /* OTP: 256B total; read 0x4B, write 0xB1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12579,7 +12579,7 @@ /* OTP: 256B total; read 0x4B, write 0xB1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12618,7 +12618,7 @@ /* OTP: 64B total; read 0x4B, write 0xB1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12657,7 +12657,7 @@ /* OTP: 256B total; read 0x4B, write 0xB1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12696,7 +12696,7 @@ /* OTP: 64B total; read 0x4B, write 0xB1 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12734,7 +12734,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_res2, /* The continuation code is transferred as the 3rd byte m( */ + .probe = PROBE_SPI_RES2, /* The continuation code is transferred as the 3rd byte m( */ .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12766,7 +12766,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12798,7 +12798,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12836,7 +12836,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12868,7 +12868,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12900,7 +12900,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12938,7 +12938,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_res2, /* The continuation code is transferred as the 3rd byte m( */ + .probe = PROBE_SPI_RES2, /* The continuation code is transferred as the 3rd byte m( */ .probe_timing = TIMING_ZERO, .block_erasers = { @@ -12970,7 +12970,7 @@ .page_size = 8 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_FIXME, .block_erasers = { @@ -13002,7 +13002,7 @@ .page_size = 8 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_FIXME, .block_erasers = { @@ -13034,7 +13034,7 @@ .page_size = 4096, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -13064,7 +13064,7 @@ .page_size = 4096, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -13094,7 +13094,7 @@ .page_size = 4096, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_OK_PR, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -13124,7 +13124,7 @@ .page_size = 4096, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -13154,8 +13154,8 @@ .page_size = 16 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PR, - .probe = probe_jedec, - .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ + .probe = PROBE_JEDEC, + .probe_timing = TIMING_ZERO, /* routine is wrapper to JEDEC (pm49fl00x.c) */ .block_erasers = { { @@ -13185,7 +13185,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13216,7 +13216,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rems, + .probe = PROBE_SPI_REMS, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13248,7 +13248,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13280,7 +13280,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_UNTESTED, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13312,7 +13312,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rems, + .probe = PROBE_SPI_REMS, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13350,7 +13350,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13388,7 +13388,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_UNTESTED, - .probe = probe_spi_rems, + .probe = PROBE_SPI_REMS, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13420,7 +13420,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13458,7 +13458,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13496,7 +13496,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PR, - .probe = probe_spi_rems, + .probe = PROBE_SPI_REMS, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13528,7 +13528,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13566,7 +13566,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rems, + .probe = PROBE_SPI_REMS, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13604,7 +13604,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13642,7 +13642,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13680,7 +13680,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EWSR, .tested = TEST_OK_PREW, - .probe = probe_spi_rems, + .probe = PROBE_SPI_REMS, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13718,7 +13718,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13753,7 +13753,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13791,7 +13791,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13826,7 +13826,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13864,7 +13864,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13899,7 +13899,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13937,7 +13937,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -13972,7 +13972,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_EITHER, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -14007,7 +14007,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -14045,7 +14045,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -14083,7 +14083,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -14121,7 +14121,7 @@ .page_size = 256, .feature_bits = 0, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (sst28sf040.c) */ .block_erasers = { @@ -14149,7 +14149,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PR, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -14173,7 +14173,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -14197,7 +14197,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -14221,7 +14221,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -14245,7 +14245,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14272,7 +14272,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14299,7 +14299,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14326,7 +14326,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14353,7 +14353,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14380,7 +14380,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14407,7 +14407,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14434,7 +14434,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14464,7 +14464,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14491,7 +14491,7 @@ .page_size = 16 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14523,7 +14523,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14558,7 +14558,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14590,7 +14590,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -14624,7 +14624,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14656,7 +14656,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -14690,7 +14690,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -14724,7 +14724,7 @@ .page_size = 16 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14754,7 +14754,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PRE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14784,7 +14784,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150 ns */ .block_erasers = { @@ -14814,7 +14814,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET | FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 1, /* 150ns */ .block_erasers = { @@ -14845,7 +14845,7 @@ .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_FIXME, .block_erasers = { @@ -14875,7 +14875,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PR, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -14909,7 +14909,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -14941,7 +14941,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -14973,7 +14973,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* datasheet specifies no timing */ .block_erasers = { @@ -15001,7 +15001,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, // FIXME: check datasheet. Using the 10 us from probe_m29f400bt .block_erasers = { @@ -15034,7 +15034,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, // FIXME: check datasheet. Using the 10 us from probe_m29f400bt .block_erasers = { @@ -15066,7 +15066,7 @@ .page_size = 16 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -15093,7 +15093,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -15120,7 +15120,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15144,7 +15144,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_FIXME, .block_erasers = { @@ -15177,7 +15177,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_FIXME, .block_erasers = { @@ -15210,7 +15210,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PR, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_FIXME, .block_erasers = { @@ -15244,7 +15244,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_FIXME, .block_erasers = { @@ -15278,7 +15278,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PR, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (82802ab.c) */ .block_erasers = { @@ -15312,7 +15312,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (82802ab.c) */ .block_erasers = { @@ -15337,7 +15337,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PR, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (82802ab.c) */ .block_erasers = { @@ -15362,7 +15362,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PR, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (82802ab.c) */ .block_erasers = { @@ -15387,7 +15387,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -15412,7 +15412,7 @@ .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -15444,7 +15444,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_NO_ERASE | FEATURE_ERASED_ZERO, .tested = TEST_OK_PREW, - .probe = probe_spi_st95, + .probe = PROBE_SPI_ST95, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15471,7 +15471,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15505,7 +15505,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15536,7 +15536,7 @@ .total_size = 256, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15574,7 +15574,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15606,7 +15606,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15644,7 +15644,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15675,7 +15675,7 @@ .total_size = 256, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15706,7 +15706,7 @@ .total_size = 512, .page_size = 256, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15738,7 +15738,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15770,7 +15770,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15802,7 +15802,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15837,7 +15837,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_res2, + .probe = PROBE_SPI_RES2, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15868,7 +15868,7 @@ .total_size = 1024, .page_size = 64 * 1024, .tested = TEST_OK_PREW, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15899,7 +15899,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET | FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_82802ab, + .probe = PROBE_AT82802AB, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15932,7 +15932,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15961,7 +15961,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PRE, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -15990,7 +15990,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16019,7 +16019,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16048,7 +16048,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16078,7 +16078,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 (S25FL116K only) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16115,7 +16115,7 @@ /* OTP: 1024B total, 32B reserved; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16150,7 +16150,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, /* FIXME: we should distinguish the configuration on probing time like we do for AT45DB chips */ - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16193,7 +16193,7 @@ /* 4 x 256B Security Region (OTP) */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_WRSR_EXT3 | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16249,7 +16249,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16284,7 +16284,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16315,7 +16315,7 @@ /* OTP: 1024B total, 32B reserved; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16358,7 +16358,7 @@ /* OTP: 1024B total, 32B reserved; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16390,7 +16390,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_big_spansion, + .probe = PROBE_SPI_BIG_SPANSION, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16421,7 +16421,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_big_spansion, + .probe = PROBE_SPI_BIG_SPANSION, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16453,7 +16453,7 @@ /* OTP: 506B total, 16B reserved; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16502,7 +16502,7 @@ /* OTP: 506B total, 16B reserved; read 0x4B; write 0x42 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16535,7 +16535,7 @@ /* OTP: 768B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16571,7 +16571,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16606,7 +16606,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PR, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16641,7 +16641,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16678,7 +16678,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_WRSR_EXT3 | FEATURE_OTP | FEATURE_4BA_ENTER | FEATURE_4BA_NATIVE, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16742,7 +16742,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_big_spansion, + .probe = PROBE_SPI_BIG_SPANSION, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16770,7 +16770,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_big_spansion, + .probe = PROBE_SPI_BIG_SPANSION, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16800,7 +16800,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_NATIVE | FEATURE_4BA_ENTER_EAR7 | FEATURE_4BA_EAR_1716, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16846,7 +16846,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_NATIVE | FEATURE_4BA_ENTER_EAR7 | FEATURE_4BA_EAR_1716, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16881,7 +16881,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_big_spansion, + .probe = PROBE_SPI_BIG_SPANSION, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16912,7 +16912,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_big_spansion, + .probe = PROBE_SPI_BIG_SPANSION, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -16943,7 +16943,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -16970,7 +16970,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -16997,7 +16997,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -17023,7 +17023,7 @@ .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -17049,7 +17049,7 @@ .page_size = 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17076,7 +17076,7 @@ .page_size = 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17103,7 +17103,7 @@ .page_size = 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -17130,7 +17130,7 @@ .page_size = 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -17157,7 +17157,7 @@ .page_size = 16384, /* Non-uniform sectors */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -17189,7 +17189,7 @@ .page_size = 16384, /* Non-uniform sectors */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = { @@ -17221,7 +17221,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17250,7 +17250,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17279,7 +17279,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17311,7 +17311,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR_EXT2 | FEATURE_WRSR2 | FEATURE_WRSR3, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17360,7 +17360,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_WRSR2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17410,7 +17410,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_WRSR2, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17458,7 +17458,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_WRSR2, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17508,7 +17508,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17548,7 +17548,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17587,7 +17587,7 @@ /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17629,7 +17629,7 @@ FEATURE_4BA_EAR_C5C8 | FEATURE_4BA_READ | FEATURE_4BA_FAST_READ | FEATURE_WRSR2, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17678,7 +17678,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA | FEATURE_WRSR2, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17733,7 +17733,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA | FEATURE_WRSR2, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17788,7 +17788,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17834,7 +17834,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17880,7 +17880,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17920,7 +17920,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17958,7 +17958,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -17998,7 +17998,7 @@ /* OTP: 756B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18037,7 +18037,7 @@ /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18076,7 +18076,7 @@ /* OTP: 3*256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18114,7 +18114,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18158,7 +18158,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18203,7 +18203,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18254,7 +18254,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR_EXT2 | FEATURE_WRSR2 | FEATURE_WRSR3, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18305,7 +18305,7 @@ /* QPI enable 0x38 */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18345,7 +18345,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_WRSR2, .tested = TEST_OK_PREWB, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18395,7 +18395,7 @@ /* QPI enable 0x38, disable 0xFF */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18435,7 +18435,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18474,7 +18474,7 @@ /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18513,7 +18513,7 @@ /* OTP: 3*256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18551,7 +18551,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18583,7 +18583,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18615,7 +18615,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18653,7 +18653,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18685,7 +18685,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18723,7 +18723,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18755,7 +18755,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18793,7 +18793,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18826,7 +18826,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, /* used datasheet for the W29C011A */ .block_erasers = { @@ -18849,7 +18849,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PREW, - .probe = probe_w29ee011, + .probe = PROBE_W29EE011, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (w29ee011.c) */ .block_erasers = { @@ -18872,7 +18872,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -18896,7 +18896,7 @@ .page_size = 256, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -18920,7 +18920,7 @@ .page_size = 128, .feature_bits = FEATURE_LONG_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -18944,7 +18944,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -18974,7 +18974,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19001,7 +19001,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19031,7 +19031,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19061,7 +19061,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19088,7 +19088,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19118,7 +19118,7 @@ .page_size = 128 * 1024, /* actual page size is 16 */ .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec_29gl, + .probe = PROBE_JEDEC_29GL, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19145,7 +19145,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19173,7 +19173,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19201,7 +19201,7 @@ .page_size = 4 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19232,7 +19232,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PR, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19263,7 +19263,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19291,7 +19291,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19319,7 +19319,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19347,7 +19347,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19379,7 +19379,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19408,7 +19408,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19436,7 +19436,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19464,7 +19464,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19493,7 +19493,7 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19521,7 +19521,7 @@ .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19553,7 +19553,7 @@ .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PROBE, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19577,7 +19577,7 @@ .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19609,7 +19609,7 @@ .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_jedec, + .probe = PROBE_JEDEC, .probe_timing = 10, .block_erasers = { @@ -19641,7 +19641,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19679,7 +19679,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19717,7 +19717,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_WRSR2, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19767,7 +19767,7 @@ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19809,7 +19809,7 @@ FEATURE_4BA_EAR_C5C8 | FEATURE_4BA_READ | FEATURE_4BA_FAST_READ | FEATURE_WRSR2, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19858,7 +19858,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_ENTER_WREN | FEATURE_4BA_EAR_C5C8 | FEATURE_4BA_READ | FEATURE_4BA_FAST_READ, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19896,7 +19896,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19934,7 +19934,7 @@ .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -19975,7 +19975,7 @@ /* want the default "This flash part has status UNTESTED..." */ /* text to be printed. */ .tested = TEST_OK_PREW, - .probe = probe_spi_sfdp, + .probe = PROBE_SPI_SFDP, .block_erasers = {}, /* set by probing function */ .unlock = spi_disable_blockprotect, /* is this safe? */ .write = NULL, /* set by probing function */ @@ -19994,7 +19994,7 @@ .page_size = 256, /* probe is assumed to work, rest will be filled in by probe */ .tested = TEST_OK_PROBE, - .probe = probe_opaque, + .probe = PROBE_OPAQUE, /* eraseblock sizes will be set by the probing function */ .block_erasers = { @@ -20015,7 +20015,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid4, + .probe = PROBE_SPI_RDID4, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20030,7 +20030,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20045,7 +20045,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20060,7 +20060,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20075,7 +20075,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20090,7 +20090,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20105,7 +20105,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20120,7 +20120,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20135,7 +20135,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .write = NULL, .read = NULL, @@ -20150,7 +20150,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .write = NULL, }, @@ -20163,7 +20163,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rems, + .probe = PROBE_SPI_REMS, .write = NULL, }, diff --git a/flashrom.c b/flashrom.c index 0f982c9..c8c7dd5 100644 --- a/flashrom.c +++ b/flashrom.c @@ -729,6 +729,38 @@ return 0; } +typedef int (probe_func_t)(struct flashctx *flash); + +static probe_func_t *lookup_probe_func_ptr(const struct flashchip *chip) +{ + switch (chip->probe) { + case PROBE_JEDEC: return &probe_jedec; + case PROBE_JEDEC_29GL: return &probe_jedec_29gl; + case PROBE_OPAQUE: return &probe_opaque; + case PROBE_EDI_KB9012: return &edi_probe_kb9012; + case PROBE_AT82802AB: return &probe_82802ab; + case PROBE_W29EE011: return &probe_w29ee011; + case PROBE_EN29LV640B: return &probe_en29lv640b; + case PROBE_SPI_AT25F: return &probe_spi_at25f; + case PROBE_SPI_AT45DB: return &probe_spi_at45db; + case PROBE_SPI_BIG_SPANSION: return &probe_spi_big_spansion; + case PROBE_SPI_RDID: return &probe_spi_rdid; + case PROBE_SPI_RDID4: return &probe_spi_rdid4; + case PROBE_SPI_REMS: return &probe_spi_rems; + case PROBE_SPI_RES1: return &probe_spi_res1; + case PROBE_SPI_RES2: return &probe_spi_res2; + case PROBE_SPI_SFDP: return &probe_spi_sfdp; + case PROBE_SPI_ST95: return &probe_spi_st95; + /* default: total function, 0 indicates no probe function set. + * We explicitly do not want a default catch-all case in the switch + * to ensure unhandled enum's are compiler warnings. + */ + case NO_PROBE_FUNC: return NULL; + }; + + return NULL; +} + int probe_flash(struct registered_master *mst, int startchip, struct flashctx *flash, int force) { const struct flashchip *chip; @@ -745,7 +777,8 @@ if (chip->bustype == BUS_SPI && !chip_to_probe && chip->spi_cmd_set != SPI25) continue; msg_gdbg("Probing for %s %s, %d kB: ", chip->vendor, chip->name, chip->total_size); - if (!chip->probe && !force) { + probe_func_t *probe_func = lookup_probe_func_ptr(chip); + if (!probe_func && !force) { msg_gdbg("failed! flashrom has no probe function for this flash chip.\n"); continue; } @@ -768,7 +801,7 @@ if (force) break; - if (flash->chip->probe(flash) != 1) + if (probe_func(flash) != 1) goto notfound; /* If this is the first chip found, accept it. diff --git a/include/flash.h b/include/flash.h index 32290e4..37f21ac 100644 --- a/include/flash.h +++ b/include/flash.h @@ -217,6 +217,27 @@ }; typedef void (decode_range_func_t)(size_t *start, size_t *len, const struct wp_bits *, size_t chip_len); +enum probe_func { + NO_PROBE_FUNC = 0, /* 0 indicates no probe function set. */ + PROBE_JEDEC = 1, + PROBE_JEDEC_29GL, + PROBE_OPAQUE, + PROBE_EDI_KB9012, + PROBE_AT82802AB, + PROBE_W29EE011, + PROBE_EN29LV640B, + PROBE_SPI_AT25F, + PROBE_SPI_AT45DB, + PROBE_SPI_BIG_SPANSION, + PROBE_SPI_RDID, + PROBE_SPI_RDID4, + PROBE_SPI_REMS, + PROBE_SPI_RES1, + PROBE_SPI_RES2, + PROBE_SPI_SFDP, + PROBE_SPI_ST95, +}; + struct flashchip { const char *vendor; const char *name; @@ -258,7 +279,7 @@ SPI_EDI = 1, } spi_cmd_set; - int (*probe) (struct flashctx *flash); + enum probe_func probe; /* Delay after "enter/exit ID mode" commands in microseconds. * NB: negative values have special meanings, see TIMING_* below. diff --git a/tests/spi25.c b/tests/spi25.c index f101910..5cd84fb 100644 --- a/tests/spi25.c +++ b/tests/spi25.c @@ -31,7 +31,7 @@ .total_size = 0, .page_size = 256, .tested = TEST_BAD_PREW, - .probe = probe_spi_rdid, + .probe = PROBE_SPI_RDID, .write = NULL, }; -- To view, visit https://review.coreboot.org/c/flashrom/+/66781 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I00aaab9c83f305cd47e78c36d9c2867f2b73c396 Gerrit-Change-Number: 66781 Gerrit-PatchSet: 16 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: merged

1 0