flashrom May 2014

flashrom@flashrom.org

46 participants
188 discussions

Re: [flashrom] Please help me with my new mainboard
by Stefan Tauner 28 May '14

28 May '14

On Wed, 28 May 2014 17:35:04 +0800 磊赵 <zhaolei.cpp(a)gmail.com> wrote: > I bought the new mainboard just yestoday and want to modify the BIOS logo. > The flashrom(latest) did not work. > AFUWIN.exe (4.88) did not work neither. > > Help me! Hi, your flash chip is supported by flashrom since r1598. The latest stable version (0.9.7) should work if there are no other problems. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Please help me with my new mainboard
by 磊赵 28 May '14

28 May '14

I bought the new mainboard just yestoday and want to modify the BIOS logo. The flashrom(latest) did not work. AFUWIN.exe (4.88) did not work neither. Help me!

1 0

[PATCH] CID1129998/1129999: Unchecked return value from library
by Stefan Reinauer 28 May '14

28 May '14

CID1129998/1129999: Unchecked return value from library The function returns a value that indicates an error condition. If this is not checked, the error condition may not be handled correctly. In serialport_write_nonblock: Value returned from a library function is not checked for errors before being used. This value may indicate an error condition. In serialport_config: Value returned from a library function is not checked for errors before being used. This value may indicate an error condition. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Index: serial.c =================================================================== --- serial.c (revision 1763) +++ serial.c (working copy) @@ -181,7 +181,10 @@ msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); #else struct termios wanted, observed; - fcntl(fd, F_SETFL, 0); + if (fcntl(fd, F_SETFL, 0) != 0) { + msg_perr_strerror("Could not set serial port mode: "); + return 1; + } if (tcgetattr(fd, &observed) != 0) { msg_perr_strerror("Could not fetch original serial port configuration: "); return 1; @@ -419,14 +422,21 @@ return -1; } if(!SetCommTimeouts(sp_fd, &newTimeout)) { + msg_perr_strerror("Could not set serial port timeout settings: "); + return -1; + } #else ssize_t rv; const int flags = fcntl(sp_fd, F_GETFL); + if (flags == -1) { + msg_perr_strerror("Could not get serial port mode: "); + return -1; + } if (fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK) != 0) { -#endif - msg_perr_strerror("Could not set serial port timeout settings %s"); + msg_perr_strerror("Could not set serial port mode to non-blocking: "); return -1; } +#endif int i; int rd_bytes = 0; @@ -458,12 +468,15 @@ /* restore original blocking behavior */ #ifdef _WIN32 if (!SetCommTimeouts(sp_fd, &oldTimeout)) { + msg_perr_strerror("Could not set serial port timeout settings: "); + ret = -1; + } #else if (fcntl(sp_fd, F_SETFL, flags) != 0) { -#endif - msg_perr_strerror("Could not restore serial port timeout settings: %s\n"); + msg_perr_strerror("Could not set serial port mode to non-blocking: "); ret = -1; } +#endif return ret; } @@ -495,7 +508,14 @@ #else ssize_t rv; const int flags = fcntl(sp_fd, F_GETFL); - fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK); + if (flags == -1) { + msg_perr_strerror("Could not get serial port mode: "); + return -1; + } + if (fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK) != 0) { + msg_perr_strerror("Could not set serial port mode to non-blocking: "); + return -1; + } #endif int i; @@ -531,10 +551,13 @@ #ifdef _WIN32 if (!SetCommTimeouts(sp_fd, &oldTimeout)) { msg_perr_strerror("Could not restore serial port timeout settings: "); + return -1; + } #else if (fcntl(sp_fd, F_SETFL, flags) != 0) { -#endif + msg_perr_strerror("Could not reset serial port mode: "); return -1; } +#endif return ret; }

2 2

[commit] r1803 - trunk
by repository service 28 May '14

28 May '14

Author: stefanct Date: Wed May 28 00:10:15 2014 New Revision: 1803 URL: http://flashrom.org/trac/flashrom/changeset/1803 Log: CID1129998/1129999: Unchecked return value from library. Check return values of various fcntl() invocations in serialport_config(), serialport_read_nonblock() and serialport_write_nonblock(). Also, remove some superfluous print conversion specifiers and refine messages. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/serial.c Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Tue May 27 23:27:27 2014 (r1802) +++ trunk/serial.c Wed May 28 00:10:15 2014 (r1803) @@ -181,7 +181,10 @@ msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); #else struct termios wanted, observed; - fcntl(fd, F_SETFL, 0); + if (fcntl(fd, F_SETFL, 0) != 0) { + msg_perr_strerror("Could not clear serial port mode: "); + return 1; + } if (tcgetattr(fd, &observed) != 0) { msg_perr_strerror("Could not fetch original serial port configuration: "); return 1; @@ -419,14 +422,21 @@ return -1; } if(!SetCommTimeouts(sp_fd, &newTimeout)) { + msg_perr_strerror("Could not set serial port timeout settings: "); + return -1; + } #else ssize_t rv; const int flags = fcntl(sp_fd, F_GETFL); + if (flags == -1) { + msg_perr_strerror("Could not get serial port mode: "); + return -1; + } if (fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK) != 0) { -#endif - msg_perr_strerror("Could not set serial port timeout settings %s"); + msg_perr_strerror("Could not set serial port mode to non-blocking: "); return -1; } +#endif int i; int rd_bytes = 0; @@ -458,12 +468,15 @@ /* restore original blocking behavior */ #ifdef _WIN32 if (!SetCommTimeouts(sp_fd, &oldTimeout)) { + msg_perr_strerror("Could not restore serial port timeout settings: "); + ret = -1; + } #else if (fcntl(sp_fd, F_SETFL, flags) != 0) { -#endif - msg_perr_strerror("Could not restore serial port timeout settings: %s\n"); + msg_perr_strerror("Could not restore serial port mode to blocking: "); ret = -1; } +#endif return ret; } @@ -495,7 +508,14 @@ #else ssize_t rv; const int flags = fcntl(sp_fd, F_GETFL); - fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK); + if (flags == -1) { + msg_perr_strerror("Could not get serial port mode: "); + return -1; + } + if (fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK) != 0) { + msg_perr_strerror("Could not set serial port mode to non-blocking: "); + return -1; + } #endif int i; @@ -531,10 +551,13 @@ #ifdef _WIN32 if (!SetCommTimeouts(sp_fd, &oldTimeout)) { msg_perr_strerror("Could not restore serial port timeout settings: "); + return -1; + } #else if (fcntl(sp_fd, F_SETFL, flags) != 0) { -#endif + msg_perr_strerror("Could not restore serial port blocking behavior: "); return -1; } +#endif return ret; }

1 0

[commit] r1802 - trunk
by repository service 27 May '14

27 May '14

