Added c64dtv accelerator code and documentation.

diff --git a/asminc/accelerator.inc b/asminc/accelerator.inc
index f86ce8b2d5f408ea7224280caa3bc52afe94d422..1008b49c1c3d2aabfae39c33a58ca27c68857881 100644 (file)
--- a/asminc/accelerator.inc
+++ b/asminc/accelerator.inc
@@ -32,3 +32,11 @@ SuperCPU_Fast       := $D07B
 SuperCPU_Speed_Mode := $D0B8
 SuperCPU_Detect     := $D0BC
 
+
+; ---------------------------------------------------------------------------
+; C64DTV
+
+C64DTV_Extended_Regs := $D03F
+
+C64DTV_Slow = $00
+C64DTV_Fast = $03

diff --git a/doc/c64.sgml b/doc/c64.sgml
index 05b87a22bb6500b231dbf19899dcb10a85572a63..f1e678c7260687e31adcd4b2f714d50753ff5a0b 100644 (file)
--- a/doc/c64.sgml
+++ b/doc/c64.sgml
@@ -175,9 +175,12 @@ 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_scpu
-<item>scpu_get_speed
-<item>scpu_set_speed
+<item>get_c64dtv_speed
+<item>get_scpu_speed
+<item>set_c64dtv_speed
+<item>set_scpu_speed
 </itemize>
 
 

diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index e47a0c0a9ebe00094159ee003a21e03393ec6ba5..4dfbf29e06bb87324980ab1def1ecad77ae93663 100644 (file)
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -68,8 +68,11 @@ function.
 <sect1><tt/accelerator.h/<label id="accelerator.h"><p>
 
 <itemize>
+<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_scpu_speed" name="get_scpu_speed">
+<item><ref id="set_c64dtv_speed" name="set_c64dtv_speed">
 <item><ref id="set_scpu_speed" name="set_scpu_speed">
 </itemize>
 
@@ -2920,6 +2923,26 @@ used in presence of a prototype.
 </quote>
 
 
+<sect1>detect_c64dtv<label id="detect_c64dtv"><p>
+
+<quote>
+<descrip>
+<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_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_scpu_speed" name="get_c64dtv_speed">,
+<ref id="set_scpu_speed" name="set_c64dtv_speed">,
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>detect_scpu<label id="detect_scpu"><p>
 
 <quote>
@@ -3479,6 +3502,28 @@ header files define constants that can be used to check the return code.
 </quote>
 
 
+<sect1>get_c64dtv_speed<label id="get_c64dtv_speed"><p>
+
+<quote>
+<descrip>
+<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_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 the cartridge.
+<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">,
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>get_scpu_speed<label id="get_scpu_speed"><p>
 
 <quote>
@@ -6052,6 +6097,28 @@ clean-up when exitting the program.
 </quote>
 
 
+<sect1>set_c64dtv_speed<label id="set_c64dtv_speed"><p>
+
+<quote>
+<descrip>
+<tag/Function/Set the current speed of the C64DTV.
+<tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
+<tag/Declaration/<tt/unsigned char 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 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_c64dtv" name="detect_c64dtv">,
+<ref id="get_c64dtv_speed" name="get_c64dtv_speed">,
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>set_scpu_speed<label id="set_scpu_speed"><p>
 
 <quote>

diff --git a/include/accelerator.h b/include/accelerator.h
index 7d1244233a5f1bc700481c36448cd8b94086d23a..336bbb036aea0124c58171ea4a7cca7f578e844b 100644 (file)
--- a/include/accelerator.h
+++ b/include/accelerator.h
@@ -98,5 +98,43 @@ extern unsigned char detect_scpu (void);
  * 0x01  : SuperCPU cartridge present
  */
 
+
+/* C64DTV */
+
+extern unsigned char __fastcall__ set_c64dtv_speed (unsigned char speed);
+
+/* Set the speed of the C64DTV, using SPEED_SLOW will switch to
+ * slow mode, SPEED_2X or SPEED_FAST will switch to 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 switch should not fail.
+ *
+ * This function does not check for the presence of the C64DTV,
+ * make sure you use 'detect_c64dtv();' before using.
+ */
+
+extern unsigned char get_c64dtv_speed (void);
+
+/* Get the speed of the C64DTV.
+ *
+ * Possible return values:
+ * SPEED_1X    : slow mode
+ * SPEED_2X    : fast mode
+ *
+ * This function does not check for the presence of the C64DTV,
+ * make sure you use 'detect_c64dtv();' before using.
+ */
+
+extern unsigned char detect_c64dtv (void);
+
+/* Check for the presence of the C64DTV.
+ *
+ * Possible return values:
+ * 0x00  : C64DTV not present
+ * 0x01  : C64DTV present
+ */
+
 /* End of accelerator.h */
 #endif

