openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

Generify a25.c's SRWD printing function and move it to spi25.c

Browse Source 
Corresponding to flashrom svn r1602.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner 2012-09-22 01:38:06 +00:00
parent eb58257b96
commit 5609f9d408
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
a25.c
View File

@ -23,12 +23,6 @@
/* Prettyprint the status register. Works for AMIC A25L series. */ /* Prettyprint the status register. Works for AMIC A25L series. */
static void spi_prettyprint_status_register_amic_a25_srwd(uint8_t status)
{
msg_cdbg("Chip status register: Status Register Write Disable "
"(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not ");
}
int spi_prettyprint_status_register_amic_a25l05p(struct flashctx *flash) int spi_prettyprint_status_register_amic_a25l05p(struct flashctx *flash)
{ {
uint8_t status; uint8_t status;
@ -36,7 +30,7 @@ int spi_prettyprint_status_register_amic_a25l05p(struct flashctx *flash)
status = spi_read_status_register(flash); status = spi_read_status_register(flash);
msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register is %02x\n", status);
spi_prettyprint_status_register_amic_a25_srwd(status); spi_prettyprint_status_register_srwd(status);
spi_prettyprint_status_register_bit(status, 6); spi_prettyprint_status_register_bit(status, 6);
spi_prettyprint_status_register_bit(status, 5); spi_prettyprint_status_register_bit(status, 5);
spi_prettyprint_status_register_bit(status, 4); spi_prettyprint_status_register_bit(status, 4);
@ -52,7 +46,7 @@ int spi_prettyprint_status_register_amic_a25l40p(struct flashctx *flash)
status = spi_read_status_register(flash); status = spi_read_status_register(flash);
msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register is %02x\n", status);
spi_prettyprint_status_register_amic_a25_srwd(status); spi_prettyprint_status_register_srwd(status);
spi_prettyprint_status_register_bit(status, 6); spi_prettyprint_status_register_bit(status, 6);
spi_prettyprint_status_register_bit(status, 5); spi_prettyprint_status_register_bit(status, 5);
spi_prettyprint_status_register_bp(status, 2); spi_prettyprint_status_register_bp(status, 2);
@ -67,7 +61,7 @@ int spi_prettyprint_status_register_amic_a25l032(struct flashctx *flash)
status = spi_read_status_register(flash); status = spi_read_status_register(flash);
msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register is %02x\n", status);
spi_prettyprint_status_register_amic_a25_srwd(status); spi_prettyprint_status_register_srwd(status);
msg_cdbg("Chip status register: Sector Protect Size (SEC) " msg_cdbg("Chip status register: Sector Protect Size (SEC) "
"is %i KB\n", (status & (1 << 6)) ? 4 : 64); "is %i KB\n", (status & (1 << 6)) ? 4 : 64);
msg_cdbg("Chip status register: Top/Bottom (TB) " msg_cdbg("Chip status register: Top/Bottom (TB) "
@ -85,7 +79,7 @@ int spi_prettyprint_status_register_amic_a25lq032(struct flashctx *flash)
status = spi_read_status_register(flash); status = spi_read_status_register(flash);
msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register is %02x\n", status);
spi_prettyprint_status_register_amic_a25_srwd(status); spi_prettyprint_status_register_srwd(status);
msg_cdbg("Chip status register: Sector Protect Size (SEC) " msg_cdbg("Chip status register: Sector Protect Size (SEC) "
"is %i KB\n", (status & (1 << 6)) ? 4 : 64); "is %i KB\n", (status & (1 << 6)) ? 4 : 64);
msg_cdbg("Chip status register: Top/Bottom (TB) " msg_cdbg("Chip status register: Top/Bottom (TB) "

1
chipdrivers.h
View File

@ -53,6 +53,7 @@ uint8_t spi_read_status_register(struct flashctx *flash);
int spi_write_status_register(struct flashctx *flash, int status); int spi_write_status_register(struct flashctx *flash, int status);
void spi_prettyprint_status_register_bit(uint8_t status, int bit); void spi_prettyprint_status_register_bit(uint8_t status, int bit);
void spi_prettyprint_status_register_bp(uint8_t status, int bp); void spi_prettyprint_status_register_bp(uint8_t status, int bp);
void spi_prettyprint_status_register_srwd(uint8_t status);
void spi_prettyprint_status_register_welwip(uint8_t status); void spi_prettyprint_status_register_welwip(uint8_t status);
int spi_prettyprint_status_register(struct flashctx *flash); int spi_prettyprint_status_register(struct flashctx *flash);
int spi_disable_blockprotect(struct flashctx *flash); int spi_disable_blockprotect(struct flashctx *flash);

14
spi25.c
View File

@ -315,7 +315,13 @@ uint8_t spi_read_status_register(struct flashctx *flash)
return readarr[0]; return readarr[0];
} }
/* Prettyprint the status register. Common definitions. */ /* Common highest bit: Status Register Write Disable (SRWD). */
void spi_prettyprint_status_register_srwd(uint8_t status)
{
msg_cdbg("Chip status register: Status Register Write Disable (SRWD) is %sset\n",
(status & (1 << 7)) ? "" : "not ");
}
void spi_prettyprint_status_register_welwip(uint8_t status) void spi_prettyprint_status_register_welwip(uint8_t status)
{ {
msg_cdbg("Chip status register: Write Enable Latch (WEL) is " msg_cdbg("Chip status register: Write Enable Latch (WEL) is "
@ -366,10 +372,8 @@ static void spi_prettyprint_status_register_common(uint8_t status)
*/ */
void spi_prettyprint_status_register_st_m25p(uint8_t status) void spi_prettyprint_status_register_st_m25p(uint8_t status)
{ {
msg_cdbg("Chip status register: Status Register Write Disable " spi_prettyprint_status_register_srwd(status);
"(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); spi_prettyprint_status_register_bit(status, 6);
msg_cdbg("Chip status register: Bit 6 is "
"%sset\n", (status & (1 << 6)) ? "" : "not ");
spi_prettyprint_status_register_common(status); spi_prettyprint_status_register_common(status);
} }