Merge https://github.com/cc65/cc65

[cc65] / include / cbm610.h

diff --git a/include/cbm610.h b/include/cbm610.h
index 84ea12eceb445e67430c1ebc24e5d9e8e751981b..de7aa50f84c646b8e53b028ae6df0d248628a2c1 100644 (file)
--- a/include/cbm610.h
+++ b/include/cbm610.h
@@ -85,7 +85,8 @@
 #define SID     (*(struct __sid*)0xDA00)
 
 #include <_6526.h>
-#define CIA     (*(struct __6526*)0xDC00)
+#define CIA1    (*(struct __6526*)0xDB00)
+#define CIA2    (*(struct __6526*)0xDC00)
 
 #include <_6551.h>
 #define ACIA    (*(struct __6551*)0xDD00)
@@ -138,17 +139,15 @@ void __fastcall__ pokewsys (unsigned addr, unsigned val);
 
 
 /* The following #defines will cause the matching functions calls in conio.h
- * to be overlaid by macros with the same names, saving the function call
- * overhead.
- */
+** to be overlaid by macros with the same names, saving the function call
+** overhead.
+*/
 #define _textcolor(color)       COLOR_WHITE
 #define _bgcolor(color)         COLOR_BLACK
 #define _bordercolor(color)     COLOR_BLACK
+#define _cpeekcolor(color)      COLOR_WHITE
 
 
 
 /* End of cbm610.h */
 #endif
-
-
-