From 28f26991ac66cc2e0aee4a222d8b2b8701fb3077 Mon Sep 17 00:00:00 2001
From: Marco van den Heuvel <blackystardust68@yahoo.com>
Date: Sat, 21 Apr 2018 09:52:50 -0700
Subject: [PATCH] Updated c128 accelerator code and documentation.

---
 doc/c64.sgml                 |  6 +--
 doc/funcref.sgml             | 86 ++++++++++++++++++------------------
 libsrc/c64/acc_c128_speed.s  |  3 +-
 libsrc/c64/acc_detect_c128.s |  7 ++-
 4 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/doc/c64.sgml b/doc/c64.sgml
index 03a03974c..c2c9551b4 100644
--- a/doc/c64.sgml
+++ b/doc/c64.sgml
@@ -175,14 +175,14 @@ The functions listed below are accelerator functions for the C64. See the <url
 url="funcref.html" name="function reference"> for declaration and usage.
 
 <itemize>
-<item>detect_c64dtv
 <item>detect_c128
+<item>detect_c64dtv
 <item>detect_scpu
-<item>get_c64dtv_speed
 <item>get_c128_speed
+<item>get_c64dtv_speed
 <item>get_scpu_speed
-<item>set_c64dtv_speed
 <item>set_c128_speed
+<item>set_c64dtv_speed
 <item>set_scpu_speed
 </itemize>
 
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 17a42b103..75028b7b6 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -68,14 +68,14 @@ function.
 <sect1><tt/accelerator.h/<label id="accelerator.h"><p>
 
 <itemize>
-<item><ref id="detect_c64dtv" name="detect_c64dtv">
 <item><ref id="detect_c128" name="detect_c128">
+<item><ref id="detect_c64dtv" name="detect_c64dtv">
 <item><ref id="detect_scpu" name="detect_scpu">
-<item><ref id="get_c64dtv_speed" name="get_c64dtv_speed">
 <item><ref id="get_c128_speed" name="get_c128_speed">
+<item><ref id="get_c64dtv_speed" name="get_c64dtv_speed">
 <item><ref id="get_scpu_speed" name="get_scpu_speed">
+<item><ref id="set_c128_speed" name="set_c128_speed">
 <item><ref id="set_c64dtv_speed" name="set_c64dtv_speed">
-<item><ref id="set_c128_speed" name="set_c64dtv_speed">
 <item><ref id="set_scpu_speed" name="set_scpu_speed">
 </itemize>
 
@@ -2926,41 +2926,41 @@ used in presence of a prototype.
 </quote>
 
 
-<sect1>detect_c64dtv<label id="detect_c64dtv"><p>
+<sect1>detect_c128<label id="detect_c128"><p>
 
 <quote>
 <descrip>
-<tag/Function/Check for the presence of the C64DTV.
+<tag/Function/Check for the presence of a C128 in C64 mode.
 <tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
-<tag/Declaration/<tt/unsigned char detect_c64dtv (void);/
-<tag/Description/The function returns a 1 if a C64DTV has been detected.
+<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/Notes/<itemize>
 <item>The function is specific to the C64.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
 <tag/See also/
-<ref id="get_c64dtv_speed" name="get_c64dtv_speed">,
-<ref id="set_c64dtv_speed" name="set_c64dtv_speed">,
+<ref id="get_c128_speed" name="get_c128_speed">,
+<ref id="set_c128_speed" name="set_c128_speed">,
 <tag/Example/None.
 </descrip>
 </quote>
 
 
-<sect1>detect_c128<label id="detect_c128"><p>
+<sect1>detect_c64dtv<label id="detect_c64dtv"><p>
 
 <quote>
 <descrip>
-<tag/Function/Check for the presence of a C128 in C64 mode.
+<tag/Function/Check for the presence of the C64DTV.
 <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/Declaration/<tt/unsigned char detect_c64dtv (void);/
+<tag/Description/The function returns a 1 if a C64DTV has been detected.
 <tag/Notes/<itemize>
 <item>The function is specific to the C64.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
 <tag/See also/
-<ref id="get_c128_speed" name="get_c128_speed">,
-<ref id="set_c128_speed" name="set_c128_speed">,
+<ref id="get_c64dtv_speed" name="get_c64dtv_speed">,
+<ref id="set_c64dtv_speed" name="set_c64dtv_speed">,
 <tag/Example/None.
 </descrip>
 </quote>
@@ -3525,45 +3525,45 @@ header files define constants that can be used to check the return code.
 </quote>
 
 
-<sect1>get_c64dtv_speed<label id="get_c64dtv_speed"><p>
+<sect1>get_c128_speed<label id="get_c128_speed"><p>
 
 <quote>
 <descrip>
-<tag/Function/Get the current speed of the C64DTV.
+<tag/Function/Get the current speed of the C128 in C64 mode.
 <tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
-<tag/Declaration/<tt/unsigned char get_c64dtv_speed (void);/
-<tag/Description/The function returns the current speed of the C64DTV.
+<tag/Declaration/<tt/unsigned char get_c128_speed (void);/
+<tag/Description/The function returns the current speed of the C128 in C64 mode.
 <tag/Notes/<itemize>
 <item>The function is specific to the C64.
