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

diff --git a/src/owInterface.h b/src/owInterface.h
index 83ab326..415c5dd 100755
--- a/src/owInterface.h
+++ b/src/owInterface.h
@@ -34,12 +34,28 @@
 #ifndef __OWINTERFACES_H_
 #define __OWINTERFACES_H_
 
+#if defined(WIN) || defined(LINUX)
+#else
+#if defined(_WINDOWS) || defined(__WINDOWS__) || defined(_WIN32) || defined(WIN32)
+#define WIN
+#else
+#define LINUX
+#endif
+#endif
+
+
 #include <vector>
 #include <stdint.h>
 #include <string>
+#ifdef LINUX
 #include <termios.h>
+#endif
 #include <stdarg.h>
 
+#ifdef WIN
+#include <Windows.h>
+
+#endif
 
 class owDevice;
 class owDeviceConfig;
@@ -48,7 +64,7 @@ class owDeviceConfig;
 #if defined(_WINDOWS) || defined(__WINDOWS__) || defined(_WIN32) || defined(WIN32)
    #define USE_WINDOWS_TIME 1
    #include <windows.h>
-   #include "win32/usb.h" // libusb header
+   //#include "win32/usb.h" // libusb header
 #else
    #define USE_WINDOWS_TIME 0
    #include <time.h>
@@ -68,6 +84,29 @@ class owDeviceConfig;
 #define OWLOG_WARNING 2
 #define OWLOG_ERROR 3
 
+#ifdef LINUX
+
+#define BLUE_B "\033[1;34m"
+#define COLOR_E "\033[0m"
+#define C2_B "\033[0;36m"
+#define C3_B "\033[3;34m"
+#define C4_B "\033[1;33m"
+#define C5_B "\033[4;33m"
+#define CLE_B "\033[1;31m"
+#define CLW_B "\033[1;33m"
+#endif
+#ifdef WIN
+#define BLUE_B ""
+#define C2_B ""
+#define C3_B ""
+#define C4_B ""
+#define COLOR_E ""
+#define C5_B ""
+#define CLE_B ""
+#define CLW_B ""
+
+#endif
+
 class owLog {
 	int lcount;
 	std::string logtext;
@@ -84,14 +123,19 @@ public:
 		va_list arg;
 		int done;
 		va_start (arg, format);
+#ifdef LINUX
 		done = vsprintf (s, format, arg);
+#endif
+#ifdef WIN
+		done = vsprintf_s(s,300, format, arg);
+#endif
 		va_end (arg);
 		logtext=s;
 		level=llevel;
 		lcount++;
 		if (level>=loglevel) {
-			if (loglevel==OWLOG_ERROR) printf("\033[1;31m%s\033[0m\n",s);
-			else if (loglevel==OWLOG_WARNING) printf("\033[1;33m%s\033[0m\n",s);
+			if (loglevel==OWLOG_ERROR) printf(CLE_B "%s" COLOR_E "\n",s);
+			else if (loglevel==OWLOG_WARNING) printf(CLW_B "%s" COLOR_E "\n",s);
 			else printf("%s\n",s);
 		}
 		return done;
@@ -194,13 +238,13 @@ public:
 	int flashHEXFile(std::string filename,snum_t dev,int resetid,int progress);
 	
 	
-	int owFirst() {
+	virtual int owFirst() {
 		LastDiscrepancy = 0;
 		LastDeviceFlag = FALSE;
 		LastFamilyDiscrepancy = 0;
 		return owSearch();		
 	}
-	int owNext()  {
+	virtual int owNext()  {
 		return owSearch();
 	}
 	virtual ~owInterface()  {
@@ -241,6 +285,8 @@ public:
 	void changeID(snum_t nid);
 	void runFlasher();
 	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 ~owDevice() {}
 };
 
@@ -260,7 +306,8 @@ public:
 
 	int setConfigByte(uint8_t cb);
 	int readScratchpad(std::vector<uint8_t> *sp, uint8_t page, int recall);
-
+	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();
 
 } ;