again, some TABs slipped into the code...

[cc65] / include / cbm610.h

diff --git a/include/cbm610.h b/include/cbm610.h
index e1b4a9df82c4d4f023e2413d913d608f2c652f35..de7aa50f84c646b8e53b028ae6df0d248628a2c1 100644 (file)
--- a/include/cbm610.h
+++ b/include/cbm610.h
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                 cbm610.h                                 */
+/*                                 cbm610.h                                  */
 /*                                                                           */
-/*                    CBM610 system specific definitions                    */
+/*                    CBM610 system specific definitions                     */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -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 __cia*)0xDC00)
+#define CIA1    (*(struct __6526*)0xDB00)
+#define CIA2    (*(struct __6526*)0xDC00)
 
 #include <_6551.h>
 #define ACIA    (*(struct __6551*)0xDD00)
@@ -97,7 +98,19 @@
 
 
 /*****************************************************************************/
-/*                                   Code                                   */
+/*                                 Variables                                 */
+/*****************************************************************************/
+
+
+
+/* The addresses of the static drivers */
+extern void cbm610_ram_emd[];
+extern void cbm610_std_ser[];
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -108,35 +121,33 @@ unsigned __fastcall__ peekwsys (unsigned addr);
 void __fastcall__ pokebsys (unsigned addr, unsigned char val);
 void __fastcall__ pokewsys (unsigned addr, unsigned val);
 
-#if defined(__OPT_i__) && defined(__OPT_s__)
-#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"),       \
+#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
 
 
 
 /* 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
-
-
-