forked from matrix-io/xc3sprog
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge PR matrix-io#36 (Fix sector_size for M25P64, ID 0x2017)
- Loading branch information
Showing
5 changed files
with
6 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,8 +35,6 @@ Dmitry Teytelman [[email protected]] 14 Jun 2006 [applied 13 Aug 2006]: | |
#include <time.h> | ||
#include "bitrev.h" | ||
|
||
using namespace std; | ||
|
||
BitFile::BitFile() | ||
: length(0) | ||
, buffer(0) | ||
|
@@ -607,14 +605,14 @@ uint32_t BitFile::saveAs(FILE_STYLE style, const char *device, | |
return clip; | ||
} | ||
|
||
void BitFile::error(const string &str) | ||
void BitFile::error(const std::string &str) | ||
{ | ||
errorStr=str; | ||
Error=true; | ||
fprintf(logfile,"%s\n",str.c_str()); | ||
} | ||
|
||
void BitFile::readField(string &field, FILE *fp) | ||
void BitFile::readField(std::string &field, FILE *fp) | ||
{ | ||
byte t[2]; | ||
fread(t,1,2,fp); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters