From cc2bcb8a4db2b659a9a173c53761b77e8c603fb6 Mon Sep 17 00:00:00 2001
From: Marco van den Heuvel <blackystardust68@yahoo.com>
Date: Mon, 23 Apr 2018 19:25:11 -0700
Subject: [PATCH] Changed c128 accelerator code and documention to include both
 C64 and C128 support.

---
 doc/c128.sgml                            |  7 ++-
 doc/funcref.sgml                         | 22 +++++-----
 include/accelerator.h                    | 20 ++++-----
 libsrc/c128/acc_c128_speed.s             | 56 ++++++++++++++++++++++++
 libsrc/c128/acc_detect_c128.s            | 24 ++++++++++
 libsrc/c64/acc_c128_speed.s              | 50 +--------------------
 testcode/lib/accelerator/Makefile        |  6 ++-
 testcode/lib/accelerator/c64-c128-test.c |  2 +-
 8 files changed, 114 insertions(+), 73 deletions(-)
 create mode 100755 libsrc/c128/acc_c128_speed.s
 create mode 100755 libsrc/c128/acc_detect_c128.s

diff --git a/doc/c128.sgml b/doc/c128.sgml
index 9af66d62b..1bdcf01f5 100644
--- a/doc/c128.sgml
+++ b/doc/c128.sgml
@@ -94,9 +94,12 @@ The functions listed below are accelerator functions for the C128. See the <url
 url="funcref.html" name="function reference"> for declaration and usage.
 
 <itemize>
+<item>detect_c128
 <item>detect_scpu
-<item>scpu_get_speed
-<item>scpu_set_speed
+<item>get_c128_speed
+<item>get_scpu_speed
+<item>set_c128_speed
+<item>set_scpu_speed
 </itemize>
 
 
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 75028b7b6..55701cf55 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -2930,12 +2930,12 @@ used in presence of a prototype.
 
 <quote>
 <descrip>
-<tag/Function/Check for the presence of a C128 in C64 mode.
+<tag/Function/Check if a C128 CPU is the current CPU.
 <tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
 <tag/Declaration/<tt/unsigned char detect_c128 (void);/
-<tag/Description/The function returns a 1 if a C128 in C64 mode has been detected.
+<tag/Description/The function returns a 1 if a C128 CPU is the current CPU.
 <tag/Notes/<itemize>
-<item>The function is specific to the C64.
+<item>The function is specific to the C64 and C128.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
 <tag/See also/
@@ -3529,13 +3529,13 @@ header files define constants that can be used to check the return code.
 
 <quote>
 <descrip>
-<tag/Function/Get the current speed of the C128 in C64 mode.
+<tag/Function/Get the current speed of the C128 CPU.
 <tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
 <tag/Declaration/<tt/unsigned char get_c128_speed (void);/
-<tag/Description/The function returns the current speed of the C128 in C64 mode.
+<tag/Description/The function returns the current speed of the C128 CPU.
 <tag/Notes/<itemize>
-<item>The function is specific to the C64.
-<item>The function does not check for the presence of a C128 in C64 mode.
+<item>The function is specific to the C64 and C128.
+<item>The function does not check if the C128 CPU is the current CPU.
 <item>See the accelerator.h header for the speed definitions.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
@@ -6146,13 +6146,13 @@ clean-up when exitting the program.
 
 <quote>
 <descrip>
-<tag/Function/Set the current speed of a C128 in C64 mode.
+<tag/Function/Set the current speed of a C128 CPU.
 <tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
 <tag/Declaration/<tt/unsigned char __fastcall__ set_c128_speed (unsigned char speed);/
-<tag/Description/The function returns the speed after trying to set the speed of the C128 in C64 mode.
+<tag/Description/The function returns the speed after trying to set the speed of the C128 CPU.
 <tag/Notes/<itemize>
-<item>The function is specific to the C64.
-<item>The function does not check for the presence of a C128 in C64 mode.
+<item>The function is specific to the C64 and C128.
+<item>The function does not check if the C128 CPU is the current CPU.
 <item>See the accelerator.h header for the speed definitions.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
diff --git a/include/accelerator.h b/include/accelerator.h
index 0e3ba6e36..0fa202bc6 100644
--- a/include/accelerator.h
+++ b/include/accelerator.h
@@ -137,11 +137,11 @@ extern unsigned char detect_c64dtv (void);
  */
 
 
