From e69bc65cf1f7b117af190774f692c4e99feb5ba9 Mon Sep 17 00:00:00 2001 From: Olli Savia Date: Sun, 25 Nov 2018 10:28:37 +0200 Subject: [PATCH] Moved kernal entries to cbm_kernal.inc --- asminc/c128.inc | 14 -------------- asminc/c64.inc | 8 -------- asminc/cbm_kernal.inc | 25 +++++++++++++++++++++++++ asminc/plus4.inc | 9 --------- asminc/vic20.inc | 7 ------- 5 files changed, 25 insertions(+), 38 deletions(-) diff --git a/asminc/c128.inc b/asminc/c128.inc index 7a98d770c..2852631f3 100644 --- a/asminc/c128.inc +++ b/asminc/c128.inc @@ -45,20 +45,6 @@ KBDREPEAT := $028a KBDREPEATRATE := $028b KBDREPEATDELAY := $028c -; --------------------------------------------------------------------------- -; Kernal routines - -; Direct entries -CURS_SET := $CD57 -CURS_ON := $CD6F -CURS_OFF := $CD9F -CLRSCR := $C142 -KBDREAD := $C006 -NEWLINE := $C363 -PRINT := $C322 -NMIEXIT := $FF33 -INDFET := $FF74 - ; --------------------------------------------------------------------------- ; Vectors diff --git a/asminc/c64.inc b/asminc/c64.inc index c12f8e64b..1d10f673d 100644 --- a/asminc/c64.inc +++ b/asminc/c64.inc @@ -37,14 +37,6 @@ KBDREPEAT := $28a KBDREPEATRATE := $28b KBDREPEATDELAY := $28c -; --------------------------------------------------------------------------- -; Kernal routines - -; Direct entries -CLRSCR := $E544 -KBDREAD := $E5B4 -NMIEXIT := $FEBC - ; --------------------------------------------------------------------------- ; Vector and other locations diff --git a/asminc/cbm_kernal.inc b/asminc/cbm_kernal.inc index 4e2e927e4..29a6e5ddf 100644 --- a/asminc/cbm_kernal.inc +++ b/asminc/cbm_kernal.inc @@ -82,3 +82,28 @@ UDTIM := $FFEA PLOT := $FFF0 IOBASE := $FFF3 .endif + +; --------------------------------------------------------------------------- +; Kernal routines, direct entries + +.if .def(__VIC20__) + CLRSCR := $E55F + KBDREAD := $E5CF +.elseif .def(__C64__) + CLRSCR := $E544 + KBDREAD := $E5B4 + NMIEXIT := $FEBC +.elseif .def(__C128__) + CLRSCR := $C142 + KBDREAD := $C006 + NMIEXIT := $FF33 + NEWLINE := $C363 + PRINT := $C322 + CURS_SET := $CD57 + CURS_ON := $CD6F + CURS_OFF := $CD9F + INDFET := $FF74 +.elseif .def(__C16__) + CLRSCR := $D88B + KBDREAD := $D8C1 +.endif diff --git a/asminc/plus4.inc b/asminc/plus4.inc index 5ea4dcf88..774722e93 100644 --- a/asminc/plus4.inc +++ b/asminc/plus4.inc @@ -37,13 +37,6 @@ KBDREPEAT := $540 KBDREPEATRATE := $541 KBDREPEATDELAY := $542 -; --------------------------------------------------------------------------- -; Kernal routines - -; Direct entries -CLRSCR := $D88B -KBDREAD := $D8C1 - ; --------------------------------------------------------------------------- ; Vector and other locations @@ -90,5 +83,3 @@ TED_RAMSEL := $FF3F ENABLE_ROM := TED_ROMSEL ENABLE_RAM := TED_RAMSEL - - diff --git a/asminc/vic20.inc b/asminc/vic20.inc index 5976981fd..b82874f56 100644 --- a/asminc/vic20.inc +++ b/asminc/vic20.inc @@ -41,13 +41,6 @@ KBDREPEATDELAY := $28c XSIZE = 22 YSIZE = 23 -; --------------------------------------------------------------------------- -; Kernal routines - -; Direct entries -CLRSCR := $E55F -KBDREAD := $E5CF - ; --------------------------------------------------------------------------- ; Vector and other locations -- 2.39.5