diff --git a/bitfile.cpp b/bitfile.cpp index ba72532..1dba8c6 100644 --- a/bitfile.cpp +++ b/bitfile.cpp @@ -35,8 +35,6 @@ Dmitry Teytelman [dimtey@gmail.com] 14 Jun 2006 [applied 13 Aug 2006]: #include #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); diff --git a/cablelist.txt b/cablelist.txt index 8bf942b..6408e3b 100644 --- a/cablelist.txt +++ b/cablelist.txt @@ -47,3 +47,4 @@ sysfsgpio_creator sysfsgpio_creator 0 NULL sysfsgpio_voice sysfsgpio_voice 0 NULL matrix_creator matrix_creator 0 NULL matrix_voice matrix_voice 0 NULL +mimas_a7 ftdi 15000000 0x2A19:0x1009::2:0x00:0x4B:0x00:0x00 diff --git a/devlist.txt b/devlist.txt index 918e554..573b786 100644 --- a/devlist.txt +++ b/devlist.txt @@ -1,7 +1,9 @@ # IDCODE IR_len ID_Cmd Text 03631093 6 0x09 XA7A100T +0362e093 6 0x09 XC7A15T 0362D093 6 0x09 XC7A35T +0362C093 6 0x09 XC7A50T 03632093 6 0x09 XC7A75T 03636093 6 0x09 XC7A200T diff --git a/progalgspiflash.cpp b/progalgspiflash.cpp index 4ecbc11..cd3eb61 100644 --- a/progalgspiflash.cpp +++ b/progalgspiflash.cpp @@ -444,7 +444,7 @@ int ProgAlgSPIFlash::spi_flashinfo_m25p_mx25l(unsigned char *buf, int is_mx25l) break; case 0x17: pages = 32768; - sector_size = 131072; /* Bytes = 1 Mi Bit*/ + sector_size = 65536; /* Bytes = 512k Bits*/ break; case 0x18: pages = 65536; diff --git a/srecfile.cpp b/srecfile.cpp index db40fcc..51b3bfb 100644 --- a/srecfile.cpp +++ b/srecfile.cpp @@ -28,8 +28,6 @@ Modifyied from srecdec #include #include -using namespace std; - int SrecFile::DecodeSRecordLine(char *source, unsigned char *dest, S_Record *SRec) { char buffer[16];