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

Slight restructure of SPI probe_ functions

Browse Source 
Preparation for a probe optimization patch. This patch does not change any
functionality. spi_probe_rdid was tested to still work on my M57SLI rev 2.

The idea is to have error checks return error immediately when something
fails, rather than having code inside an if block where the condition
tests for success.

This means: Less indentation, more clear what the code is checking.

Corresponding to flashrom svn r272 and coreboot v2 svn r3386.

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Ward Vandewege <ward@gnu.org>
This commit is contained in:
Peter Stuge 2008-06-24 01:22:03 +00:00
parent f8a49fee02
commit da4e5f3623
1 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spi.c
View File

@ -82,9 +82,13 @@ int probe_spi_rdid(struct flashchip *flash)
unsigned char readarr[3];
uint32_t manuf_id;
uint32_t model_id;
if (!spi_rdid(readarr)) {
if (spi_rdid(readarr))
return 0;
if (!oddparity(readarr[0]))
printf_debug("RDID byte 0 parity violation.\n");
/* Check if this is a continuation vendor ID */
if (readarr[0] == 0x7f) {
if (!oddparity(readarr[1]))
@ -95,7 +99,9 @@ int probe_spi_rdid(struct flashchip *flash)
manuf_id = readarr[0];
model_id = (readarr[1] << 8) | readarr[2];
}
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, manuf_id, model_id);
if (manuf_id == flash->manufacture_id &&
model_id == flash->model_id) {
/* Print the status register to tell the
@ -105,11 +111,11 @@ int probe_spi_rdid(struct flashchip *flash)
return 1;
}
/* Test if this is a pure vendor match. */
if (manuf_id == flash->manufacture_id &&
GENERIC_DEVICE_ID == flash->model_id)
return 1;
}
return 0;
}
@ -118,29 +124,29 @@ int probe_spi_res(struct flashchip *flash)
{
unsigned char readarr[3];
uint32_t model_id;
if (!spi_rdid(readarr)) {
if (spi_rdid(readarr))
/* We couldn't issue RDID, it's pointless to try RES. */
return 0;
/* Check if RDID returns 0xff 0xff 0xff, then we use RES. */
if ((readarr[0] != 0xff) || (readarr[1] != 0xff) ||
(readarr[2] != 0xff))
return 0;
} else {
/* We couldn't issue RDID, it's pointless to try RES. */
if (spi_res(readarr))
return 0;
}
if (!spi_res(readarr)) {
model_id = readarr[0];
printf_debug("%s: id 0x%x\n", __FUNCTION__, model_id);
if (model_id == flash->model_id) {
if (model_id != flash->model_id)
return 0;
/* Print the status register to tell the
* user about possible write protection.
*/
spi_prettyprint_status_register(flash);
return 1;
}
}
return 0;
}
uint8_t spi_read_status_register()