From ccbca7daad87cf91e4d5f4e727dc9449eb5edb33 Mon Sep 17 00:00:00 2001
From: root <root@fedora27.lab.local>
Date: Wed, 15 Dec 2021 17:32:01 +0800
Subject: [PATCH] dpcmd.c

---
 .gear/rules           |  0
 .gear/sf100linux.spec |  0
 .gitignore            |  0
 60-dediprog.rules     |  0
 ChipInfoDb.dedicfg    | 21 +++++++++++++++++++++
 ChipInfoDb.h          |  0
 FlashCommand.c        |  0
 FlashCommand.h        |  0
 IntelHexFile.c        |  0
 IntelHexFile.h        |  0
 LICENSE               |  0
 Macro.h               |  0
 Makefile              |  0
 MotorolaFile.c        |  0
 MotorolaFile.h        |  0
 README.md             |  0
 SerialFlash.c         |  0
 SerialFlash.h         |  0
 board.c               |  0
 board.h               |  0
 dpcmd.c               | 42 +++++++++++++++++++++++++++++++++---------
 dpcmd.h               |  0
 parse.c               |  0
 project.c             |  4 ++--
 project.h             |  0
 usbdriver.c           |  0
 usbdriver.h           |  0
 27 files changed, 56 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 .gear/rules
 mode change 100644 => 100755 .gear/sf100linux.spec
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 60-dediprog.rules
 mode change 100644 => 100755 ChipInfoDb.dedicfg
 mode change 100644 => 100755 ChipInfoDb.h
 mode change 100644 => 100755 FlashCommand.c
 mode change 100644 => 100755 FlashCommand.h
 mode change 100644 => 100755 IntelHexFile.c
 mode change 100644 => 100755 IntelHexFile.h
 mode change 100644 => 100755 LICENSE
 mode change 100644 => 100755 Macro.h
 mode change 100644 => 100755 Makefile
 mode change 100644 => 100755 MotorolaFile.c
 mode change 100644 => 100755 MotorolaFile.h
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 SerialFlash.c
 mode change 100644 => 100755 SerialFlash.h
 mode change 100644 => 100755 board.c
 mode change 100644 => 100755 board.h
 mode change 100644 => 100755 dpcmd.c
 mode change 100644 => 100755 dpcmd.h
 mode change 100644 => 100755 parse.c
 mode change 100644 => 100755 project.c
 mode change 100644 => 100755 project.h
 mode change 100644 => 100755 usbdriver.c
 mode change 100644 => 100755 usbdriver.h

diff --git a/.gear/rules b/.gear/rules
old mode 100644
new mode 100755
diff --git a/.gear/sf100linux.spec b/.gear/sf100linux.spec
old mode 100644
new mode 100755
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/60-dediprog.rules b/60-dediprog.rules
old mode 100644
new mode 100755
diff --git a/ChipInfoDb.dedicfg b/ChipInfoDb.dedicfg
old mode 100644
new mode 100755
index dd289e4..f57a614
--- 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
old mode 100644
new mode 100755
diff --git a/FlashCommand.c b/FlashCommand.c
old mode 100644
new mode 100755
diff --git a/FlashCommand.h b/FlashCommand.h
old mode 100644
new mode 100755
diff --git a/IntelHexFile.c b/IntelHexFile.c
old mode 100644
new mode 100755
diff --git a/IntelHexFile.h b/IntelHexFile.h
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/Macro.h b/Macro.h
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/MotorolaFile.c b/MotorolaFile.c
old mode 100644
new mode 100755
diff --git a/MotorolaFile.h b/MotorolaFile.h
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/SerialFlash.c b/SerialFlash.c
old mode 100644
new mode 100755
diff --git a/SerialFlash.h b/SerialFlash.h
old mode 100644
new mode 100755
diff --git a/board.c b/board.c
old mode 100644
new mode 100755
diff --git a/board.h b/board.h
old mode 100644
new mode 100755
diff --git a/dpcmd.c b/dpcmd.c
old mode 100644
new mode 100755
index 7f06ba9..52378c3
--- 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
old mode 100644
new mode 100755
diff --git a/parse.c b/parse.c
old mode 100644
new mode 100755
diff --git a/project.c b/project.c
old mode 100644
new mode 100755
index 358fdee..568983a
--- 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
old mode 100644
new mode 100755
diff --git a/usbdriver.c b/usbdriver.c
old mode 100644
new mode 100755
diff --git a/usbdriver.h b/usbdriver.h
old mode 100644
new mode 100755