diff --git a/libsrc/c64/acc_c64dtv_speed.s b/libsrc/c64/acc_c64dtv_speed.s
new file mode 100755 (executable)
index 0000000..9cf4967
--- /dev/null
+++ b/libsrc/c64/acc_c64dtv_speed.s
@@ -0,0 +1,64 @@
+;
+; Marco van den Heuvel, 2018-04-14
+;
+
+; extern unsigned char __fastcall__ set_c64dtv_speed (unsigned char speed);
+;
+;/* Set the speed of the C64DTV, using SPEED_SLOW will switch to
+; * slow mode, SPEED_2X or SPEED_FAST will switch to 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 this should not happen.
+; *
+; * This function does not check for the presence of the C64DTV,
+; * make sure you use 'detect_c64dtv();' before using.
+; */
+
+; extern unsigned char get_c64dtv_speed (void);
+;
+;/* Get the speed of the C64DTV.
+; *
+; * Possible return values:
+; * SPEED_1X    : slow mode
+; * SPEED_2X    : fast mode
+; *
+; * This function does not check for the presence of the C64DTV,
+; * make sure you use 'detect_c64dtv();' before using.
+; */
+
+        .export         _set_c64dtv_speed
+        .export         _get_c64dtv_speed
+
+        .include        "accelerator.inc"
+
+_set_c64dtv_speed:
+        cmp     #SPEED_2X
+        bcs     high_speed
+low_speed:
+        ldx     #C64DTV_Slow
+set_speed:
+        .byte   $32,$99               ; SAC #$99   set accumulator to reg 9 (cpu control)
+        txa                           ; (re)set skip and burst bits
+        .byte   $32,$00               ; SAC #$99   set accumulator back to reg 0
+        jmp     _get_c64dtv_speed
+
+high_speed:
+        ldx     #C64DTV_Fast
+        bne     set_speed
+
+
+_get_c64dtv_speed:
+        .byte   $32,$99               ; SAC #$99   set accumulator to reg 9 (cpu control)
+        tax
+        .byte   $32,$00               ; SAC #$99   set accumulator back to reg 0
+        txa
+        and     #C64DTV_Fast
+        bne     in_fast_mode
+        lda     #$00
+        .byte   $2C
+in_fast_mode:
+        lda     #$01
+        ldx     #$00
+        rts

diff --git a/libsrc/c64/acc_detect_c64dtv.s b/libsrc/c64/acc_detect_c64dtv.s
new file mode 100755 (executable)
index 0000000..ce30806
--- /dev/null
+++ b/libsrc/c64/acc_detect_c64dtv.s
@@ -0,0 +1,43 @@
+;
+; Marco van den Heuvel, 2018-04-14
+;
+
+; unsigned char detect_c64dtv (void);
+;
+;/* Check for the presence of the C64DTV.
+; *
+; * Possible return values:
+; * 0x00  : C64DTV not present
+; * 0x01  : C64DTV present
+; */
+
+        .export         _detect_c64dtv
+
+        .include        "accelerator.inc"
+
+_detect_c64dtv:
+        ldy     C64DTV_Extended_Regs
+        lda     #$00
+        tax
+
+; Make sure the CPU is a 6510
+        .byte   $1A                   ; NOP on 8502, INA on 65(S)C(E)02, 4510 and 65816
+        bne     not_found
+        lda     #$01
+        sta     C64DTV_Extended_Regs
+
+; Check if $D000 is mirrored at $D040
+        lda     $D040
+        cmp     $D000
+        bne     found
+        inc     $D040
+        cmp     $D000
+        bne     not_found
+found:
+        lda     #$01
+        .byte   $2C
+not_found:
+        lda     #$00
+        sty     C64DTV_Extended_Regs
+        rts
+

diff --git a/testcode/lib/accelerator/Makefile b/testcode/lib/accelerator/Makefile
index ece54ec363247632003c1c2d5fea585f31ae375a..a9fe5f78d75dcfadcdf5c1686aa454dcf03f4da7 100644 (file)
--- a/testcode/lib/accelerator/Makefile
+++ b/testcode/lib/accelerator/Makefile
@@ -1,9 +1,13 @@
 CL ?= cl65
 
-all: c64-scpu-test.prg c128-scpu-test.prg
+all: c64-scpu-test.prg c128-scpu-test.prg c64dtv-test.prg
 
 c64-scpu-test.prg: c64-c128-scpu-test.c
        $(CL) -t c64 c64-c128-scpu-test.c -o c64-scpu-test.prg
 
 c128-scpu-test.prg: c64-c128-scpu-test.c
        $(CL) -t c128 c64-c128-scpu-test.c -o c128-scpu-test.prg
+
+c64dtv-test.prg: c64dtv-test.c
+       $(CL) -t c64 c64dtv-test.c -o c64dtv-test.prg
+

diff --git a/testcode/lib/accelerator/c64dtv-test.c b/testcode/lib/accelerator/c64dtv-test.c
new file mode 100755 (executable)
index 0000000..34f0410
--- /dev/null
+++ b/testcode/lib/accelerator/c64dtv-test.c
@@ -0,0 +1,8 @@
+/* C64DTV accelerator test code. */
+
+#define ACC_DETECT      detect_c64dtv
+#define ACC_GET_SPEED   get_c64dtv_speed
+#define ACC_SET_SPEED   set_c64dtv_speed
+#define ACC_NAME        "C64DTV"
+
+#include "turbo-test.c"