From: Greg King <gregdk@users.sf.net>
Date: Thu, 15 Jun 2017 20:44:46 +0000 (-0400)
Subject: Added a missing label to some conio cursor movement functions.
X-Git-Tag: V2.17~123^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F450%2Fhead;p=cc65

Added a missing label to some conio cursor movement functions.

It had prevented other functions, e.g. cputs(), from being linked into a program.
---

diff --git a/libsrc/atmos/gotoxy.s b/libsrc/atmos/gotoxy.s
index 80d4d5251..6652c9419 100644
--- a/libsrc/atmos/gotoxy.s
+++ b/libsrc/atmos/gotoxy.s
@@ -1,14 +1,18 @@
 ;
-; Ullrich von Bassewitz, 2003-04-13
+; 2003-04-13, Ullrich von Bassewitz
+; 2017-06-15, Greg King
 ;
 ; void gotoxy (unsigned char x, unsigned char y);
 ;
 
-        .export         _gotoxy
+        .export         gotoxy, _gotoxy
+
         .import         popa
 
         .include        "atmos.inc"
 
+gotoxy: jsr     popa            ; Get Y
+
 .proc   _gotoxy
 
         sta     CURS_Y          ; Set Y
@@ -17,5 +21,3 @@
         rts
 
 .endproc
-
-
diff --git a/libsrc/creativision/gotoxy.s b/libsrc/creativision/gotoxy.s
index 12ce0abea..588dd83a0 100644
--- a/libsrc/creativision/gotoxy.s
+++ b/libsrc/creativision/gotoxy.s
@@ -1,15 +1,19 @@
 ;
-; Ullrich von Bassewitz, 06.08.1998
+; 1998-08-06, Ullrich von Bassewitz
+; 2017-06-15, Greg King
 ;
 ; void gotoxy (unsigned char x, unsigned char y);
 ;
 
-        .export         _gotoxy
+        .export         gotoxy, _gotoxy
+
         .import         setcursor
         .import         popa
 
         .include        "creativision.inc"
 
+gotoxy: jsr     popa            ; Get Y
+
 .proc   _gotoxy
 
         sta     CURSOR_Y        ; Set Y
diff --git a/libsrc/gamate/gotoxy.s b/libsrc/gamate/gotoxy.s
index 4a4871444..d49bd2967 100644
--- a/libsrc/gamate/gotoxy.s
+++ b/libsrc/gamate/gotoxy.s
@@ -9,7 +9,7 @@
         .include        "extzp.inc"
 
 gotoxy:
-        jsr     popa            ; Get X
+        jsr     popa            ; Get Y
 
 _gotoxy:
         sta     CURS_Y          ; Set Y
@@ -20,6 +20,4 @@ _gotoxy:
 ;-------------------------------------------------------------------------------
 ; force the init constructor to be imported
 
-        .import initconio
-conio_init      = initconio
-
+        .forceimport    initconio
diff --git a/libsrc/telestrat/gotoxy.s b/libsrc/telestrat/gotoxy.s
index e0c8154e3..e1470f848 100644
--- a/libsrc/telestrat/gotoxy.s
+++ b/libsrc/telestrat/gotoxy.s
@@ -1,19 +1,26 @@
 ;
-; jede jede@oric.org 2017-02-25
+; 2017-02-25, jede <jede@oric.org>
+; 2017-06-15, Greg King
 ;
-    .export    _gotoxy
-	
-    .import    popa
-	
-    .importzp  sp
+; void gotoxy (unsigned char x, unsigned char y);
+;
+
+        .export         gotoxy, _gotoxy
+
+        .import         popa
+        .importzp       sp
 
-    .include   "telestrat.inc"
+        .include        "telestrat.inc"
+
+gotoxy: jsr     popa            ; Get Y
 
 .proc _gotoxy
-   ; This function move only cursor for display, it does not move the prompt position
-   ; in telemon, there is position for prompt, and another for the cursor
-   sta    SCRY
-   jsr    popa
-   sta    SCRX
-   rts
-.endproc	
+
+; This function moves only the display cursor; it does not move the prompt position.
+; In telemon, there is a position for the prompt, and another for the cursor.
+
+        sta     SCRY
+        jsr     popa
+        sta     SCRX
+        rts
+.endproc