Merge pull request #1 from greg-king5/c128-hi-tgi

[cc65] / include / cbm510.h

diff --git a/include/cbm510.h b/include/cbm510.h
index 350527c89f0ca095d102a399df57bc0d5f77256b..3d6ccd209e7b5ce6ace65331b0f937c1b67a54c9 100644 (file)
--- a/include/cbm510.h
+++ b/include/cbm510.h
@@ -2,11 +2,11 @@
 /*                                                                           */
 /*                                 cbm510.h                                  */
 /*                                                                           */
-/*             System specific definitions for the CBM5x0 / P500             */
+/*             System-specific definitions for the CBM5x0 / P500             */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/* (C) 2001-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -92,6 +92,13 @@
 #define COLOR_LIGHTBLUE         0x0E
 #define COLOR_GRAY3             0x0F
 
+/* Masks for joy_read */
+#define JOY_UP_MASK             0x01
+#define JOY_DOWN_MASK           0x02
+#define JOY_LEFT_MASK           0x04
+#define JOY_RIGHT_MASK          0x08
+#define JOY_BTN_1_MASK          0x10
+
 /* Define hardware */
 #include <_vic2.h>
 #define VIC     (*(struct __vic2*)0xD800)
@@ -100,7 +107,7 @@
 #define SID     (*(struct __sid*)0xDA00)
 
 #include <_6526.h>
-#define CIA     (*(struct __6526*)0xDC00)
+#define CIA2    (*(struct __6526*)0xDC00)
 
 #include <_6551.h>
 #define ACIA    (*(struct __6551*)0xDD00)
@@ -118,6 +125,8 @@
 
 
 /* The addresses of the static drivers */
+extern void cbm510_inkwl_mou[];
+extern void cbm510_joy_mou[];   /* Referred to by mouse_static_stddrv[] */
 extern void cbm510_ram_emd[];
 extern void cbm510_std_joy[];   /* Referred to by joy_static_stddrv[] */
 extern void cbm510_std_ser[];