Merge pull request #692 from ops/cbmkernal_stage2

Update library to use cbm_kernal.inc for kernal entry points

diff --git a/libsrc/c128/kernal.s b/libsrc/c128/kernal.s
index f3b78d00bbc8e73a42c3d6bddc5c2017ea168b7b..266f86911a54ab36be625928d325e8477306ba2c 100644 (file)
--- a/libsrc/c128/kernal.s
+++ b/libsrc/c128/kernal.s
@@ -4,6 +4,8 @@
 ; C128 kernal functions
 ;
 
+        .include "cbm_kernal.inc"
+
         .export         C64MODE
         .export         SWAPPER
         .export         SETBNK
@@ -51,50 +53,8 @@
 
 ;-----------------------------------------------------------------------------
 ; All functions are available in the kernal jump table
- 
+
 ; Extended jump table
 C64MODE         = $FF4D
 SWAPPER         = $FF5F
 SETBNK          = $FF68
-
-;
-CINT            = $FF81
-IOINIT          = $FF84
-RAMTAS          = $FF87
-RESTOR          = $FF8A
-VECTOR          = $FF8D
-SETMSG          = $FF90
-SECOND          = $FF93
-TKSA            = $FF96
-MEMTOP          = $FF99
-MEMBOT          = $FF9C
-SCNKEY          = $FF9F
-SETTMO          = $FFA2
-ACPTR           = $FFA5
-CIOUT           = $FFA8
-UNTLK           = $FFAB
-UNLSN           = $FFAE
-LISTEN          = $FFB1
-TALK            = $FFB4
-READST          = $FFB7
-SETLFS          = $FFBA
-SETNAM          = $FFBD
-OPEN            = $FFC0
-CLOSE           = $FFC3
-CHKIN           = $FFC6
-CKOUT           = $FFC9
-CLRCH           = $FFCC
-BASIN           = $FFCF
-BSOUT           = $FFD2
-LOAD            = $FFD5
-SAVE            = $FFD8
-SETTIM          = $FFDB
-RDTIM           = $FFDE
-STOP            = $FFE1
-GETIN           = $FFE4
-CLALL           = $FFE7
-UDTIM           = $FFEA
-SCREEN          = $FFED
-PLOT            = $FFF0
-IOBASE          = $FFF3
-

diff --git a/libsrc/c16/kernal.s b/libsrc/c16/kernal.s
index 7ba27b62c67200f04e825179d4371e7b733a768f..f814b2c1fcd32719a9a38a2b48c8ac168ebf89e2 100644 (file)
--- a/libsrc/c16/kernal.s
+++ b/libsrc/c16/kernal.s
@@ -4,6 +4,8 @@
 ; C16 kernal functions
 ;
 
+        .include "cbm_kernal.inc"
+
         .export         CINT
         .export         IOINIT
         .export         RAMTAS
@@ -42,48 +44,3 @@
         .export         SCREEN
         .export         PLOT
         .export         IOBASE
-
-
-;-----------------------------------------------------------------------------
-; All functions are available in the kernal jump table
-
-CINT            = $FF81
-IOINIT          = $FF84
-RAMTAS          = $FF87
-RESTOR          = $FF8A
-VECTOR          = $FF8D
-SETMSG          = $FF90
-SECOND          = $FF93
-TKSA            = $FF96
-MEMTOP          = $FF99
-MEMBOT          = $FF9C
-SCNKEY          = $FF9F
-SETTMO          = $FFA2
-ACPTR           = $FFA5
-CIOUT           = $FFA8
-UNTLK           = $FFAB
-UNLSN           = $FFAE
-LISTEN          = $FFB1
-TALK            = $FFB4
-READST          = $FFB7
-SETLFS          = $FFBA
-SETNAM          = $FFBD
-OPEN            = $FFC0
-;CLOSE          = $FFC3
-CHKIN           = $FFC6
-CKOUT           = $FFC9
-CLRCH           = $FFCC
-BASIN           = $FFCF
-BSOUT           = $FFD2
-LOAD            = $FFD5
-SAVE            = $FFD8
-SETTIM          = $FFDB
-RDTIM           = $FFDE
-STOP            = $FFE1
-GETIN           = $FFE4
-CLALL           = $FFE7
-UDTIM           = $FFEA
-SCREEN          = $FFED
-PLOT            = $FFF0
-IOBASE          = $FFF3
-

