dont use seperate file for charset data

diff --git a/libsrc/c64/soft80_charset.s b/libsrc/c64/soft80_charset.s
deleted file mode 100644 (file)
index 999d199..0000000
--- a/libsrc/c64/soft80_charset.s
+++ /dev/null
@@ -1,137 +0,0 @@
-
-.byte $0f,$03,$0f,$00,$0f,$07,$05,$0e
-.byte $0f,$05,$0e,$0b,$0f,$0b,$0f,$0f
-.byte $0f,$0b,$0f,$0b,$07,$07,$0e,$00
-.byte $00,$0f,$0e,$0f,$0c,$0b,$03,$03
-.byte $0f,$0b,$05,$05,$0b,$05,$0b,$0b
-.byte $0d,$07,$0f,$0f,$0f,$0f,$0f,$0d
-.byte $0b,$0b,$0b,$0b,$05,$01,$0b,$01
-.byte $0b,$0b,$0f,$0f,$0d,$0f,$07,$0b
-.byte $0b,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$09,$07,$03,$0b,$0f
-.byte $0f,$0b,$03,$0b,$03,$01,$01,$0b
-.byte $05,$01,$09,$05,$07,$05,$05,$0b
-.byte $03,$0b,$03,$0b,$01,$05,$05,$05
-.byte $05,$05,$01,$0b,$07,$0b,$0f,$0a
-
-.byte $0f,$03,$0f,$0f,$0f,$07,$05,$0e
-.byte $0f,$0a,$0e,$0b,$0f,$0b,$0f,$0f
-.byte $0f,$0b,$0f,$0b,$07,$07,$0e,$00
-.byte $00,$0f,$0e,$0f,$0c,$0b,$03,$03
-.byte $0f,$0b,$05,$05,$09,$05,$05,$0b
-.byte $0b,$0b,$05,$0b,$0f,$0f,$0f,$0d
-.byte $05,$0b,$05,$05,$05,$07,$05,$05
-.byte $05,$05,$0f,$0f,$0b,$0f,$0b,$05
-.byte $05,$0f,$07,$0f,$0d,$0f,$09,$0f
-.byte $07,$0b,$0d,$07,$03,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0b,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0b,$07,$0b,$0b,$0b
-.byte $0f,$0b,$05,$05,$05,$07,$07,$05
-.byte $05,$0b,$0d,$05,$07,$01,$01,$05
-.byte $05,$05,$05,$05,$0b,$05,$05,$05
-.byte $05,$05,$0d,$0b,$07,$0b,$0f,$0a
-
-.byte $0f,$03,$0f,$0f,$0f,$07,$0a,$0e
-.byte $0f,$05,$0e,$0b,$0f,$0b,$0f,$0f
-.byte $0f,$0b,$0f,$0b,$07,$07,$0e,$0f
-.byte $00,$0f,$0d,$0f,$0c,$0b,$03,$03
-.byte $0f,$0b,$05,$00,$07,$0d,$0b,$07
-.byte $0b,$0b,$0b,$0b,$0f,$0f,$0f,$0b
-.byte $01,$03,$0d,$0d,$05,$03,$07,$0d
-.byte $05,$05,$0b,$0b,$0b,$08,$0b,$0d
-.byte $01,$0b,$07,$09,$0d,$0b,$0b,$09
-.byte $07,$0f,$0f,$07,$0b,$05,$03,$0b
-.byte $03,$09,$03,$09,$01,$05,$05,$05
-.byte $05,$05,$01,$0b,$0b,$0b,$05,$0b
-.byte $0f,$05,$05,$07,$05,$07,$07,$07
-.byte $05,$0b,$0d,$03,$07,$01,$01,$05
-.byte $05,$05,$05,$07,$0b,$05,$05,$05
-.byte $0b,$05,$0b,$0b,$0b,$0b,$0a,$05
-
-.byte $09,$03,$0f,$0f,$0f,$07,$0a,$0e
-.byte $0f,$0a,$0e,$08,$0f,$08,$03,$0f
-.byte $08,$00,$00,$03,$07,$07,$0e,$0f
-.byte $0f,$0f,$05,$0f,$0c,$03,$03,$03
-.byte $0f,$0b,$0f,$05,$0b,$0b,$0b,$0f
-.byte $0b,$0b,$01,$01,$0f,$01,$0f,$0b
-.byte $05,$0b,$0b,$0b,$01,$0d,$03,$0b
-.byte $0b,$09,$0f,$0f,$07,$0f,$0d,$0b
-.byte $01,$0d,$03,$07,$09,$05,$01,$05
-.byte $03,$03,$0d,$05,$0b,$01,$05,$05
-.byte $05,$05,$05,$07,$0b,$05,$05,$05
-.byte $05,$05,$0d,$0b,$0b,$0b,$05,$00
-.byte $00,$01,$03,$07,$05,$03,$03,$01
-.byte $01,$0b,$0d,$03,$07,$05,$01,$05
-.byte $03,$05,$03,$0b,$0b,$05,$05,$01
-.byte $0b,$0b,$0b,$00,$0b,$0b,$05,$05
-
-.byte $09,$03,$00,$0f,$0f,$07,$05,$0e
-.byte $05,$05,$0e,$08,$0c,$08,$03,$0f
-.byte $08,$00,$00,$03,$07,$07,$0e,$0f
-.byte $0f,$0f,$03,$03,$0f,$03,$0f,$0c
-.byte $0f,$0f,$0f,$00,$0d,$07,$04,$0f
-.byte $0b,$0b,$0b,$0b,$0f,$0f,$0f,$0b
-.byte $05,$0b,$07,$0d,$0d,$0d,$05,$0b
-.byte $05,$0d,$0f,$0f,$0b,$08,$0b,$0b
-.byte $07,$09,$05,$07,$05,$01,$0b,$05
-.byte $05,$0b,$0d,$03,$0b,$01,$05,$05
-.byte $05,$05,$07,$0b,$0b,$05,$05,$01
-.byte $0b,$05,$0b,$0b,$0b,$0b,$0f,$00
-.byte $00,$05,$05,$07,$05,$07,$07,$05
-.byte $05,$0b,$0d,$03,$07,$05,$01,$05
-.byte $07,$05,$03,$0d,$0b,$05,$05,$01
-.byte $0b,$0b,$0b,$00,$07,$0b,$05,$0a
-
-.byte $0f,$03,$00,$0f,$0f,$07,$05,$0e
-.byte $05,$0a,$0e,$0b,$0c,$0f,$0b,$0f
-.byte $0b,$0f,$0b,$0b,$07,$07,$0e,$0f
-.byte $0f,$00,$03,$03,$0f,$0f,$0f,$0c
-.byte $0f,$0f,$0f,$05,$03,$05,$05,$0f
-.byte $0b,$0b,$05,$0b,$0b,$0f,$0b,$07
-.byte $05,$0b,$07,$05,$0d,$05,$05,$0b
-.byte $05,$05,$0b,$0b,$0b,$0f,$0b,$0f
-.byte $05,$05,$05,$07,$05,$07,$0b,$09
-.byte $05,$0b,$0d,$05,$0b,$05,$05,$05
-.byte $03,$09,$07,$0d,$0b,$05,$0b,$01
-.byte $05,$09,$07,$0b,$0d,$0b,$0f,$0b
-.byte $0f,$05,$05,$05,$05,$07,$07,$05
-.byte $05,$0b,$05,$05,$07,$05,$05,$05
-.byte $07,$0b,$05,$05,$0b,$05,$0b,$05
-.byte $05,$0b,$07,$0b,$07,$0b,$05,$0a
-
-.byte $0f,$03,$00,$0f,$0f,$07,$0a,$0e
-.byte $0a,$05,$0e,$0b,$0c,$0f,$0b,$00
-.byte $0b,$0f,$0b,$0b,$07,$07,$0e,$0f
-.byte $0f,$00,$07,$03,$0f,$0f,$0f,$0c
-.byte $0f,$0b,$0f,$05,$0b,$05,$08,$0f
-.byte $0d,$07,$0f,$0f,$0b,$0f,$0b,$07
-.byte $0b,$01,$01,$0b,$0d,$0b,$0b,$0b
-.byte $0b,$0b,$0f,$0b,$0d,$0f,$07,$0b
-.byte $0b,$09,$03,$09,$09,$09,$0b,$0d
-.byte $05,$01,$0d,$05,$01,$05,$05,$0b
-.byte $07,$0d,$07,$03,$0d,$09,$0b,$05
-.byte $05,$0d,$01,$09,$0d,$03,$0f,$0b
-.byte $0f,$05,$03,$0b,$03,$01,$07,$0b
-.byte $05,$01,$0b,$05,$01,$05,$05,$0b
-.byte $07,$0d,$05,$0b,$0b,$0b,$0b,$05
-.byte $05,$0b,$01,$0b,$0b,$0b,$05,$05
-
-.byte $0f,$03,$00,$0f,$00,$07,$0a,$0e
-.byte $0a,$0a,$0e,$0b,$0c,$0f,$0b,$00
-.byte $0b,$0f,$0b,$0b,$07,$07,$0e,$0f
-.byte $0f,$00,$0f,$03,$0f,$0f,$0f,$0c
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$07,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$07,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$03
-.byte $0f,$0f,$03,$0f,$0f,$0f,$0f,$0f
-.byte $07,$0d,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$03,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
-.byte $0f,$0f,$0f,$0b,$0b,$0b,$0f,$05
-

