Merge remote-tracking branch 'upstream/master'

blanktonio · Oct 20, 2020 · 506fc7b · 506fc7b
2 parents e10876b + 36eb532
commit 506fc7b
Show file tree

Hide file tree

Showing 21 changed files with 2,996 additions and 3,793 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*~
+*.o
+dpcmd
diff --git a/ChipInfoDb.h b/ChipInfoDb.h
@@ -1,12 +1,13 @@
 #pragma once
-#ifndef ChipInfo_H
 
+#ifndef ChipInfo_H
 #define ChipInfo_H
 
+#include "Macro.h"
+
 #define NUMBER_OF_SUPPORTING_CHIPS  3
 
-struct m_code_api
-{
+struct m_code_api {
 	int (*m_code_api_doRDSR)(unsigned char *cSR, int Index);
 	int (*m_code_api_doWRSR)(unsigned char cSR,int Index);
 	int (*m_code_api_doChipErase)(int Index);
@@ -15,23 +16,12 @@ struct m_code_api
 	int (*m_code_api_doSegmentErase)(void);
 };
 
-
-
+bool Dedi_List_AllChip(void);
 int ChipInfoDbFindItem(CHIP_INFO ChipInfoDb[], int NumberOfItems, long JedecDeviceIDToFind);
-
 void ChipInfoDump(long JedecDeviceIDToFind);
-
 long ChipInfoDumpChipSizeInKByte(long Jedec);
-int Dedi_Search_Chip_Db_ByTypeName(char* TypeName, CHIP_INFO *Chip_Info, int Index);
-void getExecPath(char* Path);
-
+int Dedi_Search_Chip_Db(long RDIDCommand, long UniqueID, CHIP_INFO* Chip_Info, int search_all);
+int Dedi_Search_Chip_Db_ByTypeName(char* TypeName, CHIP_INFO* Chip_Info);
+FILE* openChipInfoDb(void);
 
 #endif
-
-
-
-
-
-
-
-
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    *~
+    *.o
+    dpcmd