fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Handle overhang when verifying flash

Browse source
This commit is contained in:
con-f-use 2016-08-15 02:02:11 +02:00
parent 7faa4ec9ea
commit 35a4e9db73
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
embedded8266/common/commonservices.c
View file

@ -145,11 +145,12 @@ int ICACHE_FLASH_ATTR issue_command(char * buffer, int retsize, char *pusrdata,
#ifdef VERIFY_FLASH_WRITE #ifdef VERIFY_FLASH_WRITE
#define VFW_SIZE 128 #define VFW_SIZE 128
printf( "FW%d\r\n", nr );
int jj; int jj;
uint8_t __attribute__ ((aligned (32))) buf[VFW_SIZE]; uint8_t __attribute__ ((aligned (32))) buf[VFW_SIZE];
for(jj=0; jj<datlen; jj+=VFW_SIZE) { for(jj=0; jj<datlen; jj+=VFW_SIZE) {
spi_flash_read( nr+jj, (uint32*)buf, VFW_SIZE ); spi_flash_read( nr+jj, (uint32*)buf, VFW_SIZE );
if( ets_memcmp( buf, buffer+jj, VFW_SIZE ) != 0 ) goto failw; if( ets_memcmp( buf, buffer+jj, jj+VFW_SIZE>datlen ? datlen%VFW_SIZE : VFW_SIZE ) != 0 ) goto failw;
} }
#endif #endif
@ -201,11 +202,12 @@ int ICACHE_FLASH_ATTR issue_command(char * buffer, int retsize, char *pusrdata,
// if( ets_memcmp( buf, buffer, (datlen/4)*4 ) != 0 ) break; // if( ets_memcmp( buf, buffer, (datlen/4)*4 ) != 0 ) break;
// Rather do it in chunks, to avoid allocationg huge buf // Rather do it in chunks, to avoid allocationg huge buf
#define VFW_SIZE 128 #define VFW_SIZE 128
printf( "FW%d\r\n", nr );
int jj; int jj;
uint8_t __attribute__ ((aligned (32))) buf[VFW_SIZE]; uint8_t __attribute__ ((aligned (32))) buf[VFW_SIZE];
for(jj=0; jj<datlen; jj+=VFW_SIZE) { for(jj=0; jj<datlen; jj+=VFW_SIZE) {
spi_flash_read( nr+jj, (uint32*)buf, VFW_SIZE ); spi_flash_read( nr+jj, (uint32*)buf, VFW_SIZE );
if( ets_memcmp( buf, buffer+jj, VFW_SIZE ) != 0 ) goto failfx; if( ets_memcmp( buf, buffer+jj, jj+VFW_SIZE>datlen ? datlen%VFW_SIZE : VFW_SIZE ) != 0 ) goto failfx;
} }
#endif #endif