diff --git a/libsrc/c64/soft80_conio.s b/libsrc/c64/soft80_conio.s
index fd2d7fd4d59c0232114b049f3302d357428be772..84e5157c8909685d2606726264382bdd686cfc53 100644 (file)
--- a/libsrc/c64/soft80_conio.s
+++ b/libsrc/c64/soft80_conio.s
@@ -84,6 +84,140 @@ soft80_shutdown:
         sta     VIC_VIDEO_ADR
         rts
 
+        .rodata
 soft80_charset:
-        .include "soft80_charset.s"
+        .byte $0f,$03,$0f,$00,$0f,$07,$05,$0e
+        .byte $0f,$05,$0e,$0b,$0f,$0b,$0f,$0f
+        .byte $0f,$0b,$0f,$0b,$07,$07,$0e,$00
+        .byte $00,$0f,$0e,$0f,$0c,$0b,$03,$03
+        .byte $0f,$0b,$05,$05,$0b,$05,$0b,$0b
+        .byte $0d,$07,$0f,$0f,$0f,$0f,$0f,$0d
+        .byte $0b,$0b,$0b,$0b,$05,$01,$0b,$01
+        .byte $0b,$0b,$0f,$0f,$0d,$0f,$07,$0b
+        .byte $0b,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$09,$07,$03,$0b,$0f
+        .byte $0f,$0b,$03,$0b,$03,$01,$01,$0b
+        .byte $05,$01,$09,$05,$07,$05,$05,$0b
+        .byte $03,$0b,$03,$0b,$01,$05,$05,$05
+        .byte $05,$05,$01,$0b,$07,$0b,$0f,$0a
 
