Remove this copy of the apple include file - a copy was added to asminc

[cc65] / include / cbm510.h

diff --git a/include/cbm510.h b/include/cbm510.h
index d4785d5579b411203586ffce1370fc8db8929eb0..4efd78b0648c560f1abe5940cf2a43a86487681f 100644 (file)
--- a/include/cbm510.h
+++ b/include/cbm510.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2001      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -45,6 +45,12 @@
 
 
 
+/*****************************************************************************/
+/*                                   Data                                   */
+/*****************************************************************************/
+
+
+
 /* Additional key defines */
 #define CH_F1                  224
 #define CH_F2                  225
@@ -67,14 +73,13 @@
 #define CH_F19                 242
 #define CH_F20                 243
 
-
-
 /* Color defines */
 #define COLOR_BLACK            0x00
 #define COLOR_WHITE            0x01
 #define COLOR_RED              0x02
 #define COLOR_CYAN             0x03
 #define COLOR_VIOLET           0x04
+#define COLOR_PURPLE            COLOR_VIOLET
 #define COLOR_GREEN            0x05
 #define COLOR_BLUE             0x06
 #define COLOR_YELLOW           0x07
@@ -87,25 +92,15 @@
 #define COLOR_LIGHTBLUE        0x0E
 #define COLOR_GRAY3            0x0F
 
-
-
-/* Special routines to read/write bytes and words in the system bank */
-unsigned char __fastcall__ peekbsys (unsigned addr);
-unsigned __fastcall__ peekwsys (unsigned addr);
-void __fastcall__ pokebsys (unsigned addr, unsigned char val);
-void __fastcall__ pokewsys (unsigned addr, unsigned val);
-
-
-
 /* Define hardware */
-#include <_vic.h>
-#define VIC            (*(struct __vic*)0xD800)
-                                                                 
+#include <_vic2.h>
+#define VIC            (*(struct __vic2*)0xD800)
+
 #include <_sid.h>
 #define        SID     (*(struct __sid*)0xDA00)
 
 #include <_6526.h>
-#define CIA    (*(struct __cia*)0xDC00)
+#define CIA    (*(struct __6526*)0xDC00)
 
 #include <_6551.h>
 #define ACIA   (*(struct __6551*)0xDD00)
@@ -116,6 +111,35 @@ void __fastcall__ pokewsys (unsigned addr, unsigned val);
 
 
 
+/*****************************************************************************/
+/*                                   Code                                   */
+/*****************************************************************************/
+
+
+
+/* Special routines to read/write bytes and words in the system bank */
+unsigned char __fastcall__ peekbsys (unsigned addr);
+unsigned __fastcall__ peekwsys (unsigned addr);
+void __fastcall__ pokebsys (unsigned addr, unsigned char val);
+void __fastcall__ pokewsys (unsigned addr, unsigned val);
+
+#if defined(__OPT_i__) && (__OPT_i__ >= 600)
+#define peekbsys(addr)                  \
+        __AX__ = (addr),                \
+        __asm__ ("sta ptr1"),           \
+        __asm__ ("stx ptr1+1"),         \
+        __asm__ ("ldx $01"),            \
+        __asm__ ("lda #$0F"),           \
+        __asm__ ("sta $01"),            \
+        __asm__ ("ldy #$00"),           \
+        __asm__ ("lda (ptr1),y"),       \
+        __asm__ ("stx $01"),            \
+        __asm__ ("ldx #$00"),           \
+        __AX__
+#endif
+
+
+
 /* End of cbm510.h */
 #endif