-<item>The function does not check for the presence of the C64DTV.
+<item>The function does not check for the presence of a C128 in C64 mode.
 <item>See the accelerator.h header for the speed definitions.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
 <tag/See also/
-<ref id="detect_c64dtv" name="detect_c64dtv">,
-<ref id="set_c64dtv_speed" name="set_c64dtv_speed">,
+<ref id="detect_c128" name="detect_c128">,
+<ref id="set_c128_speed" name="set_c128_speed">,
 <tag/Example/None.
 </descrip>
 </quote>
 
 
-<sect1>get_c128_speed<label id="get_c128_speed"><p>
+<sect1>get_c64dtv_speed<label id="get_c64dtv_speed"><p>
 
 <quote>
 <descrip>
-<tag/Function/Get the current speed of the C128 in C64 mode.
+<tag/Function/Get the current speed of the C64DTV.
 <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/Declaration/<tt/unsigned char get_c64dtv_speed (void);/
+<tag/Description/The function returns the current speed of the C64DTV.
 <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 does not check for the presence of the C64DTV.
 <item>See the accelerator.h header for the speed definitions.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
 <tag/See also/
-<ref id="detect_c128" name="detect_c128">,
-<ref id="set_c128_speed" name="set_c128_speed">,
+<ref id="detect_c64dtv" name="detect_c64dtv">,
+<ref id="set_c64dtv_speed" name="set_c64dtv_speed">,
 <tag/Example/None.
 </descrip>
 </quote>
@@ -6142,45 +6142,45 @@ clean-up when exitting the program.
 </quote>
 
 
-<sect1>set_c64dtv_speed<label id="set_c64dtv_speed"><p>
+<sect1>set_c128_speed<label id="set_c128_speed"><p>
 
 <quote>
 <descrip>
-<tag/Function/Set the current speed of the C64DTV.
+<tag/Function/Set the current speed of a C128 in C64 mode.
 <tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ set_c64dtv_speed (unsigned char speed);/
-<tag/Description/The function returns the speed after trying to set the speed of the C64DTV.
+<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/Notes/<itemize>
 <item>The function is specific to the C64.
-<item>The function does not check for the presence of the C64DTV.
+<item>The function does not check for the presence of a C128 in C64 mode.
 <item>See the accelerator.h header for the speed definitions.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
 <tag/See also/
-<ref id="detect_c64dtv" name="detect_c64dtv">,
-<ref id="get_c64dtv_speed" name="get_c64dtv_speed">,
+<ref id="detect_c128" name="detect_c128">,
+<ref id="get_c128_speed" name="get_c128_speed">,
 <tag/Example/None.
 </descrip>
 </quote>
 
 
-<sect1>set_c128_speed<label id="set_c128_speed"><p>
+<sect1>set_c64dtv_speed<label id="set_c64dtv_speed"><p>
 
 <quote>
 <descrip>
-<tag/Function/Set the current speed of a C128 in C64 mode.
+<tag/Function/Set the current speed of the C64DTV.
 <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/Declaration/<tt/unsigned char __fastcall__ set_c64dtv_speed (unsigned char speed);/
+<tag/Description/The function returns the speed after trying to set the speed of the C64DTV.
 <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 does not check for the presence of the C64DTV.
 <item>See the accelerator.h header for the speed definitions.
 </itemize>
 <tag/Availability/cc65 (not all platforms)
 <tag/See also/
-<ref id="detect_c128" name="detect_c128">,
-<ref id="get_c128_speed" name="get_c128_speed">,
+<ref id="detect_c64dtv" name="detect_c64dtv">,
+<ref id="get_c64dtv_speed" name="get_c64dtv_speed">,
 <tag/Example/None.
 </descrip>
 </quote>
diff --git a/libsrc/c64/acc_c128_speed.s b/libsrc/c64/acc_c128_speed.s
index 4ec23b1da..4cb2630fa 100755
--- a/libsrc/c64/acc_c128_speed.s
+++ b/libsrc/c64/acc_c128_speed.s
@@ -38,13 +38,12 @@ _set_c128_speed:
         bcs     high_speed
 store_speed:
         sta     C128_VICIIE_CLK
-        jmp     _get_c128_speed
 
+        .byte   $2C              ; skip over the lda #$01
 high_speed:
         lda     #$01
         bne     store_speed
 
-
 _get_c128_speed:
         lda     C128_VICIIE_CLK
         and     #$01
diff --git a/libsrc/c64/acc_detect_c128.s b/libsrc/c64/acc_detect_c128.s
index 591ff6c59..71996730e 100755
--- a/libsrc/c64/acc_detect_c128.s
+++ b/libsrc/c64/acc_detect_c128.s
@@ -21,13 +21,16 @@ _detect_c128:
 
 ; Make sure the CPU is a 8502
         .byte   $1A                   ; NOP on 8502, INA on 65(S)C(E)02, 4510 and 65816
-        bne     not_found
+        beq     found
+        .byte   $3A                   ; decrement A again, so a #$00 can be returned
+        rts
+
+found:
 
 ; Make sure a C128 VICIIe is present
         ldy     C128_VICIIE_CLK
         cpy     #$FF
         beq     not_found
-found:
         lda     #$01
 not_found:
         rts
-- 
2.39.5