X-Git-Url: http://git.smho.de/gw/?a=blobdiff_plain;f=src%2FowInterface.h;h=7e1edb09d1a9d453980d3b465553f6bfe1a86d01;hb=8b3ce8126a8bbc16822e939bc46f513e1c52b3d3;hp=415c5dde7860d72f7853c7e218857ee4f0f4c648;hpb=df91f0af6eb853d1fd572da66c7fee753a8ebd64;p=owTools.git

diff --git a/src/owInterface.h b/src/owInterface.h
old mode 100755
new mode 100644
index 415c5dd..7e1edb0
--- a/src/owInterface.h
+++ b/src/owInterface.h
@@ -232,9 +232,9 @@ public:
 	uint16_t calcCRC16(std::vector<uint8_t> data);
 	int testCRC16(std::vector<uint8_t> data);
 		
-	void resetFlasher();
-	void resetID();
-	int programmPage(int pagenr, std::vector<uint8_t> page, int pagesize);
+	void resetFlasher(uint64_t id);
+	void resetID(uint64_t id);
+	int programmPage(uint64_t id,int pagenr, std::vector<uint8_t> page, int pagesize);
 	int flashHEXFile(std::string filename,snum_t dev,int resetid,int progress);
 	
 	
@@ -287,6 +287,7 @@ public:
 	virtual int convertAll() {return 1;}
 	virtual int readMemory(int page,int start, int count,std::vector<uint8_t> *data) {return 0;};
 	virtual int writeMemory(int page,int start, int count,std::vector<uint8_t> *data) {return 0;};
+	virtual int getPageSize() {return 0;}
 	virtual ~owDevice() {}
 };
 
@@ -296,6 +297,7 @@ public:
 	virtual void setDefaultConfig();
 	int readScratchpad(std::vector<uint8_t> *sp);
 	virtual int convertAll();
+	virtual int getPageSize() {return 8;}
 } ;
 
 
@@ -309,6 +311,7 @@ public:
 	virtual int readMemory(int page,int start, int count,std::vector<uint8_t> *data);
 	virtual int writeMemory(int page,int start, int count,std::vector<uint8_t> *data);
 	virtual int convertAll();
+	virtual int getPageSize() {return 8;}
 
 } ;
 class owDeviceDS2450:public owDevice {
@@ -320,6 +323,7 @@ public:
 	void readMemory(uint8_t addr,std::vector<uint8_t> *sp);
 	void writeMemory(uint8_t addr,std::vector<uint8_t> *sp);
 	void convert(uint8_t mask, uint8_t preset); 
+	virtual int getPageSize() {return 8;}
 
 } ;
 
@@ -331,6 +335,10 @@ public:
 	virtual void setDefaultConfig();
 	virtual int convertAll();
 	uint32_t readCounter(uint8_t page);
+	virtual int readMemory(int page,int start, int count,std::vector<uint8_t> *data);
+	virtual int writeMemory(int page,int start, int count,std::vector<uint8_t> *data);
+	virtual int getPageSize() {return 32;}
+
 
 } ;