From f712e9448ade899d57ed993c8ce6351214d1c3e1 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Fri, 9 Oct 2015 13:34:23 +0200 Subject: [PATCH] some cleanup/rework --- libsrc/c64/extra/soft80.s | 5 ----- libsrc/c64/soft80_cgetc.s | 6 ++++++ libsrc/c64/soft80_color.s | 8 ++++++-- libsrc/c64/soft80_cputc.s | 2 -- libsrc/c64/soft80_kplot.s | 5 +++++ libsrc/c64/soft80_scrsize.s | 6 ++++++ 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/libsrc/c64/extra/soft80.s b/libsrc/c64/extra/soft80.s index e6b373b64..80ef338b6 100644 --- 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 723c5ade8..c68035dc5 100644 --- 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 f537f8d84..3d9cca56c 100644 --- 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 41132a346..233132dca 100644 --- 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 eaaed7596..6df33c008 100644 --- 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 caaeb4791..1873f7327 100644 --- 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