diff --git a/libsrc/c64/kernal.s b/libsrc/c64/kernal.s
index a4eaad0d7e3f0ce8e15215d65c2b948ce821e911..acbf223703ae5164a7897d5b8c95ef29a29bb7e1 100644 (file)
--- a/libsrc/c64/kernal.s
+++ b/libsrc/c64/kernal.s
@@ -4,6 +4,8 @@
 ; C64 kernal functions
 ;
 
+        .include "cbm_kernal.inc"
+
         .export         CINT
         .export         IOINIT
         .export         RAMTAS
@@ -42,47 +44,3 @@
         .export         UDTIM
         .export         SCREEN
         .export         IOBASE
-
-
-;-----------------------------------------------------------------------------
-; All functions are available in the kernal jump table
-
-CINT            = $FF81
-IOINIT          = $FF84
-RAMTAS          = $FF87
-RESTOR          = $FF8A
-VECTOR          = $FF8D
-SETMSG          = $FF90
-SECOND          = $FF93
-TKSA            = $FF96
-MEMTOP          = $FF99
-MEMBOT          = $FF9C
-SCNKEY          = $FF9F
-SETTMO          = $FFA2
-ACPTR           = $FFA5
-CIOUT           = $FFA8
-UNTLK           = $FFAB
-UNLSN           = $FFAE
-LISTEN          = $FFB1
-TALK            = $FFB4
-READST          = $FFB7
-SETLFS          = $FFBA
-SETNAM          = $FFBD
-OPEN            = $FFC0
-CLOSE           = $FFC3
-CHKIN           = $FFC6
-CKOUT           = $FFC9
-CLRCH           = $FFCC
-BASIN           = $FFCF
-BSOUT           = $FFD2
-LOAD            = $FFD5
-SAVE            = $FFD8
-SETTIM          = $FFDB
-RDTIM           = $FFDE
-STOP            = $FFE1
-GETIN           = $FFE4
-CLALL           = $FFE7
-UDTIM           = $FFEA
-SCREEN          = $FFED
-IOBASE          = $FFF3
-

diff --git a/libsrc/cbm510/kernal.s b/libsrc/cbm510/kernal.s
index 9ea4f0e96272ea8c85e2f78ef589fb1595cdabf0..921bf524eb032952702805a6b4c79fe8b055bc35 100644 (file)
--- a/libsrc/cbm510/kernal.s
+++ b/libsrc/cbm510/kernal.s
@@ -4,9 +4,10 @@
 ; CBM610 kernal functions
 ;
 
+        .include "cbm_kernal.inc"
+
         .export         CINT
         .export         IOINIT
-        .export         RAMTAS
         .export         RESTOR
         .export         VECTOR
         .export         SETMSG
@@ -34,50 +35,3 @@
         .export         GETIN
         .export         CLALL
         .export         PLOT
-
-
-;-----------------------------------------------------------------------------
-; All functions are available in the kernal jump table. Functions having
-; replacements (usually short ones where the overhead of the cross bank call
-; is not worth the trouble) are commented out.
-
-CINT            = $FF81
-IOINIT          = $FF84
-RAMTAS          = $FF87
-RESTOR          = $FF8A
-VECTOR          = $FF8D
-SETMSG          = $FF90
-SECOND          = $FF93
-TKSA            = $FF96
-MEMTOP          = $FF99
-MEMBOT          = $FF9C
-SCNKEY          = $FF9F
-SETTMO          = $FFA2
-ACPTR           = $FFA5
-CIOUT           = $FFA8
-UNTLK           = $FFAB
-UNLSN           = $FFAE
-LISTEN          = $FFB1
-TALK            = $FFB4
-;READST         = $FFB7
-SETLFS          = $FFBA
-;SETNAM         = $FFBD
-;OPEN           = $FFC0
-;CLOSE          = $FFC3
-CHKIN           = $FFC6
-CKOUT           = $FFC9
-CLRCH           = $FFCC
-BASIN           = $FFCF
-BSOUT           = $FFD2
-LOAD            = $FFD5
-SAVE            = $FFD8
-;SETTIM         = $FFDB
-;RDTIM          = $FFDE
-STOP            = $FFE1
-GETIN           = $FFE4
-CLALL           = $FFE7
-;UDTIM          = $FFEA
-;SCREEN         = $FFED
-PLOT            = $FFF0
-;IOBASE         = $FFF3
-