Author: stefanct Date: Tue May 27 23:27:27 2014 New Revision: 1802 URL: http://flashrom.org/trac/flashrom/changeset/1802 Log: Rename some spi_prettyprint_status_register_* functions. spi_prettyprint_status_register_default_bpX -> spi_prettyprint_status_register_bpX_srwd Why was the default in there anyway? :) Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/chipdrivers.h trunk/flashchips.c trunk/spi25_statusreg.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue May 27 23:27:14 2014 (r1801) +++ trunk/chipdrivers.h Tue May 27 23:27:27 2014 (r1802) @@ -67,10 +67,10 @@ void spi_prettyprint_status_register_bit(uint8_t status, int bit); int spi_prettyprint_status_register_plain(struct flashctx *flash); int spi_prettyprint_status_register_default_welwip(struct flashctx *flash); -int spi_prettyprint_status_register_default_bp1(struct flashctx *flash); -int spi_prettyprint_status_register_default_bp2(struct flashctx *flash); -int spi_prettyprint_status_register_default_bp3(struct flashctx *flash); -int spi_prettyprint_status_register_default_bp4(struct flashctx *flash); +int spi_prettyprint_status_register_bp1_srwd(struct flashctx *flash); +int spi_prettyprint_status_register_bp2_srwd(struct flashctx *flash); +int spi_prettyprint_status_register_bp3_srwd(struct flashctx *flash); +int spi_prettyprint_status_register_bp4_srwd(struct flashctx *flash); int spi_prettyprint_status_register_bp2_bpl(struct flashctx *flash); int spi_disable_blockprotect(struct flashctx *flash); int spi_disable_blockprotect_bp2_srwd(struct flashctx *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Tue May 27 23:27:14 2014 (r1801) +++ trunk/flashchips.c Tue May 27 23:27:27 2014 (r1802) @@ -564,7 +564,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -598,7 +598,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -633,7 +633,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -668,7 +668,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -703,7 +703,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -738,7 +738,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -778,7 +778,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -813,7 +813,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -848,7 +848,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -886,7 +886,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -924,7 +924,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -956,7 +956,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -988,7 +988,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1020,7 +1020,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1052,7 +1052,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1084,7 +1084,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1116,7 +1116,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1275,7 +1275,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enhance (sic!) */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enhance (sic!) */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4249,7 +4249,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4287,7 +4287,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4324,7 +4324,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4361,7 +4361,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4396,7 +4396,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4431,7 +4431,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4466,7 +4466,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4501,7 +4501,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -4966,7 +4966,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, @@ -5000,7 +5000,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5037,7 +5037,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5075,7 +5075,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5113,7 +5113,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5152,7 +5152,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5191,7 +5191,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5230,7 +5230,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5269,7 +5269,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5308,7 +5308,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp4, + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -5990,7 +5990,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L512E supports dual I/O */ @@ -6026,7 +6026,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L1006E supports dual I/O */ @@ -6064,7 +6064,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -6102,7 +6102,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -6140,7 +6140,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -6175,7 +6175,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp2, /* bit6: error flag */ + .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -6214,7 +6214,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp3, /* MX25L1605A bp2 only */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* MX25L1605A bp2 only */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -6249,7 +6249,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6: Continously Program (CP) mode */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: Continously Program (CP) mode */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ @@ -6285,7 +6285,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -6321,7 +6321,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -6356,7 +6356,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp2, /* bit6: error flag */ + .printlock = spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -6392,7 +6392,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6: CP mode */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6: CP mode */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ @@ -6431,7 +6431,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ @@ -6470,7 +6470,7 @@ .block_erase = spi_block_erase_c7, }, }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ @@ -6506,7 +6506,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -6542,7 +6542,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 has different meanings */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 has different meanings */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -6578,7 +6578,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 for 36E is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 for 36E is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -6618,7 +6618,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -6654,7 +6654,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* MX25L12805D: Fast read (0x0B) supported */ @@ -6695,7 +6695,7 @@ } }, /* TODO: security register */ - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -6737,7 +6737,7 @@ } }, /* TODO: security register */ - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -6779,7 +6779,7 @@ } }, /* TODO: security register */ - .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -6992,7 +6992,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7026,7 +7026,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_1, /* 128 */ .read = spi_chip_read, @@ -7055,7 +7055,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7085,7 +7085,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_1, /* 128 */ .read = spi_chip_read, @@ -7114,7 +7114,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -7143,7 +7143,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -7172,7 +7172,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7201,7 +7201,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7229,7 +7229,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7258,7 +7258,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7287,7 +7287,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7316,7 +7316,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7345,7 +7345,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* TODO: check */ .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -7537,7 +7537,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, /* bit5: T/B */ + .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, .read = spi_chip_read, @@ -7570,7 +7570,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, /* bit5: T/B */ + .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, .read = spi_chip_read, @@ -7603,7 +7603,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, /* bit5: T/B */ + .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, .read = spi_chip_read, @@ -7636,7 +7636,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, /* bit5: T/B */ + .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, .read = spi_chip_read, @@ -8240,7 +8240,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ @@ -8281,7 +8281,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ @@ -8322,7 +8322,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ @@ -8360,7 +8360,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ @@ -8395,7 +8395,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O read (0x3B) supported */ @@ -8433,7 +8433,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ @@ -8470,7 +8470,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ @@ -8508,7 +8508,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ @@ -8546,7 +8546,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* FIXME: C version supports "Safe Guard" */ .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ @@ -8584,7 +8584,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ @@ -8616,7 +8616,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8648,7 +8648,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8680,7 +8680,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp1, + .printlock = spi_prettyprint_status_register_bp1_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8712,7 +8712,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, @@ -8744,7 +8744,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8782,7 +8782,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -8820,7 +8820,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) supported */ @@ -9128,7 +9128,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = spi_chip_write_256, .read = spi_chip_read, @@ -9220,7 +9220,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = spi_chip_write_256, .read = spi_chip_read, /* some quad-read supported ("HD_READ mode") */ @@ -9254,7 +9254,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = spi_chip_write_256, .read = spi_chip_read, @@ -9285,7 +9285,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, + .printlock = spi_prettyprint_status_register_bp2_srwd, .unlock = spi_disable_blockprotect, /* #WP pin write-protects SRWP bit. */ .write = spi_chip_write_256, .read = spi_chip_read, /* some quad-read supported ("HD_READ mode") */ @@ -9527,7 +9527,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ @@ -9561,7 +9561,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ @@ -9596,7 +9596,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp3, + .printlock = spi_prettyprint_status_register_bp3_srwd, .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B), dual I/O (0x3B) supported */ @@ -9631,7 +9631,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, /* TODO: improve */ + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ @@ -9666,7 +9666,7 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_default_bp2, /* TODO: improve */ + .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, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ Modified: trunk/spi25_statusreg.c ============================================================================== --- trunk/spi25_statusreg.c Tue May 27 23:27:14 2014 (r1801) +++ trunk/spi25_statusreg.c Tue May 27 23:27:27 2014 (r1802) @@ -296,7 +296,7 @@ * AMIC A25L series * and MX MX25L512 */ -int spi_prettyprint_status_register_default_bp1(struct flashctx *flash) +int spi_prettyprint_status_register_bp1_srwd(struct flashctx *flash) { uint8_t status = spi_read_status_register(flash); spi_prettyprint_status_register_hex(status); @@ -314,7 +314,7 @@ * AMIC A25L series * PMC Pm25LD series */ -int spi_prettyprint_status_register_default_bp2(struct flashctx *flash) +int spi_prettyprint_status_register_bp2_srwd(struct flashctx *flash) { uint8_t status = spi_read_status_register(flash); spi_prettyprint_status_register_hex(status); @@ -331,7 +331,7 @@ * ST M25P series * MX MX25L series */ -int spi_prettyprint_status_register_default_bp3(struct flashctx *flash) +int spi_prettyprint_status_register_bp3_srwd(struct flashctx *flash) { uint8_t status = spi_read_status_register(flash); spi_prettyprint_status_register_hex(status); @@ -343,7 +343,7 @@ return 0; } -int spi_prettyprint_status_register_default_bp4(struct flashctx *flash) +int spi_prettyprint_status_register_bp4_srwd(struct flashctx *flash) { uint8_t status = spi_read_status_register(flash); spi_prettyprint_status_register_hex(status); @@ -369,8 +369,8 @@ /* === Amic === * FIXME: spi_disable_blockprotect is incorrect but works fine for chips using - * spi_prettyprint_status_register_default_bp1 or - * spi_prettyprint_status_register_default_bp2. + * spi_prettyprint_status_register_bp1_srwd or + * spi_prettyprint_status_register_bp2_srwd. * FIXME: spi_disable_blockprotect is incorrect and will fail for chips using * spi_prettyprint_status_register_amic_a25l032 if those have locks controlled * by the second status register.