-/* C128 in C64 mode */
+/* C128 8502 CPU */
 
 extern unsigned char __fastcall__ set_c128_speed (unsigned char speed);
 
-/* Set the speed of the C128 CPU, using SPEED_SLOW will switch to
+/* Set the speed of the C128 8502 CPU, using SPEED_SLOW will switch to
  * 1 Mhz (slow) mode, SPEED_2X or SPEED_FAST will switch to 2Mhz (fast) mode.
  *
  * Note that any value higher or equal to SPEED_2X will switch to fast mode.
@@ -149,29 +149,29 @@ extern unsigned char __fastcall__ set_c128_speed (unsigned char speed);
  * This function will return the actual speed the CPU is at after trying
  * to set the requested speed, to my knowledge the switching should not fail.
  *
- * This function does not check for the presence of a C128 in C64 mode,
- * make sure you use 'detect_c128();' before using.
+ * This function does not check if the C128 CPU is the current CPU, make sure
+ * you use 'detect_c128();' before using.
  */
 
 extern unsigned char get_c128_speed (void);
 
-/* Get the speed of the C128 CPU.
+/* Get the speed of the C128 8502 CPU.
  *
  * Possible return values:
  * SPEED_SLOW  : Slow mode
  * SPEED_2X    : Fast mode
  *
- * This function does not check for the presence of a C128 in C64 mode,
- * make sure you use 'detect_c128();' before using.
+ * This function does not check if the C128 CPU is the current CPU, make sure
+ * you use 'detect_c128();' before using.
  */
 
 extern unsigned char detect_c128 (void);
 
-/* Check for the presence of a C128 in C64 mode.
+/* Check if the C128 CPU is the current CPU.
  *
  * Possible return values:
- * 0x00  : C128 in C64 mode not present
- * 0x01  : C128 in C64 mode present
+ * 0x00  : C128 CPU is not the current CPU
+ * 0x01  : C128 CPU is the current CPU
  */
 
 /* End of accelerator.h */
diff --git a/libsrc/c128/acc_c128_speed.s b/libsrc/c128/acc_c128_speed.s
new file mode 100755
index 000000000..c3012b2c8
--- /dev/null
+++ b/libsrc/c128/acc_c128_speed.s
@@ -0,0 +1,56 @@
+;
+; Marco van den Heuvel, 2018-04-23
+;
+
+; extern unsigned char __fastcall__ set_c128_speed (unsigned char speed);
+;
+;/* Set the speed of the C128 8502 CPU, using SPEED_SLOW will switch to
+; * 1 Mhz (slow) mode, SPEED_2X or SPEED_FAST will switch to 2Mhz (fast) mode.
+; *
+; * Note that any value higher or equal to SPEED_2X will switch to fast mode.
+; *
+; * This function will return the actual speed the CPU is at after trying
+; * to set the requested speed, to my knowledge the switching should not fail.
+; *
+; * For C64 programs a check for a C128 in C64 mode is needed, make sure you
+; * use 'detect_c128();' before using.
+; *
+; * For C128 programs no detect function call is needed.
+; */
+
+; extern unsigned char get_c128_speed (void);
+;
+;/* Get the speed of the C128 8502 CPU.
+; *
+; * Possible return values:
+; * SPEED_SLOW  : Slow mode
+; * SPEED_2X    : Fast mode
+; *
+; * For C64 programs a check for a C128 in C64 mode is needed, make sure you
+; * use 'detect_c128();' before using.
+; *
+; * For C128 programs no detect function call is needed.
+; */
+
+        .export         _set_c128_speed
+        .export         _get_c128_speed
+
+        .include        "accelerator.inc"
+
+_set_c128_speed:
+        cmp     #SPEED_2X
+        bcs     high_speed
+store_speed:
+        sta     C128_VICIIE_CLK
+
+        .byte   $2C              ; skip over the lda #$01
+high_speed:
+        lda     #$01
+        bne     store_speed
+
+_get_c128_speed:
+        lda     C128_VICIIE_CLK
+        and     #$01
+        ldx     #$00
+        rts
+
diff --git a/libsrc/c128/acc_detect_c128.s b/libsrc/c128/acc_detect_c128.s
new file mode 100755
index 000000000..f40fe395a
--- /dev/null
+++ b/libsrc/c128/acc_detect_c128.s
@@ -0,0 +1,24 @@
+;
+; Marco van den Heuvel, 2018-04-23
+;
+
+; unsigned char detect_c128 (void);
+;
+;/* Check if the C128 8502 CPU is the current CPU.
+; *
+; * Possible return values:
+; * 0x00  : C128 8502 is not the current CPU
+; * 0x01  : C128 8502 is the current CPU
+; */
+
+        .export         _detect_c128
+
+        .include        "accelerator.inc"
+
+_detect_c128:
+        ldx     #$00
+        lda     #$01
+
+; Make sure the CPU is a 8502
+        .byte   $3A                   ; NOP on 8502, DEA on 65(S)C(E)02, 4510 and 65816
+        rts
diff --git a/libsrc/c64/acc_c128_speed.s b/libsrc/c64/acc_c128_speed.s
index 4cb2630fa..bdd559412 100755
--- a/libsrc/c64/acc_c128_speed.s
+++ b/libsrc/c64/acc_c128_speed.s
@@ -1,52 +1,6 @@
 ;
