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/plus4/Makefile

@@ -11,13 +11,19 @@
 %.o:	%.s
 	@$(AS) -g -o $@ $(AFLAGS) $<
 
-C_OBJS =
+OBJS =	_scrsize.o	\
+	break.o		\
+       	cgetc.o	       	\
+	clrscr.o	\
+	color.o		\
+	conio.o		\
+	cputc.o		\
+	crt0.o		\
+	kbhit.o		\
+	readjoy.o
 
-S_OBJS = crt0.o kbhit.o conio.o clrscr.o cputc.o cgetc.o\
-	 color.o readjoy.o break.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/plus4/_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/plus4/conio.s

@@ -14,9 +14,6 @@
 .code
 
 initconio:
-     	jsr	SCREEN
-     	stx	xsize
-     	sty	ysize
      	ldy	#15
 L1:  	lda	fnkeys,y
      	sta 	FKEY_SPACE,y