Peter M. Groen / openhantek

Commit c077bc98c4aa3a76f4024e1eee6eb83bd9c85c27

Authored by oliverhaag
1 parent 22ac8cf4

Removed Oleg from authors and renamed writeSRecords to writeIntelHex (S-Records is another format)

Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
dsoextractfw/AUTHORS
  View file @c077bc9
1 -Oleg Khudyakov <prcoder@potrebitel.ru>  
2 Oliver Haag <oliver.haag@gmail.com> 1 Oliver Haag <oliver.haag@gmail.com>
3 \ No newline at end of file 2 \ No newline at end of file
dsoextractfw/dsoextractfw.c
  View file @c077bc9
@@ -34,10 +34,10 @@ static const char *strHex = &quot;.hex&quot;; @@ -34,10 +34,10 @@ static const char *strHex = &quot;.hex&quot;;
34 static const char *strDriver = "1.SYS"; 34 static const char *strDriver = "1.SYS";
35 static const char *strModels[] = { "DSO2090", "DSO2100", "DSO2150", "DSO2250", "DSO5200", "DSO520A", NULL }; 35 static const char *strModels[] = { "DSO2090", "DSO2100", "DSO2150", "DSO2250", "DSO5200", "DSO520A", NULL };
36 36
37 -int writeSRecords(const char *filename, unsigned char *ptr, bfd_size_type len); 37 +int writeIntelHex(const char *filename, unsigned char *ptr, bfd_size_type len);
38 int extractFirmware(const char* model); 38 int extractFirmware(const char* model);
39 39
40 -int writeSRecords(const char *filename, unsigned char *ptr, bfd_size_type len) 40 +int writeIntelHex(const char *filename, unsigned char *ptr, bfd_size_type len)
41 { 41 {
42 unsigned char n, *p, crc=0, eof; 42 unsigned char n, *p, crc=0, eof;
43 bfd_size_type i, t; 43 bfd_size_type i, t;
@@ -174,13 +174,13 @@ int extractFirmware(const char* model) @@ -174,13 +174,13 @@ int extractFirmware(const char* model)
174 strcat(filename, strFirmware); 174 strcat(filename, strFirmware);
175 strcat(filename, strHex); 175 strcat(filename, strHex);
176 printf("Writing %s\n", filename); 176 printf("Writing %s\n", filename);
177 - writeSRecords(filename, ptrFirmware, lenFirmware); 177 + writeIntelHex(filename, ptrFirmware, lenFirmware);
178 178
179 strcpy(filename, model); 179 strcpy(filename, model);
180 strcat(filename, strLoader); 180 strcat(filename, strLoader);
181 strcat(filename, strHex); 181 strcat(filename, strHex);
182 printf("Writing %s\n", filename); 182 printf("Writing %s\n", filename);
183 - writeSRecords(filename, ptrLoader, lenLoader); 183 + writeIntelHex(filename, ptrLoader, lenLoader);
184 184
185 free(ptrFirmware); 185 free(ptrFirmware);
186 free(ptrLoader); 186 free(ptrLoader);