added imports for conio init to conio functions, so the constructor will get linked...

diff --git a/libsrc/pce/clrscr.s b/libsrc/pce/clrscr.s
index 93628ddd8eb633d03b4064ef5903c967f22999e1..59fda4f2e8c2d5bc75adc42c918854a4800efce7 100644 (file)
--- a/libsrc/pce/clrscr.s
+++ b/libsrc/pce/clrscr.s
@@ -23,3 +23,8 @@ colloop:        lda #' '
 
                 rts
 
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+                .import initconio
+conio_init = initconio

diff --git a/libsrc/pce/color.s b/libsrc/pce/color.s
index 0ec35f5b340980cbf2c7641ca6e83be1da66099a..03d93b186ae5376613af819fcd8b6ec2464450f8 100644 (file)
--- a/libsrc/pce/color.s
+++ b/libsrc/pce/color.s
@@ -55,3 +55,9 @@ colors:               ; G      R      B
                 .word ((7<<6)+(4<<3)+(4))           ; d light green
                 .word ((4<<6)+(4<<3)+(7))           ; e light blue
                 .word ((6<<6)+(6<<3)+(6))           ; f light gray
+
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+                .import initconio
+conio_init = initconio

diff --git a/libsrc/pce/cputc.s b/libsrc/pce/cputc.s
index ec63b7565b52f3810911b73023de2278f31d7eb8..e503ee6f20f2d46d08b6f5b747e785b8ba97a12e 100644 (file)
--- a/libsrc/pce/cputc.s
+++ b/libsrc/pce/cputc.s
@@ -91,3 +91,9 @@ putchar:
                 staio VDC_DATA_HI
 
                 rts
+
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+                .import initconio
+conio_init = initconio

diff --git a/libsrc/pce/crt0.s b/libsrc/pce/crt0.s
index eab27ba5c342786651ba886c58c2f40ded4707c6..e67039d4320eadd66bd54aabfabeaf39512a57a6 100644 (file)
--- a/libsrc/pce/crt0.s
+++ b/libsrc/pce/crt0.s
@@ -149,10 +149,6 @@ start:
                 ; Call module constructors
                 jsr        initlib
 
-                ;; FIXME: this should be called from a constructor instead
-                .import initconio
-                jsr initconio
-
                 ; Pass an empty command line
                 jsr     push0                ; argc
                 jsr     push0                ; argv

diff --git a/libsrc/pce/gotoxy.s b/libsrc/pce/gotoxy.s
index 24f917cd68198b45f28300c3da9ee5647db40657..c6b937177d06978619dddf09a8694e67d359fa94 100644 (file)
--- a/libsrc/pce/gotoxy.s
+++ b/libsrc/pce/gotoxy.s
@@ -13,4 +13,9 @@ _gotoxy:
                 sta     CURS_X          ; Set X
                 jmp     plot            ; Set the cursor position
 
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+                .import initconio
+conio_init = initconio
 

diff --git a/libsrc/pce/kplot.s b/libsrc/pce/kplot.s
index beb151a7b498d30adff67a212a014a0befc9f6d2..eb4e79e04bda36cfdac24440537706b436ffd28d 100644 (file)
--- a/libsrc/pce/kplot.s
+++ b/libsrc/pce/kplot.s
@@ -29,4 +29,9 @@ _plothi:
                     .byte >($0000+(line*$80))
                 .endrepeat
 
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+                .import initconio
+conio_init = initconio
 

diff --git a/libsrc/pce/readme.txt b/libsrc/pce/readme.txt
index cd91de97a4acd938e449778a3bcf76d29f122104..c7b3aed3d192ae40f6c0390b936620e4c03bee92 100644 (file)
--- a/libsrc/pce/readme.txt
+++ b/libsrc/pce/readme.txt
@@ -13,12 +13,11 @@ get_tv() is missing
 
 some graphical petscii chars should get added to the charset
 
-conio-init should get initialized from a constructor rather than always get
-called from crt0 (which for some reason doesnt work) -> see conio.s, it should
-get linked if _any_ of the conio function is used
-
 interruptor support in crt0 (and cfg) is missing
 
+conio lacks support for different screen sizes, which could be used with
+different video modes
+
 --------------------------------------------------------------------------------
 
 a good emulator to use for PC-Engine is "mednafen" (mednafen.sourceforge.net)

diff --git a/libsrc/pce/revers.s b/libsrc/pce/revers.s
index c39a9f8439b458d30789983e955be3bdcea314aa..d3e6f893096f3d171bcb8086178e172875a201b8 100644 (file)
--- a/libsrc/pce/revers.s
+++ b/libsrc/pce/revers.s
@@ -1,5 +1,13 @@
 
+; FIXME: actual revers output is not supported yet
+
             .export _revers
 _revers:
             lda #0
             rts
+
+;-------------------------------------------------------------------------------
+; force the init constructor to be imported
+
+                .import initconio
+conio_init = initconio

diff --git a/libsrc/pce/scrsize.s b/libsrc/pce/scrsize.s
index 6e2b84a4149ee2df1fb58ec0b897a65d36357ef6..254676aae23d3b8ff7a9409faf4182378a0cad0a 100644 (file)
--- a/libsrc/pce/scrsize.s
+++ b/libsrc/pce/scrsize.s
@@ -8,6 +8,8 @@ _screensize:
                 ldy     ysize
                 rts
 
+; FIXME: changing the video mode allows for different screen sizes
+
 .rodata
                 .export xsize, ysize
 

diff --git a/testcode/lib/pce/conio.c b/testcode/lib/pce/conio.c
index 0c5c89c57a7551081c2c10eadc20b199e0ca4cc9..993d935972de82801c74a643e9828d979e4cae9b 100644 (file)
--- a/testcode/lib/pce/conio.c
+++ b/testcode/lib/pce/conio.c
@@ -42,7 +42,7 @@ void main(void)
         gotoxy(0,8);
         clk = clock();
         cprintf("clock: %08lx", clk);
-        
+
         for (i = 0; i < 4; ++i)
         {
             gotoxy(0, 12 + i);
@@ -58,4 +58,4 @@ void main(void)
         }
     }
     for(;;);
-}
\ No newline at end of file
+}