diff --git a/libsrc/cbm610/kernal.s b/libsrc/cbm610/kernal.s
index 9ea4f0e96272ea8c85e2f78ef589fb1595cdabf0..921bf524eb032952702805a6b4c79fe8b055bc35 100644 (file)
--- a/libsrc/cbm610/kernal.s
+++ b/libsrc/cbm610/kernal.s
@@ -4,9 +4,10 @@
 ; CBM610 kernal functions
 ;
 
+        .include "cbm_kernal.inc"
+
         .export         CINT
         .export         IOINIT
-        .export         RAMTAS
         .export         RESTOR
         .export         VECTOR
         .export         SETMSG
@@ -34,50 +35,3 @@
         .export         GETIN
         .export         CLALL
         .export         PLOT
-
-
-;-----------------------------------------------------------------------------
-; All functions are available in the kernal jump table. Functions having
-; replacements (usually short ones where the overhead of the cross bank call
-; is not worth the trouble) are commented out.
-
-CINT            = $FF81
-IOINIT          = $FF84
-RAMTAS          = $FF87
-RESTOR          = $FF8A
-VECTOR          = $FF8D
-SETMSG          = $FF90
-SECOND          = $FF93
-TKSA            = $FF96
-MEMTOP          = $FF99
-MEMBOT          = $FF9C
-SCNKEY          = $FF9F
-SETTMO          = $FFA2
-ACPTR           = $FFA5
-CIOUT           = $FFA8
-UNTLK           = $FFAB
-UNLSN           = $FFAE
-LISTEN          = $FFB1
-TALK            = $FFB4
-;READST         = $FFB7
-SETLFS          = $FFBA
-;SETNAM         = $FFBD
-;OPEN           = $FFC0
-;CLOSE          = $FFC3
-CHKIN           = $FFC6
-CKOUT           = $FFC9
-CLRCH           = $FFCC
-BASIN           = $FFCF
-BSOUT           = $FFD2
-LOAD            = $FFD5
-SAVE            = $FFD8
-;SETTIM         = $FFDB
-;RDTIM          = $FFDE
-STOP            = $FFE1
-GETIN           = $FFE4
-CLALL           = $FFE7
-;UDTIM          = $FFEA
-;SCREEN         = $FFED
-PLOT            = $FFF0
-;IOBASE         = $FFF3
-

diff --git a/libsrc/vic20/kernal.s b/libsrc/vic20/kernal.s
index 040dbf5e51df086adf38c805c3f6d4f38e4f9e36..ff16a019c0405be78ba246a9f1d0514eb5db96be 100644 (file)
--- a/libsrc/vic20/kernal.s
+++ b/libsrc/vic20/kernal.s
@@ -4,6 +4,8 @@
 ; VIC20 kernal functions
 ;
 
+        .include "cbm_kernal.inc"
+
         .export         CINT
         .export         IOINIT
         .export         RAMTAS
@@ -42,47 +44,3 @@
         .export         UDTIM
         .export         SCREEN
         .export         IOBASE
-
-
-;-----------------------------------------------------------------------------
-; All functions are available in the kernal jump table
-
-CINT            = $E518         ; No entries are in the kernal jump table of the Vic20 for these three (3) functions.
-IOINIT          = $FDF9         ; The entries for these functions have been set to point directly to the functions 
-RAMTAS          = $FD8D         ; in the kernal to maintain compatibility with the other Commodore platforms.
-RESTOR          = $FF8A
-VECTOR          = $FF8D
-SETMSG          = $FF90
-SECOND          = $FF93
-TKSA            = $FF96
-MEMTOP          = $FF99
-MEMBOT          = $FF9C
-SCNKEY          = $FF9F
-SETTMO          = $FFA2
-ACPTR           = $FFA5
-CIOUT           = $FFA8
-UNTLK           = $FFAB
-UNLSN           = $FFAE
-LISTEN          = $FFB1
-TALK            = $FFB4
-READST          = $FFB7
-SETLFS          = $FFBA
-SETNAM          = $FFBD
-OPEN            = $FFC0
-CLOSE           = $FFC3
-CHKIN           = $FFC6
-CKOUT           = $FFC9
-CLRCH           = $FFCC
-BASIN           = $FFCF
-BSOUT           = $FFD2
-LOAD            = $FFD5
-SAVE            = $FFD8
-SETTIM          = $FFDB
-RDTIM           = $FFDE
-STOP            = $FFE1
-GETIN           = $FFE4
-CLALL           = $FFE7
-UDTIM           = $FFEA
-SCREEN          = $FFED
-IOBASE          = $FFF3
-