+        .byte $0f,$03,$0f,$0f,$0f,$07,$05,$0e
+        .byte $0f,$0a,$0e,$0b,$0f,$0b,$0f,$0f
+        .byte $0f,$0b,$0f,$0b,$07,$07,$0e,$00
+        .byte $00,$0f,$0e,$0f,$0c,$0b,$03,$03
+        .byte $0f,$0b,$05,$05,$09,$05,$05,$0b
+        .byte $0b,$0b,$05,$0b,$0f,$0f,$0f,$0d
+        .byte $05,$0b,$05,$05,$05,$07,$05,$05
+        .byte $05,$05,$0f,$0f,$0b,$0f,$0b,$05
+        .byte $05,$0f,$07,$0f,$0d,$0f,$09,$0f
+        .byte $07,$0b,$0d,$07,$03,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0b,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0b,$07,$0b,$0b,$0b
+        .byte $0f,$0b,$05,$05,$05,$07,$07,$05
+        .byte $05,$0b,$0d,$05,$07,$01,$01,$05
+        .byte $05,$05,$05,$05,$0b,$05,$05,$05
+        .byte $05,$05,$0d,$0b,$07,$0b,$0f,$0a
+
+        .byte $0f,$03,$0f,$0f,$0f,$07,$0a,$0e
+        .byte $0f,$05,$0e,$0b,$0f,$0b,$0f,$0f
+        .byte $0f,$0b,$0f,$0b,$07,$07,$0e,$0f
+        .byte $00,$0f,$0d,$0f,$0c,$0b,$03,$03
+        .byte $0f,$0b,$05,$00,$07,$0d,$0b,$07
+        .byte $0b,$0b,$0b,$0b,$0f,$0f,$0f,$0b
+        .byte $01,$03,$0d,$0d,$05,$03,$07,$0d
+        .byte $05,$05,$0b,$0b,$0b,$08,$0b,$0d
+        .byte $01,$0b,$07,$09,$0d,$0b,$0b,$09
+        .byte $07,$0f,$0f,$07,$0b,$05,$03,$0b
+        .byte $03,$09,$03,$09,$01,$05,$05,$05
+        .byte $05,$05,$01,$0b,$0b,$0b,$05,$0b
+        .byte $0f,$05,$05,$07,$05,$07,$07,$07
+        .byte $05,$0b,$0d,$03,$07,$01,$01,$05
+        .byte $05,$05,$05,$07,$0b,$05,$05,$05
+        .byte $0b,$05,$0b,$0b,$0b,$0b,$0a,$05
+
+        .byte $09,$03,$0f,$0f,$0f,$07,$0a,$0e
+        .byte $0f,$0a,$0e,$08,$0f,$08,$03,$0f
+        .byte $08,$00,$00,$03,$07,$07,$0e,$0f
+        .byte $0f,$0f,$05,$0f,$0c,$03,$03,$03
+        .byte $0f,$0b,$0f,$05,$0b,$0b,$0b,$0f
+        .byte $0b,$0b,$01,$01,$0f,$01,$0f,$0b
+        .byte $05,$0b,$0b,$0b,$01,$0d,$03,$0b
+        .byte $0b,$09,$0f,$0f,$07,$0f,$0d,$0b
+        .byte $01,$0d,$03,$07,$09,$05,$01,$05
+        .byte $03,$03,$0d,$05,$0b,$01,$05,$05
+        .byte $05,$05,$05,$07,$0b,$05,$05,$05
+        .byte $05,$05,$0d,$0b,$0b,$0b,$05,$00
+        .byte $00,$01,$03,$07,$05,$03,$03,$01
+        .byte $01,$0b,$0d,$03,$07,$05,$01,$05
+        .byte $03,$05,$03,$0b,$0b,$05,$05,$01
+        .byte $0b,$0b,$0b,$00,$0b,$0b,$05,$05
+
+        .byte $09,$03,$00,$0f,$0f,$07,$05,$0e
+        .byte $05,$05,$0e,$08,$0c,$08,$03,$0f
+        .byte $08,$00,$00,$03,$07,$07,$0e,$0f
+        .byte $0f,$0f,$03,$03,$0f,$03,$0f,$0c
+        .byte $0f,$0f,$0f,$00,$0d,$07,$04,$0f
+        .byte $0b,$0b,$0b,$0b,$0f,$0f,$0f,$0b
+        .byte $05,$0b,$07,$0d,$0d,$0d,$05,$0b
+        .byte $05,$0d,$0f,$0f,$0b,$08,$0b,$0b
+        .byte $07,$09,$05,$07,$05,$01,$0b,$05
+        .byte $05,$0b,$0d,$03,$0b,$01,$05,$05
+        .byte $05,$05,$07,$0b,$0b,$05,$05,$01
+        .byte $0b,$05,$0b,$0b,$0b,$0b,$0f,$00
+        .byte $00,$05,$05,$07,$05,$07,$07,$05
+        .byte $05,$0b,$0d,$03,$07,$05,$01,$05
+        .byte $07,$05,$03,$0d,$0b,$05,$05,$01
+        .byte $0b,$0b,$0b,$00,$07,$0b,$05,$0a
+
+        .byte $0f,$03,$00,$0f,$0f,$07,$05,$0e
+        .byte $05,$0a,$0e,$0b,$0c,$0f,$0b,$0f
+        .byte $0b,$0f,$0b,$0b,$07,$07,$0e,$0f
+        .byte $0f,$00,$03,$03,$0f,$0f,$0f,$0c
+        .byte $0f,$0f,$0f,$05,$03,$05,$05,$0f
+        .byte $0b,$0b,$05,$0b,$0b,$0f,$0b,$07
+        .byte $05,$0b,$07,$05,$0d,$05,$05,$0b
+        .byte $05,$05,$0b,$0b,$0b,$0f,$0b,$0f
+        .byte $05,$05,$05,$07,$05,$07,$0b,$09
+        .byte $05,$0b,$0d,$05,$0b,$05,$05,$05
+        .byte $03,$09,$07,$0d,$0b,$05,$0b,$01
+        .byte $05,$09,$07,$0b,$0d,$0b,$0f,$0b
+        .byte $0f,$05,$05,$05,$05,$07,$07,$05
+        .byte $05,$0b,$05,$05,$07,$05,$05,$05
+        .byte $07,$0b,$05,$05,$0b,$05,$0b,$05
+        .byte $05,$0b,$07,$0b,$07,$0b,$05,$0a
+
+        .byte $0f,$03,$00,$0f,$0f,$07,$0a,$0e
+        .byte $0a,$05,$0e,$0b,$0c,$0f,$0b,$00
+        .byte $0b,$0f,$0b,$0b,$07,$07,$0e,$0f
+        .byte $0f,$00,$07,$03,$0f,$0f,$0f,$0c
+        .byte $0f,$0b,$0f,$05,$0b,$05,$08,$0f
+        .byte $0d,$07,$0f,$0f,$0b,$0f,$0b,$07
+        .byte $0b,$01,$01,$0b,$0d,$0b,$0b,$0b
+        .byte $0b,$0b,$0f,$0b,$0d,$0f,$07,$0b
+        .byte $0b,$09,$03,$09,$09,$09,$0b,$0d
+        .byte $05,$01,$0d,$05,$01,$05,$05,$0b
+        .byte $07,$0d,$07,$03,$0d,$09,$0b,$05
+        .byte $05,$0d,$01,$09,$0d,$03,$0f,$0b
+        .byte $0f,$05,$03,$0b,$03,$01,$07,$0b
+        .byte $05,$01,$0b,$05,$01,$05,$05,$0b
+        .byte $07,$0d,$05,$0b,$0b,$0b,$0b,$05
+        .byte $05,$0b,$01,$0b,$0b,$0b,$05,$05
+
+        .byte $0f,$03,$00,$0f,$00,$07,$0a,$0e
+        .byte $0a,$0a,$0e,$0b,$0c,$0f,$0b,$00
+        .byte $0b,$0f,$0b,$0b,$07,$07,$0e,$0f
+        .byte $0f,$00,$0f,$03,$0f,$0f,$0f,$0c
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$07,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$07,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$03
+        .byte $0f,$0f,$03,$0f,$0f,$0f,$0f,$0f
+        .byte $07,$0d,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$03,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0f,$0f,$0f,$0f,$0f
+        .byte $0f,$0f,$0f,$0b,$0b,$0b,$0f,$05