Removed initialization code to set the screen size and replaced it by a

separate module that contains a module constructor. In some cases, the
code was even unnecessary, since the screen size is known in advance.


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

libsrc/c64/Makefile

@@ -11,13 +11,23 @@
 %.o:	%.s
 	@$(AS) -g -o $@ $(AFLAGS) $<
 
-C_OBJS =
+OBJS =	_scrsize.o	\
+	break.o		\
+	crt0.o		\
+	cgetc.o		\
+	clrscr.o	\
+	color.o		\
+	conio.o		\
+	cputc.o		\
+	kbhit.o		\
+	mouse.o		\
+	read.o		\
+	readjoy.o      	\
+	rs232.o		\
+	write.o
 
-S_OBJS = crt0.o read.o write.o kbhit.o conio.o clrscr.o mouse.o\
-	 cputc.o cgetc.o color.o readjoy.o break.o rs232.o
-
-all:	$(C_OBJS) $(S_OBJS)
+all:	$(OBJS)
 
 clean:
-	@rm -f $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) crt0.o
+	@rm -f $(OBJS)
 

libsrc/c64/_scrsize.s

@@ -0,0 +1,25 @@
+;
+; Ullrich von Bassewitz, 26.10.2000
+;
+; Screen size variables
+;
+
+	.export		xsize, ysize
+	.constructor	initscrsize
+
+	.include	"../cbm/cbm.inc"
+
+.code
+
+initscrsize:
+   	jsr	SCREEN
+   	stx	xsize
+   	sty	ysize
+	rts
+
+.bss
+
+xsize: 	.res	1
+ysize:	.res	1
+
+

libsrc/c64/conio.s

@@ -4,20 +4,7 @@
 ; Low level stuff for screen output/console input
 ;
 
-     	.export		initconio
 	.exportzp	CURS_X, CURS_Y
-	.import		xsize, ysize
 
-	.include	"../cbm/cbm.inc"
 	.include	"c64.inc"
 
-.code
-
-initconio:
-	jsr	SCREEN
-	stx	xsize
-	sty	ysize
-	rts
-
-
-

libsrc/c64/crt0.s

@@ -6,7 +6,7 @@
 
 	.export		_exit
 	.import		initlib, donelib
-       	.import	       	initconio, zerobss, push0
+       	.import	       	zerobss, push0
 	.import	     	_main
 
 	.include     	"c64.inc"
@@ -94,10 +94,6 @@ L1:	lda	sp,x
 
 	jsr	initlib
 
-; Initialize conio stuff
-
-	jsr	initconio
-
 ; Pass an empty command line
 
        	jsr    	push0 	  	; argc