transfer to cpp arduino

[mTask.git] / int / misc.h

diff --git a/int/misc.h b/int/misc.h
index 033dee6..3d5236e 100644 (file)
--- a/int/misc.h
+++ b/int/misc.h
@@ -1,24 +1,22 @@
 #ifndef MISC_H
 #define MISC_H
+#include "main.h"
 
-#define DEBUG
+#define read16() 256*read_byte() + read_byte()
+#ifdef ARDUINO
+#define debug(s, ...) ;
+#define pdie(s) ;
+#define die(s, ...) ;
+#else
 
 #ifdef DEBUG
 #define debug(s, ...) printf(s, ##__VA_ARGS__);
-#define trace(op, ...) printf("pc: %d, sp: %d, op: " op, pc, sp, ##__VA_ARGS__);
 #else
 #define debug(s, ...) ;
-#define trace(pc, sp, op) ;
 #endif
 
 #define pdie(s) {perror(s); exit(1);}
 #define die(s, ...) {fprintf(stderr, s, ##__VA_ARGS__); exit(1);}
-
-#define read16(fd, c, i) {\
-               read(fd, &c, 1); \
-               i = 256*c;       \
-               read(fd, &c, 1); \
-               i += c;          \
-       }
+#endif
 
 #endif