From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 24 Sep 2017 14:12:19 +0000 (+0200)
Subject: include peekpoke.h instead of re-defining the macros
X-Git-Tag: rgb2rv17~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b96e31ce140d8b3fb8931c198bdb28b476fd6eef;p=c128-kasse

include peekpoke.h instead of re-defining the macros

This is a prerequisite for the next step.
---

diff --git a/include/general.h b/include/general.h
index 768b01c..a32ddeb 100644
--- a/include/general.h
+++ b/include/general.h
@@ -1,5 +1,8 @@
 #ifndef GENERAL_H_
 #define GENERAL_H_
+
+#include <peekpoke.h>
+
 typedef unsigned char BYTE;
 typedef enum {
 	INPUT_TERMINATOR_RETURN       = (1 << 0),
@@ -12,10 +15,6 @@ char retry_or_quit(void);
 char *format_euro(char * s, int maxlen, int cent);
 void c128_perror(BYTE, char*);
 extern BYTE _oserror;
-#define POKE(addr,val)     (*(unsigned char*) (addr) = (val))
-#define POKEW(addr,val)    (*(unsigned*) (addr) = (val))
-#define PEEK(addr)         (*(unsigned char*) (addr))
-#define PEEKW(addr)        (*(unsigned*) (addr))
 
 /* C128 color codes, see PDF page 127 of
  * http://www.pagetable.com/docs/Commodore%20128%20Programmer%27s%20Reference%20Guide.pdf */