Fix toggle_videomode, move kernal entries to kernal.s

git-svn-id: svn://svn.cc65.org/cc65/trunk@2034 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/c128/c128.inc b/libsrc/c128/c128.inc
index aed393980133dcf93b00400ca8c4935af3e502de..49b808c8a0f7f887bfe8b636f5d4287152b495c3 100644 (file)
--- a/libsrc/c128/c128.inc
+++ b/libsrc/c128/c128.inc
@@ -47,11 +47,6 @@ KBDREAD              = $C006
 NEWLINE                = $C363
 PRINT          = $C322
 
-; Extended jump table  
-C64MODE                = $FF4D
-SWAPPER                = $FF5F
-SETBNK          = $FF68
-
 ; ---------------------------------------------------------------------------
 ; Vectors
 

diff --git a/libsrc/c128/c64mode.s b/libsrc/c128/c64mode.s
index 88a632d36520377edbe1824c66f56448a9bc9630..bc3f9d36ca9b517c71e61055fad2ef7d54ceebf7 100644 (file)
--- a/libsrc/c128/c64mode.s
+++ b/libsrc/c128/c64mode.s
@@ -6,8 +6,7 @@
 ;
 
        .export         _c64mode
-
-       .include        "c128.inc"
+        .import         C64MODE
 
                _c64mode        = C64MODE
 

diff --git a/libsrc/c128/kernal.s b/libsrc/c128/kernal.s
index 4f7b201800558a1c80fe148c4335e63682ccc199..7a6ff28229514309476faaad039f6af3d2d02423 100644 (file)
--- a/libsrc/c128/kernal.s
+++ b/libsrc/c128/kernal.s
@@ -4,6 +4,10 @@
 ; C128 kernal functions
 ;
 
+        .export         C64MODE
+        .export         SWAPPER
+        .export         SETBNK
+
         .export         CINT
         .export         IOINIT
         .export         RAMTAS
@@ -47,7 +51,13 @@
 
 ;-----------------------------------------------------------------------------
 ; All functions are available in the kernal jump table
+ 
+; Extended jump table
+C64MODE                = $FF4D
+SWAPPER                = $FF5F
+SETBNK          = $FF68
 
+;
 CINT           = $FF81
 IOINIT         = $FF84
 RAMTAS         = $FF87

diff --git a/libsrc/c128/toggle_videomode.s b/libsrc/c128/toggle_videomode.s
index 873e38eb1b26c013fe57550ec931eb19e651242d..15931d60b1706f0a4bea10037b52035af24a9a90 100644 (file)
--- a/libsrc/c128/toggle_videomode.s
+++ b/libsrc/c128/toggle_videomode.s
@@ -6,10 +6,9 @@
 ;
 
        .export         _toggle_videomode
+        .import         SWAPPER, BSOUT
 
-       .include        "c128.inc"
-
-.proc   _toggle_videomode 
+.proc   _toggle_videomode
 
         jsr     SWAPPER                 ; Toggle the mode
        lda     #14