From 43a98024737ed6f7bd2b16e69278118bfe2455ca Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Wed, 30 Mar 2005 18:26:11 +0000
Subject: [PATCH] Predefined #defines have changed. Cosmetic changes.

git-svn-id: svn://svn.cc65.org/cc65/trunk@3434 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 include/cbm510.h | 62 +++++++++++++++++++++++++++---------------------
 include/cbm610.h |  2 +-
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/include/cbm510.h b/include/cbm510.h
index 3755ade92..7883e9cc6 100644
--- a/include/cbm510.h
+++ b/include/cbm510.h
@@ -45,6 +45,12 @@
 
 
 
+/*****************************************************************************/
+/*                                   Data				     */
+/*****************************************************************************/
+
+
+
 /* Additional key defines */
 #define CH_F1			224
 #define CH_F2			225
@@ -67,8 +73,6 @@
 #define CH_F19			242
 #define CH_F20			243
 
-
-
 /* Color defines */
 #define COLOR_BLACK  	       	0x00
 #define COLOR_WHITE  	       	0x01
@@ -88,31 +92,6 @@
 #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);
-
-#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"),       \
-        __AX__
-#endif
-
-
-
 /* Define hardware */
 #include <_vic2.h>
 #define VIC    	(*(struct __vic2*)0xD800)
@@ -132,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
 
diff --git a/include/cbm610.h b/include/cbm610.h
index e1b4a9df8..88c5d3171 100644
--- a/include/cbm610.h
+++ b/include/cbm610.h
@@ -108,7 +108,7 @@ 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__)
+#if defined(__OPT_i__) && (__OPT_i__ >= 600)
 #define peekbsys(addr)          \
         __AX__ = (addr),        \
         asm ("sta ptr1"),       \