luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spiFlash: read extented ID only when len != 0

This commit is contained in:
Gwenhael Goavec-Merou 2020-04-21 09:02:48 +02:00
parent c94f031025
commit 95f247a25e
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/spiFlash.cpp
View File

@ -157,6 +157,7 @@ void SPIFlash::read_id()
{ {
int len = 4; int len = 4;
uint8_t rx[512]; uint8_t rx[512];
bool has_edid = false;
_spi->spi_put(0x9F, NULL, rx, 4); _spi->spi_put(0x9F, NULL, rx, 4);
int d = 0; int d = 0;
@ -169,10 +170,13 @@ void SPIFlash::read_id()
if (_verbose) if (_verbose)
printf("read %x\n", d); printf("read %x\n", d);
/* read extented */
len += (d & 0x0ff);
_spi->spi_put(0x9F, NULL, rx, len); /* read extented */
if ((d & 0xff) != 0) {
has_edid = true;
len += (d & 0x0ff);
_spi->spi_put(0x9F, NULL, rx, len);
}
/* must be 0x20BA1810 ... */ /* must be 0x20BA1810 ... */
@ -180,13 +184,17 @@ void SPIFlash::read_id()
printf("Jedec ID : %02x\n", rx[0]); printf("Jedec ID : %02x\n", rx[0]);
printf("memory type : %02x\n", rx[1]); printf("memory type : %02x\n", rx[1]);
printf("memory capacity : %02x\n", rx[2]); printf("memory capacity : %02x\n", rx[2]);
printf("EDID + CFD length : %02x\n", rx[3]); if (has_edid) {
printf("EDID : %02x%02x\n", rx[5], rx[4]); printf("EDID + CFD length : %02x\n", rx[3]);
printf("CFD : "); printf("EDID : %02x%02x\n", rx[5], rx[4]);
if (_verbose) { printf("CFD : ");
for (int i = 6; i < len; i++) if (_verbose) {
printf("%02x ", rx[i]); for (int i = 6; i < len; i++)
printf("\n"); printf("%02x ", rx[i]);
printf("\n");
} else {
printf("\n");
}
} }
} }