-; Marco van den Heuvel, 2018-04-20
+; Marco van den Heuvel, 2018-04-23
 ;
 
-; extern unsigned char __fastcall__ set_c128_speed (unsigned char speed);
-;
-;/* Set the speed of the C128 CPU, using SPEED_SLOW will switch to
-; * 1 Mhz (slow) mode, SPEED_2X or SPEED_FAST will switch to 2Mhz (fast) mode.
-; *
-; * Note that any value higher or equal to SPEED_2X will switch to fast mode.
-; *
-; * This function will return the actual speed the CPU is at after trying
-; * to set the requested speed, to my knowledge the switching should not fail.
-; *
-; * This function does not check for the presence of a C128 in C64 mode,
-; * make sure you use 'detect_c128();' before using.
-; */
-
-; extern unsigned char get_c128_speed (void);
-;
-;/* Get the speed of the C128 CPU.
-; *
-; * Possible return values:
-; * SPEED_SLOW  : Slow mode
-; * SPEED_2X    : Fast mode
-; *
-; * This function does not check for the presence of a C128 in C64 mode,
-; * make sure you use 'detect_c128();' before using.
-; */
-
-        .export         _set_c128_speed
-        .export         _get_c128_speed
-
-        .include        "accelerator.inc"
-
-_set_c128_speed:
-        cmp     #SPEED_2X
-        bcs     high_speed
-store_speed:
-        sta     C128_VICIIE_CLK
-
-        .byte   $2C              ; skip over the lda #$01
-high_speed:
-        lda     #$01
-        bne     store_speed
-
-_get_c128_speed:
-        lda     C128_VICIIE_CLK
-        and     #$01
-        ldx     #$00
-        rts
+.include "../c128/acc_c128_speed.s"
 
diff --git a/testcode/lib/accelerator/Makefile b/testcode/lib/accelerator/Makefile
index c6423e44f..121ad57b8 100644
--- a/testcode/lib/accelerator/Makefile
+++ b/testcode/lib/accelerator/Makefile
@@ -1,6 +1,7 @@
 CL ?= cl65
 
-all: c64-scpu-test.prg c128-scpu-test.prg c64dtv-test.prg c64-c128-test.prg
+all:	c64-scpu-test.prg c128-scpu-test.prg c64dtv-test.prg \
+	c64-c128-test.prg c128-test.prg
 
 c64-scpu-test.prg: c64-c128-scpu-test.c
 	$(CL) -t c64 c64-c128-scpu-test.c -o c64-scpu-test.prg
@@ -13,3 +14,6 @@ c64dtv-test.prg: c64dtv-test.c
 
 c64-c128-test.prg: c64-c128-test.c
 	$(CL) -t c64 c64-c128-test.c -o c64-c128-test.prg
+
+c128-test.prg: c64-c128-test.c
+	$(CL) -t c128 c64-c128-test.c -o c128-test.prg
diff --git a/testcode/lib/accelerator/c64-c128-test.c b/testcode/lib/accelerator/c64-c128-test.c
index fd20a665e..ba212e03d 100755
--- a/testcode/lib/accelerator/c64-c128-test.c
+++ b/testcode/lib/accelerator/c64-c128-test.c
@@ -3,6 +3,6 @@
 #define ACC_DETECT      detect_c128
 #define ACC_GET_SPEED   get_c128_speed
 #define ACC_SET_SPEED   set_c128_speed
-#define ACC_NAME        "C128 in C64 mode"
+#define ACC_NAME        "C128 CPU"
 
 #include "turbo-test.c"