1 0

[commit] r1801 - trunk
by repository service 27 May '14

27 May '14

Author: stefanct Date: Tue May 27 23:27:14 2014 New Revision: 1801 URL: http://flashrom.org/trac/flashrom/changeset/1801 Log: Add support for ESMT F25L32PA. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/chipdrivers.h trunk/flashchips.c trunk/flashchips.h trunk/spi25_statusreg.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue May 27 02:06:14 2014 (r1800) +++ trunk/chipdrivers.h Tue May 27 23:27:14 2014 (r1801) @@ -71,6 +71,7 @@ int spi_prettyprint_status_register_default_bp2(struct flashctx *flash); int spi_prettyprint_status_register_default_bp3(struct flashctx *flash); int spi_prettyprint_status_register_default_bp4(struct flashctx *flash); +int spi_prettyprint_status_register_bp2_bpl(struct flashctx *flash); int spi_disable_blockprotect(struct flashctx *flash); int spi_disable_blockprotect_bp2_srwd(struct flashctx *flash); int spi_disable_blockprotect_bp3_srwd(struct flashctx *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Tue May 27 02:06:14 2014 (r1800) +++ trunk/flashchips.c Tue May 27 23:27:14 2014 (r1801) @@ -3118,6 +3118,41 @@ }, { + .vendor = "ESMT", + .name = "F25L32PA", + .bustype = BUS_SPI, + .manufacture_id = ESMT_ID, + .model_id = ESMT_F25L32PA, + .total_size = 4096, + .page_size = 256, + .feature_bits = FEATURE_WRSR_EITHER | FEATURE_OTP, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 1024} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {64 * 1024, 64} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {4 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {4 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp2_bpl, + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + + { .vendor = "Eon", .name = "EN25B05", .bustype = BUS_SPI, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Tue May 27 02:06:14 2014 (r1800) +++ trunk/flashchips.h Tue May 27 23:27:14 2014 (r1801) @@ -208,6 +208,7 @@ #define ESMT_ID 0x8C /* Elite Semiconductor Memory Technology (ESMT) / EFST Elite Flash Storage */ #define ESMT_F25L008A 0x2014 +#define ESMT_F25L32PA 0x2016 #define ESMT_F25D08QA 0x2534 #define ESMT_F25L16QA2S 0x4015 #define ESMT_F25L32QA 0x4016 Modified: trunk/spi25_statusreg.c ============================================================================== --- trunk/spi25_statusreg.c Tue May 27 02:06:14 2014 (r1800) +++ trunk/spi25_statusreg.c Tue May 27 23:27:14 2014 (r1801) @@ -354,6 +354,19 @@ return 0; } +int spi_prettyprint_status_register_bp2_bpl(struct flashctx *flash) +{ + uint8_t status = spi_read_status_register(flash); + spi_prettyprint_status_register_hex(status); + + spi_prettyprint_status_register_bpl(status); + spi_prettyprint_status_register_bit(status, 6); + spi_prettyprint_status_register_bit(status, 5); + spi_prettyprint_status_register_bp(status, 2); + spi_prettyprint_status_register_welwip(status); + return 0; +} + /* === Amic === * FIXME: spi_disable_blockprotect is incorrect but works fine for chips using * spi_prettyprint_status_register_default_bp1 or

1 0

[commit] r1800 - trunk
by repository service 27 May '14

27 May '14

