From ef10c354afdda39600e8052816412e82e413c7c4 Mon Sep 17 00:00:00 2001 From: jmichault <48726908+jmichault@users.noreply.github.com> Date: Wed, 24 Apr 2019 18:23:24 +0200 Subject: [PATCH] corrected bug in reading hex file. --- cc_write | Bin 17984 -> 17984 bytes cc_write.c | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cc_write b/cc_write index 8336a80791c8571f65a60fc14dc367495dbf83ab..e5fcc5bb94977f5176542ca0a7a13fc5280905f9 100755 GIT binary patch delta 2813 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 Mc&au1RO)&De^)@hDF6Tf diff --git a/cc_write.c b/cc_write.c index 4df3289..440bd5e 100644 --- a/cc_write.c +++ b/cc_write.c @@ -111,6 +111,7 @@ int writePage(int page) uint32_t offset = ((page&0xf)<<11) + Pages[page].minoffset; uint32_t len = Pages[page].maxoffset-Pages[page].minoffset+1; + if(len&0xf) len= (len&0x7f0)+16; // configure DMA-0 pour DEBUG --> RAM uint8_t dma_desc0[8]; dma_desc0[0] = 0x62;// src[15:8] @@ -279,12 +280,12 @@ int main(int argc,char **argv) int page= (sla+addr)>>11; if (page>maxpage) maxpage=page; uint16_t start=(sla+addr)&0x7ff; - if(start+len> 2048) - { + if(start+len> 2048) // some datas are for next page + { //copy end of datas to next page if (page+1>maxpage) maxpage=page+1; memcpy(&Pages[page+1].datas[0] - ,data,(start+len-2048)); - if(0 < Pages[page].minoffset) Pages[page].minoffset=0; + ,data+2048-start,(start+len-2048)); + if(0 < Pages[page+1].minoffset) Pages[page+1].minoffset=0; if( (start+len-2048-1) > Pages[page].maxoffset) Pages[page].maxoffset=start+len-2048-1; len=2048-start; }