some cleanup/rework

diff --git a/libsrc/c64/extra/soft80.s b/libsrc/c64/extra/soft80.s
index e6b373b64e437340153c88c0f682ac2af4408055..80ef338b6c2824641497b5a2f901fe75e356e60f 100644 (file)
--- a/libsrc/c64/extra/soft80.s
+++ b/libsrc/c64/extra/soft80.s
@@ -51,8 +51,3 @@
         .import soft80_screensize
         .export screensize := soft80_screensize
 
-;-------------------------------------------------------------------------------
-; force the init constructor to be imported
-
-        .import soft80_init
-conio_init      = soft80_init

diff --git a/libsrc/c64/soft80_cgetc.s b/libsrc/c64/soft80_cgetc.s
index 723c5ade87eabe995a7dbdabc1a9a207a6afceb9..c68035dc59c1ff073ebc9ea7e5eadfc39bcc4690 100644 (file)
--- a/libsrc/c64/soft80_cgetc.s
+++ b/libsrc/c64/soft80_cgetc.s
@@ -67,3 +67,9 @@ invertcursor:
 
         .rodata
 nibble: .byte $f0, $0f
+
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+        .import soft80_init
+conio_init      = soft80_init

diff --git a/libsrc/c64/soft80_color.s b/libsrc/c64/soft80_color.s
index f537f8d84ffef901404073c09ce3c100f8108bbb..3d9cca56c077d6fbf22fa57a5d652ec4a768fa76 100644 (file)
--- a/libsrc/c64/soft80_color.s
+++ b/libsrc/c64/soft80_color.s
@@ -9,8 +9,6 @@
 
         .importzp       tmp1, tmp2
 
-        .import         soft80_checkchar
-
         .include        "c64.inc"
         .include        "soft80.inc"
 
@@ -107,3 +105,9 @@ __textcolor:
         .res 1
 __bgcolor:
         .res 1
+
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+        .import soft80_init
+conio_init      = soft80_init

diff --git a/libsrc/c64/soft80_cputc.s b/libsrc/c64/soft80_cputc.s
index 41132a3465d37b1fa9ee7526a80664407d3fce36..233132dca429cb046c89ce5f0c2b82cffde8efd8 100644 (file)
--- a/libsrc/c64/soft80_cputc.s
+++ b/libsrc/c64/soft80_cputc.s
@@ -410,8 +410,6 @@ soft80_putcolor:
 
         rts
 
-        ;.export soft80_checkchar
-
 ; test if there is a space or a character at current position
 ; in:  y must be $00
 ; out: CLC: space        SEC: character

diff --git a/libsrc/c64/soft80_kplot.s b/libsrc/c64/soft80_kplot.s
index eaaed75968cb818080290fb1fd8cba1b1b3c0227..6df33c00801c5f3e38a745fd17b348a41f013e55 100644 (file)
--- a/libsrc/c64/soft80_kplot.s
+++ b/libsrc/c64/soft80_kplot.s
@@ -62,3 +62,8 @@ _bitmaphi:
         .byte >(soft80_bitmap+(row*40*8))
         .endrepeat
 
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+        .import soft80_init
+conio_init      = soft80_init

diff --git a/libsrc/c64/soft80_scrsize.s b/libsrc/c64/soft80_scrsize.s
index caaeb47914faf8cd057a6d06c16ef8917f361228..1873f7327ec07b741eb71d91d78f62b1cfbcfe87 100644 (file)
--- a/libsrc/c64/soft80_scrsize.s
+++ b/libsrc/c64/soft80_scrsize.s
@@ -7,3 +7,9 @@ soft80_screensize:
         ldy     #screenrows
         ldx     #charsperline
         rts
+
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+        .import soft80_init
+conio_init      = soft80_init