dpcmd.c

blanktonio · Feb 15, 2022 · 859f335 · 859f335
1 parent 4aa428c
commit 859f335
Show file tree

Hide file tree

Showing 25 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/60-dediprog.rules b/60-dediprog.rules
diff --git a/ChipInfoDb.dedicfg b/ChipInfoDb.dedicfg
diff --git a/ChipInfoDb.h b/ChipInfoDb.h
diff --git a/FlashCommand.c b/FlashCommand.c
diff --git a/FlashCommand.h b/FlashCommand.h
diff --git a/IntelHexFile.c b/IntelHexFile.c
diff --git a/IntelHexFile.h b/IntelHexFile.h
diff --git a/LICENSE b/LICENSE
diff --git a/Macro.h b/Macro.h
diff --git a/Makefile b/Makefile
diff --git a/MotorolaFile.c b/MotorolaFile.c
diff --git a/MotorolaFile.h b/MotorolaFile.h
diff --git a/README.md b/README.md
diff --git a/SerialFlash.c b/SerialFlash.c
diff --git a/SerialFlash.h b/SerialFlash.h
diff --git a/board.c b/board.c
@@ -790,7 +790,7 @@ bool EncrypFirmware(unsigned char* vBuffer, unsigned int Size, int Index)
 {
     unsigned char vUID[16];
     unsigned int i = 0;
-    if (ReadOnBoardFlash(vUID, true, Index) == false)
+    if (ReadOnBoardFlash(vUID, false, Index) == false)
         return false;
     for (i = 0; i < 16; i++)
         vBuffer[i] = vBuffer[i] ^ vUID[i];
@@ -802,6 +802,7 @@ bool EncrypFirmware(unsigned char* vBuffer, unsigned int Size, int Index)
 
 bool UpdateSF600Flash(const char* sFilePath, int Index)
 {
+        printf("		evy	UpdateSF600Flash\n");
     CNTRPIPE_RQ rq;
     unsigned char* pBuffer;
     int pagenum = 0;
@@ -818,16 +819,14 @@ bool UpdateSF600Flash(const char* sFilePath, int Index)
     }
 
     fseek(pFile, 0, SEEK_SET);
-    lSize = fread((unsigned char*)&fw_info, 1, sizeof(FW_INFO), pFile);
+    lSize = fread((unsigned char*)&fw_info, 1, sizeof(FW_INFO), pFile); 
     if (lSize != sizeof(FW_INFO))
         printf("Possible read length error %s\n", sFilePath);
-
     pBuffer = (unsigned char*)malloc(fw_info.FirstSize);
     fseek(pFile, fw_info.FirstIndex, SEEK_SET);
-    lSize = fread(pBuffer, 1, fw_info.FirstSize, pFile);
+    lSize = fread(pBuffer, 1, fw_info.FirstSize, pFile); 
     if (lSize != fw_info.FirstSize)
         printf("Possible read length error %s\n", sFilePath);
-
     fclose(pFile);
 
     EncrypFirmware(pBuffer, fw_info.FirstSize, Index);
@@ -880,6 +879,7 @@ bool UpdateSF600Flash(const char* sFilePath, int Index)
 
 bool UpdateSF600Flash_FPGA(const char* sFilePath, int Index)
 {
+        printf("		evy	UpdateSF600Flash_FPGA\n");
     CNTRPIPE_RQ rq;
     unsigned char* pBuffer;
     int pagenum = 0;
@@ -956,14 +956,14 @@ bool UpdateSF600Flash_FPGA(const char* sFilePath, int Index)
 }
 
 bool UpdateFirmware(const char* sFolder, int Index)
-{
+{ 
     bool bResult = true;
     unsigned int UID = 0;
     unsigned char ManID = 0;
     // read status
     if ((g_bIsSF600 == true) || (g_bIsSF700 == true))
         return UpdateSF600Firmware(sFolder, Index);
-
+ 
     dediprog_set_spi_voltage(g_Vcc, Index);
 
     if (g_firmversion > 0x040107) // 4.1.7

diff --git a/board.h b/board.h
diff --git a/dpcmd.c b/dpcmd.c
diff --git a/dpcmd.h b/dpcmd.h
diff --git a/parse.c b/parse.c
diff --git a/project.c b/project.c
diff --git a/project.h b/project.h
diff --git a/usbdriver.c b/usbdriver.c
diff --git a/usbdriver.h b/usbdriver.h