Author: stefanct Date: Tue May 27 02:06:14 2014 New Revision: 1800 URL: http://flashrom.org/trac/flashrom/changeset/1800 Log: Fix various tiny problems in verify_range(). First of all, fix CID1130010: Resource leak as reported by Stefan Reinauer. Alternatively to Stefan's approach, just move the malloc() out of the scope. Additionally, get rid of an unnecessary exit(1) and correctly return -1 in all error cases as documented. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Tue May 27 00:05:31 2014 (r1799) +++ trunk/flashrom.c Tue May 27 02:06:14 2014 (r1800) @@ -672,20 +672,20 @@ */ int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len) { - uint8_t *readbuf = malloc(len); - int ret = 0; - if (!len) - goto out_free; + return -1; if (!flash->chip->read) { msg_cerr("ERROR: flashrom has no read function for this flash chip.\n"); - return 1; + return -1; } + + uint8_t *readbuf = malloc(len); if (!readbuf) { msg_gerr("Could not allocate memory!\n"); - exit(1); + return -1; } + int ret = 0; if (start + len > flash->chip->total_size * 1024) { msg_gerr("Error: %s called with start 0x%x + len 0x%x >" @@ -699,7 +699,8 @@ if (ret) { msg_gerr("Verification impossible because read failed " "at 0x%x (len 0x%x)\n", start, len); - return ret; + ret = -1; + goto out_free; } ret = compare_range(cmpbuf, readbuf, start, len);

1 0

[PATCH] CID1130010: Resource leak
by Stefan Reinauer 27 May '14

27 May '14

