dpcmd.c

blanktonio · Dec 15, 2021 · ccbca7d · ccbca7d
1 parent 11e3d37
commit ccbca7d
Show file tree

Hide file tree

Showing 27 changed files with 56 additions and 11 deletions.
diff --git a/.gear/rules b/.gear/rules
diff --git a/.gear/sf100linux.spec b/.gear/sf100linux.spec
diff --git a/.gitignore b/.gitignore
diff --git a/60-dediprog.rules b/60-dediprog.rules
diff --git a/ChipInfoDb.dedicfg b/ChipInfoDb.dedicfg
@@ -21060,6 +21060,27 @@ RDIDCommand="0x9F"/>
     ProgramIOMethod="SPQD_RQWSW"
     IDNumber="3"
     RDIDCommand="0x9F"/>
+<Chip TypeName="W25Q16JW"
+    ICType="SPI_NOR"
+    Class="W25Pxx"
+    UniqueID="0xEF8015"
+    Description="16 Mbit, Serial Flash Memory"
+    Manufacturer="Winbond Electronics Corp"
+    ManufactureUrl="www.winbond.com"
+    Voltage="1.8V"
+    Clock="75MHz"
+    Timeout="40"
+    JedecDeviceID="0xEF8015"
+    ManufactureID="0xEF"
+    DeviceID="0x14"
+    ChipSizeInKByte="2048"
+    SectorSizeInByte="4096"
+    PageSizeInByte="256"
+    BlockSizeInByte="65536"
+    AddrWidth="3"
+    ProgramIOMethod="SPSD_RSW"
+    IDNumber="3"
+    RDIDCommand="0x9F"/>
 <Chip TypeName="W25Q16JV"
     ICType="SPI_NOR"
     Class="W25Pxx"

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
diff --git a/board.h b/board.h
diff --git a/dpcmd.c b/dpcmd.c
@@ -500,7 +500,7 @@ int main(int argc, char* argv[])
     unsigned long r;
 	  char *env;
 
-    printf("\nDpCmd Linux 1.12.7.%02d Engine Version:\nLast Built on October 27 2021\n\n", GetConfigVer()); // 1. new feature.bug.configS
+    printf("\nDpCmd Linux 1.12.8.%02d Engine Version:\nLast Built on October 27 2021\n\n", GetConfigVer()); // 1. new feature.bug.configS
 
     g_ucOperation = 0;
     GetLogPath(g_LogPath);
@@ -576,7 +576,7 @@ int main(int argc, char* argv[])
             break;
         case 'r':
             g_parameter_read = optarg;
-            g_ucOperation |= READ_TO_FILE;
+            g_ucOperation |= READ_TO_FILE;  
             break;
         case 'p':
             g_parameter_program = optarg;
@@ -1564,6 +1564,7 @@ void do_Read(void)
     DownloadAddrRange.end = g_uiAddr + g_uiLen;
 
     printf("%s\n", msg_info_reading);
+
     Run(READ_ANY_BY_PREFERENCE_CONFIGURATION, g_uiDevNum);
     Wait(msg_info_readOK, msg_info_readfail);
 }
@@ -1587,14 +1588,37 @@ void do_DisplayOrSave(void)
                 printf("\n\n");
             } else {
                 UploadAddrRange.length = UploadAddrRange.end - UploadAddrRange.start;
-                char str[64];
-                sprintf(str, "%d_", icnt + 1);
-                strcat(str, g_parameter_read);
-
-                if (WriteFile((const char*)str, pBufferForLastReadData[icnt], UploadAddrRange.length) == 1)
-                    printf("\nSuccessfully saved into file:%s \n", str);
+                char SourceStr[64];   
+
+
+		sprintf(SourceStr, "%s", g_parameter_read);
+
+
+
+		int len = strlen(SourceStr);
+		int i = len;
+		while(SourceStr[i]!='.' && i>0)
+		    i--;
+		char ExtStr[64];;
+		if(SourceStr[i]=='.')
+              	    sprintf(ExtStr, "%s", &SourceStr[i]); 
+		else
+              	    sprintf(ExtStr, "%s", &SourceStr[len]);
+
+		char *loc = strstr(SourceStr,ExtStr); 
+
+		for(int i=loc-SourceStr;i<strlen(SourceStr);i++) 
+		    SourceStr[i]='\0';
+
+		char str[64];
+              	sprintf(str, "_%d", icnt + 1);
+                strcat(SourceStr, str);
+                strcat(SourceStr, ExtStr);   
+
+                if (WriteFile((const char*)SourceStr, pBufferForLastReadData[icnt], UploadAddrRange.length) == 1)
+                    printf("\nSuccessfully saved into file:%s \n", SourceStr);
                 else
-                    printf("\nFailed to save into file: %s\n", str);
+                    printf("\nFailed to save into file: %s\n", SourceStr);
             }
         }
     } else if (g_uiDevNum != 0) {

diff --git a/dpcmd.h b/dpcmd.h
diff --git a/parse.c b/parse.c
diff --git a/project.c b/project.c
@@ -465,7 +465,7 @@ bool threadEraseWholeChip(int Index)
 }
 
 bool threadReadRangeChip(struct CAddressRange range, int Index)
-{
+{ 
     bool result = true;
     struct CAddressRange AddrRound;
 
@@ -504,7 +504,7 @@ bool threadReadRangeChip(struct CAddressRange range, int Index)
 }
 
 bool threadReadChip(int Index)
-{
+{ 
     bool result = false;
     struct CAddressRange Addr;
     Addr.start = 0;

diff --git a/project.h b/project.h
diff --git a/usbdriver.c b/usbdriver.c
diff --git a/usbdriver.h b/usbdriver.h