Merge pull request #626 from blackystardust/master

[cc65] / include / cbm610.h

diff --git a/include/cbm610.h b/include/cbm610.h
index aa401c205e121f53ae52fab93bb55def2e9689fc..de7aa50f84c646b8e53b028ae6df0d248628a2c1 100644 (file)
--- a/include/cbm610.h
+++ b/include/cbm610.h
@@ -1,8 +1,8 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                 cbm610.h                                 */
+/*                                 cbm610.h                                  */
 /*                                                                           */
-/*                    CBM610 system specific definitions                    */
+/*                    CBM610 system specific definitions                     */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
@@ -46,7 +46,7 @@
 
 
 /*****************************************************************************/
-/*                                   Data                                   */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
@@ -74,18 +74,19 @@
 #define CH_F20                  243
 
 /* Color defines */
-#define COLOR_BLACK                    0x00
-#define COLOR_WHITE                    0x01
+#define COLOR_BLACK             0x00
+#define COLOR_WHITE             0x01
 
 /* Define hardware */
 #include <_6545.h>
 #define CRTC    (*(struct __6545)0xD800)
 
 #include <_sid.h>
-#define SID    (*(struct __sid*)0xDA00)
+#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)
@@ -103,13 +104,13 @@
 
 
 /* The addresses of the static drivers */
-extern void cbm610_ram[];
-extern void cbm610_stdser[];
+extern void cbm610_ram_emd[];
+extern void cbm610_std_ser[];
 
 
 
 /*****************************************************************************/
-/*                                   Code                                   */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -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
-
-
-