CID1130010: Resource leak The system resource will not be reclaimed and reused, reducing the future availability of the resource. In verify_range: Leak of memory or pointers to system resources Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Index: flashrom.c =================================================================== --- flashrom.c (revision 1763) +++ flashrom.c (working copy) @@ -676,7 +676,8 @@ if (!flash->chip->read) { msg_cerr("ERROR: flashrom has no read function for this flash chip.\n"); - return 1; + ret = -1; + goto out_free; } if (!readbuf) { msg_gerr("Could not allocate memory!\n");

2 2

[commit] r1799 - trunk
by repository service 27 May '14

27 May '14

Author: stefanct Date: Tue May 27 00:05:31 2014 New Revision: 1799 URL: http://flashrom.org/trac/flashrom/changeset/1799 Log: Fix selfcheck of various arrays. Stefan Reinauer has reported ridiculous NULL checks for arrays in our self_check function found by Coverity (CID1130005). This patch removes the useless checks but keeps and fixes the one responsible for the flashchips array by exporting the array size in a new constant. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flash.h trunk/flashchips.c trunk/flashrom.c Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Mon May 26 02:36:24 2014 (r1798) +++ trunk/flash.h Tue May 27 00:05:31 2014 (r1799) @@ -225,6 +225,7 @@ #define TIMING_ZERO -2 extern const struct flashchip flashchips[]; +extern const unsigned int flashchips_size; void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Mon May 26 02:36:24 2014 (r1798) +++ trunk/flashchips.c Tue May 27 00:05:31 2014 (r1799) @@ -13424,5 +13424,7 @@ .write = NULL, }, - { NULL } + {0} }; + +const unsigned int flashchips_size = ARRAY_SIZE(flashchips); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Mon May 26 02:36:24 2014 (r1798) +++ trunk/flashrom.c Tue May 27 00:05:31 2014 (r1799) @@ -1269,10 +1269,7 @@ return ret; } -/* This function shares a lot of its structure with erase_and_write_flash() and - * walk_eraseregions(). - * Even if an error is found, the function will keep going and check the rest. - */ +/* Even if an error is found, the function will keep going and check the rest. */ static int selfcheck_eraseblocks(const struct flashchip *chip) { int i, j, k; @@ -1694,8 +1691,7 @@ int selfcheck(void) { - const struct flashchip *chip; - int i; + unsigned int i; int ret = 0; /* Safety check. Instead of aborting after the first error, check @@ -1748,37 +1744,32 @@ ret = 1; } } - /* It would be favorable if we could also check for correct termination - * of the following arrays, but we don't know their sizes in here... - * For 'flashchips' we check the first element to be non-null. In the - * other cases there exist use cases where the first element can be - * null. */ - if (flashchips == NULL || flashchips[0].vendor == NULL) { + + /* It would be favorable if we could check for the correct layout (especially termination) of various + * constant arrays: flashchips, chipset_enables, board_matches, boards_known, laptops_known. + * They are all defined as externs in this compilation unit so we don't know their sizes which vary + * depending on compiler flags, e.g. the target architecture, and can sometimes be 0. + * For 'flashchips' we export the size explicitly to work around this and to be able to implement the + * checks below. */ + if (flashchips_size <= 1 || flashchips[flashchips_size-1].name != NULL) { msg_gerr("Flashchips table miscompilation!\n"); ret = 1; + } else { + for (i = 0; i < flashchips_size - 1; i++) { + const struct flashchip *chip = &flashchips[i]; + if (chip->vendor == NULL || chip->name == NULL || chip->bustype == BUS_NONE) { + ret = 1; + msg_gerr("ERROR: Some field of flash chip #%d (%s) is misconfigured.\n" + "Please report a bug at flashrom(a)flashrom.org\n", i, + chip->name == NULL ? "unnamed" : chip->name); + } + if (selfcheck_eraseblocks(chip)) { + ret = 1; + } + } } - for (chip = flashchips; chip && chip->name; chip++) - if (selfcheck_eraseblocks(chip)) - ret = 1; -#if CONFIG_INTERNAL == 1 - if (chipset_enables == NULL) { - msg_gerr("Chipset enables table does not exist!\n"); - ret = 1; - } - if (board_matches == NULL) { - msg_gerr("Board enables table does not exist!\n"); - ret = 1; - } - if (boards_known == NULL) { - msg_gerr("Known boards table does not exist!\n"); - ret = 1; - } - if (laptops_known == NULL) { - msg_gerr("Known laptops table does not exist!\n"); - ret = 1; - } -#endif + /* TODO: implement similar sanity checks for other arrays where deemed necessary. */ return ret; }

1 0

[commit] r1798 - trunk
by repository service 26 May '14

26 May '14

Author: stefanct Date: Mon May 26 02:36:24 2014 New Revision: 1798 URL: http://flashrom.org/trac/flashrom/changeset/1798 Log: Add two new states to enum test_state and use it for flashchips. The new enum test_state looks like this: enum test_state { OK = 0, NT = 1, /* Not tested */ BAD, /* Known to not work */ DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ NA, /* Not applicable (e.g. write support on ROM chips) */ }; The second new state 'NA' is introduced, among other things, to indicate the erase and write states of real ROMs correctly. This is also implemented by this patch and required to exchange the previous bit mask in struct flashchip with a new struct containing an enum test_state for each operation. The -L output is changed accordingly to print '-' in the case of an N/A state and the wiki output uses a new template producing a greyed out cell. Previous users of enum test_state are not affected by this change (yet). Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flash.h trunk/flashchips.c trunk/flashrom.c trunk/print.c trunk/print_wiki.c Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun May 25 09:47:47 2014 (r1797) +++ trunk/flash.h Mon May 26 02:36:24 2014 (r1798) @@ -120,6 +120,26 @@ #define FEATURE_OTP (1 << 8) #define FEATURE_QPI (1 << 9) +enum test_state { + OK = 0, + NT = 1, /* Not tested */ + BAD, /* Known to not work */ + DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ + NA, /* Not applicable (e.g. write support on ROM chips) */ +}; + +#define TEST_UNTESTED (struct tested){ .probe = NT, .read = NT, .erase = NT, .write = NT } + +#define TEST_OK_PROBE (struct tested){ .probe = OK, .read = NT, .erase = NT, .write = NT } +#define TEST_OK_PR (struct tested){ .probe = OK, .read = OK, .erase = NT, .write = NT } +#define TEST_OK_PRE (struct tested){ .probe = OK, .read = OK, .erase = OK, .write = NT } +#define TEST_OK_PREW (struct tested){ .probe = OK, .read = OK, .erase = OK, .write = OK } + +#define TEST_BAD_PROBE (struct tested){ .probe = BAD, .read = NT, .erase = NT, .write = NT } +#define TEST_BAD_PR (struct tested){ .probe = BAD, .read = BAD, .erase = NT, .write = NT } +#define TEST_BAD_PRE (struct tested){ .probe = BAD, .read = BAD, .erase = BAD, .write = NT } +#define TEST_BAD_PREW (struct tested){ .probe = BAD, .read = BAD, .erase = BAD, .write = BAD } + struct flashctx; typedef int (erasefunc_t)(struct flashctx *flash, unsigned int addr, unsigned int blocklen); @@ -143,11 +163,13 @@ unsigned int page_size; int feature_bits; - /* - * Indicate if flashrom has been tested with this flash chip and if - * everything worked correctly. - */ - uint32_t tested; + /* Indicate how well flashrom supports different operations of this flash chip. */ + struct tested { + enum test_state probe; + enum test_state read; + enum test_state erase; + enum test_state write; + } tested; int (*probe) (struct flashctx *flash); @@ -192,27 +214,6 @@ struct registered_programmer *pgm; }; -#define TEST_UNTESTED 0 - -#define TEST_OK_PROBE (1 << 0) -#define TEST_OK_READ (1 << 1) -#define TEST_OK_ERASE (1 << 2) -#define TEST_OK_WRITE (1 << 3) -#define TEST_OK_PR (TEST_OK_PROBE | TEST_OK_READ) -#define TEST_OK_PRE (TEST_OK_PROBE | TEST_OK_READ | TEST_OK_ERASE) -#define TEST_OK_PRW (TEST_OK_PROBE | TEST_OK_READ | TEST_OK_WRITE) -#define TEST_OK_PREW (TEST_OK_PROBE | TEST_OK_READ | TEST_OK_ERASE | TEST_OK_WRITE) -#define TEST_OK_MASK 0x0f - -#define TEST_BAD_PROBE (1 << 4) -#define TEST_BAD_READ (1 << 5) -#define TEST_BAD_ERASE (1 << 6) -#define TEST_BAD_WRITE (1 << 7) -#define TEST_BAD_EW (TEST_BAD_ERASE | TEST_BAD_WRITE) -#define TEST_BAD_REW (TEST_BAD_READ | TEST_BAD_ERASE | TEST_BAD_WRITE) -#define TEST_BAD_PREW (TEST_BAD_PROBE | TEST_BAD_READ | TEST_BAD_ERASE | TEST_BAD_WRITE) -#define TEST_BAD_MASK 0xf0 - /* Timing used in probe routines. ZERO is -2 to differentiate between an unset * field and zero delay. * @@ -265,12 +266,6 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename); -enum test_state { - OK = 0, - NT = 1, /* Not tested */ - BAD -}; - /* Something happened that shouldn't happen, but we can go on. */ #define ERROR_NONFATAL 0x100 Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun May 25 09:47:47 2014 (r1797) +++ trunk/flashchips.c Mon May 26 02:36:24 2014 (r1798) @@ -2189,7 +2189,7 @@ .model_id = ATMEL_AT26F004, .total_size = 512, .page_size = 256, - .tested = TEST_BAD_WRITE, + .tested = {.probe = NT, .read = NT, .erase = NT, .write = BAD }, .feature_bits = FEATURE_WRSR_WREN, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, @@ -5915,7 +5915,7 @@ .model_id = MACRONIX_MX23L3254, .total_size = 4096, .page_size = 256, - .tested = TEST_OK_PR | TEST_BAD_EW, + .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 */ Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun May 25 09:47:47 2014 (r1797) +++ trunk/flashrom.c Mon May 26 02:36:24 2014 (r1798) @@ -1791,32 +1791,43 @@ "clone the contents of this chip (see man page for " "details).\n"); } - if (TEST_OK_MASK != (chip->tested & TEST_OK_MASK)) { + + if ((chip->tested.erase == NA) && (chip->tested.write == NA)) { + msg_cdbg("This chip's main memory can not be erased/written by design.\n"); + } + + if ((chip->tested.probe == BAD) || (chip->tested.probe == NT) || + (chip->tested.read == BAD) || (chip->tested.read == NT) || + (chip->tested.erase == BAD) || (chip->tested.erase == NT) || + (chip->tested.write == BAD) || (chip->tested.write == NT)){ msg_cinfo("===\n"); - if (chip->tested & TEST_BAD_MASK) { + if ((chip->tested.probe == BAD) || + (chip->tested.read == BAD) || + (chip->tested.erase == BAD) || + (chip->tested.write == BAD)) { msg_cinfo("This flash part has status NOT WORKING for operations:"); - if (chip->tested & TEST_BAD_PROBE) + if (chip->tested.probe == BAD) msg_cinfo(" PROBE"); - if (chip->tested & TEST_BAD_READ) + if (chip->tested.read == BAD) msg_cinfo(" READ"); - if (chip->tested & TEST_BAD_ERASE) + if (chip->tested.erase == BAD) msg_cinfo(" ERASE"); - if (chip->tested & TEST_BAD_WRITE) + if (chip->tested.write == BAD) msg_cinfo(" WRITE"); msg_cinfo("\n"); } - if ((!(chip->tested & TEST_BAD_PROBE) && !(chip->tested & TEST_OK_PROBE)) || - (!(chip->tested & TEST_BAD_READ) && !(chip->tested & TEST_OK_READ)) || - (!(chip->tested & TEST_BAD_ERASE) && !(chip->tested & TEST_OK_ERASE)) || - (!(chip->tested & TEST_BAD_WRITE) && !(chip->tested & TEST_OK_WRITE))) { + if ((chip->tested.probe == NT) || + (chip->tested.read == NT) || + (chip->tested.erase == NT) || + (chip->tested.write == NT)) { msg_cinfo("This flash part has status UNTESTED for operations:"); - if (!(chip->tested & TEST_BAD_PROBE) && !(chip->tested & TEST_OK_PROBE)) + if (chip->tested.probe == NT) msg_cinfo(" PROBE"); - if (!(chip->tested & TEST_BAD_READ) && !(chip->tested & TEST_OK_READ)) + if (chip->tested.read == NT) msg_cinfo(" READ"); - if (!(chip->tested & TEST_BAD_ERASE) && !(chip->tested & TEST_OK_ERASE)) + if (chip->tested.erase == NT) msg_cinfo(" ERASE"); - if (!(chip->tested & TEST_BAD_WRITE) && !(chip->tested & TEST_OK_WRITE)) + if (chip->tested.write == NT) msg_cinfo(" WRITE"); msg_cinfo("\n"); } @@ -1859,7 +1870,7 @@ if (read_it || erase_it || write_it || verify_it) { /* Everything needs read. */ - if (chip->tested & TEST_BAD_READ) { + if (chip->tested.read == BAD) { msg_cerr("Read is not working on this chip. "); if (!force) return 1; @@ -1873,7 +1884,11 @@ } if (erase_it || write_it) { /* Write needs erase. */ - if (chip->tested & TEST_BAD_ERASE) { + if (chip->tested.erase == NA) { + msg_cerr("Erase is not possible on this chip.\n"); + return 1; + } + if (chip->tested.erase == BAD) { msg_cerr("Erase is not working on this chip. "); if (!force) return 1; @@ -1886,7 +1901,11 @@ } } if (write_it) { - if (chip->tested & TEST_BAD_WRITE) { + if (chip->tested.write == NA) { + msg_cerr("Write is not possible on this chip.\n"); + return 1; + } + if (chip->tested.write == BAD) { msg_cerr("Write is not working on this chip. "); if (!force) return 1; Modified: trunk/print.c ============================================================================== --- trunk/print.c Sun May 25 09:47:47 2014 (r1797) +++ trunk/print.c Mon May 26 02:36:24 2014 (r1798) @@ -249,38 +249,46 @@ for (i = curdevlen; i < maxchiplen; i++) msg_ginfo(" "); - if ((chip->tested & TEST_OK_PROBE)) + if (chip->tested.probe == OK) msg_ginfo("P"); + else if (chip->tested.probe == NA) + msg_ginfo("-"); else msg_ginfo(" "); - if ((chip->tested & TEST_OK_READ)) + if (chip->tested.read == OK) msg_ginfo("R"); + else if (chip->tested.read == NA) + msg_ginfo("-"); else msg_ginfo(" "); - if ((chip->tested & TEST_OK_ERASE)) + if (chip->tested.erase == OK) msg_ginfo("E"); + else if (chip->tested.erase == NA) + msg_ginfo("-"); else msg_ginfo(" "); - if ((chip->tested & TEST_OK_WRITE)) + if (chip->tested.write == OK) msg_ginfo("W"); + else if (chip->tested.write == NA) + msg_ginfo("-"); else msg_ginfo(" "); for (i = 0; i < border; i++) msg_ginfo(" "); - if ((chip->tested & TEST_BAD_PROBE)) + if (chip->tested.probe == BAD) msg_ginfo("P"); else msg_ginfo(" "); - if ((chip->tested & TEST_BAD_READ)) + if (chip->tested.read == BAD) msg_ginfo("R"); else msg_ginfo(" "); - if ((chip->tested & TEST_BAD_ERASE)) + if (chip->tested.erase == BAD) msg_ginfo("E"); else msg_ginfo(" "); - if ((chip->tested & TEST_BAD_WRITE)) + if (chip->tested.write == BAD) msg_ginfo("W"); else msg_ginfo(" "); Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Sun May 25 09:47:47 2014 (r1797) +++ trunk/print_wiki.c Mon May 26 02:36:24 2014 (r1798) @@ -249,7 +249,6 @@ static void print_supported_chips_wiki(int cols) { unsigned int lines_per_col; - uint32_t t; char *s; char vmax[6]; char vmin[6]; @@ -287,7 +286,35 @@ c = !c; old = f; - t = f->tested; + const char *probe, *read, *write, *erase; + switch (f->tested.probe) { + case OK: probe = "OK"; break; + case BAD: probe = "No"; break; + case NA: probe = "NA"; break; + case DEP: probe = "Dep"; break; + default: probe = "?3"; break; + } + switch (f->tested.read) { + case OK: read = "OK"; break; + case BAD: read = "No"; break; + case NA: read = "NA"; break; + case DEP: read = "Dep"; break; + default: read = "?3"; break; + } + switch (f->tested.erase) { + case OK: erase = "OK"; break; + case BAD: erase = "No"; break; + case NA: erase = "NA"; break; + case DEP: erase = "Dep"; break; + default: erase = "?3"; break; + } + switch (f->tested.write) { + case OK: write = "OK"; break; + case BAD: write = "No"; break; + case NA: write = "NA"; break; + case DEP: write = "Dep"; break; + default: write = "?3"; break; + } s = flashbuses_to_text(f->bustype); sprintf(vmin, "%0.03f", f->voltage.min / (double)1000); sprintf(vmax, "%0.03f", f->voltage.max / (double)1000); @@ -298,16 +325,9 @@ "|| %s || %s \n", (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name, f->total_size, s, - (t & TEST_OK_PROBE) ? "OK" : - (t & TEST_BAD_PROBE) ? "No" : "?3", - (t & TEST_OK_READ) ? "OK" : - (t & TEST_BAD_READ) ? "No" : "?3", - (t & TEST_OK_ERASE) ? "OK" : - (t & TEST_BAD_ERASE) ? "No" : "?3", - (t & TEST_OK_WRITE) ? "OK" : - (t & TEST_BAD_WRITE) ? "No" : "?3", - f->voltage.min ? vmin : "N/A", - f->voltage.min ? vmax : "N/A"); + probe, read, erase, write, + f->voltage.min ? vmin : "?", + f->voltage.max ? vmax : "?"); free(s); if (((i % lines_per_col) + 1) == lines_per_col)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom May 2014