Two module splits

git-svn-id: svn://svn.cc65.org/cc65/trunk@396 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/conio/Makefile b/libsrc/conio/Makefile
index da1ff12b77aeeb37a78df424931848b48d76c9ce..ee9d691f08f1bfb9857e0db697ba5fe5f5077bdf 100644 (file)
--- a/libsrc/conio/Makefile
+++ b/libsrc/conio/Makefile
@@ -15,7 +15,12 @@
 
 C_OBJS =
 
-S_OBJS = cputs.o cursor.o cputhex.o scrsize.o
+S_OBJS = _cursor.o     \
+        _scrsize.o     \
+        cputhex.o      \
+        cputs.o        \
+        cursor.o       \
+        scrsize.o
 
 all:   $(C_OBJS) $(S_OBJS)
 

diff --git a/libsrc/conio/_cursor.s b/libsrc/conio/_cursor.s
new file mode 100644 (file)
index 0000000..1e56bdb
--- /dev/null
+++ b/libsrc/conio/_cursor.s
@@ -0,0 +1,13 @@
+;
+; Ullrich von Bassewitz, 26.10.2000
+;
+; Cursor related variables
+;
+
+       .export         cursor
+
+.bss
+
+cursor:        .res    1
+
+

diff --git a/libsrc/conio/_scrsize.s b/libsrc/conio/_scrsize.s
new file mode 100644 (file)
index 0000000..743a888
--- /dev/null
+++ b/libsrc/conio/_scrsize.s
@@ -0,0 +1,15 @@
+;
+; Ullrich von Bassewitz, 26.10.2000
+;
+; Screen size variables
+;
+
+       .export         xsize, ysize
+
+.bss
+
+xsize: .res    1
+ysize: .res    1
+
+
+

diff --git a/libsrc/conio/cursor.s b/libsrc/conio/cursor.s
index 1dd500e6885227763ab2ade7089e917eb2eb61c4..c16b28e5e712b65a621b32454b8c8df44898eb2f 100644 (file)
--- a/libsrc/conio/cursor.s
+++ b/libsrc/conio/cursor.s
@@ -5,7 +5,7 @@
 ;
 
        .export         _cursor
-       .export         cursor
+       .import         cursor
 
 
 .proc  _cursor
@@ -18,9 +18,3 @@
 
 .endproc
 
-
-.bss
-
-cursor:        .res    1
-
-

diff --git a/libsrc/conio/scrsize.s b/libsrc/conio/scrsize.s
index 4be59964a1361c6f6d9a295948dd4d9b34a97b08..0779fb1e5ce1f07dd311b4186aeb7c03c7314cfa 100644 (file)
--- a/libsrc/conio/scrsize.s
+++ b/libsrc/conio/scrsize.s
@@ -5,9 +5,9 @@
 ;
 
        .export         _screensize
-       .export         xsize, ysize
 
        .import         popax
+       .import         xsize, ysize
        .importzp       ptr1, ptr2
 
 .proc  _screensize
@@ -26,13 +26,5 @@
        sta     (ptr1),y
        rts
 
-.endproc       
-
-
-.bss
-
-xsize: .res    1
-ysize: .res    1
-
-
+.endproc