Added more stuff from groepaz with cleanups

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

libsrc/nes/Makefile

@@ -22,9 +22,11 @@ C_OBJS =
 S_OBJS  =       _scrsize.o      \
                 clock.o         \
                 color.o         \
+                cputc.o         \
                 crt0.o          \
                 ppu.o           \
                 ppubuf.o        \
+                setcursor.o     \
                 waitvblank.o
 
 #--------------------------------------------------------------------------

libsrc/nes/cputc.s

@@ -0,0 +1,89 @@
+;
+; Written by Groepaz/Hitmen <groepaz@gmx.net>
+; Cleanup by Ullrich von Bassewitz <uz@cc65.org>
+;
+; void cputcxy (unsigned char x, unsigned char y, char c);
+; void cputc (char c);
+;
+
+    	.export	       	_cputcxy, _cputc, cputdirect, putchar
+	.export		newline               
+        .constructor    conioinit
+	.import		popa, _gotoxy
+        .import         ppuinit, paletteinit, ppubuf_put
+        .import         setcursor
+
+        .importzp       tmp3,tmp4
+
+	.include	"nes.inc"
+
+;-----------------------------------------------------------------------------
+
+_cputcxy:
+	pha	    		; Save C
+	jsr	popa		; Get Y
+	jsr	_gotoxy		; Set cursor, drop x
+	pla			; Restore C
+
+; Plot a character - also used as internal function
+
+_cputc: cmp     #$0d 		; CR?
+    	bne	L1
+    	lda	#0
+    	sta	CURS_X
+       	beq    	plot		; Recalculate pointers
+
+L1: 	cmp	#$0a  	  	; LF?
+       	beq	newline		; Recalculate pointers
+
+; Printable char of some sort
+
+cputdirect:
+  	jsr	putchar		; Write the character to the screen
+
+; Advance cursor position
+
+advance:
+	ldy	CURS_X
+   	iny
+   	cpy	#xsize
+   	bne	L3
+       	inc     CURS_Y          ; new line
+   	ldy	#0    	  	; + cr
+L3:	sty	CURS_X
+	jmp     plot
+
+newline:
+	inc	CURS_Y
+
+; Set cursor position, calculate RAM pointers
+
+plot:	ldy	CURS_X
+	ldx	CURS_Y
+       	jmp    	setcursor       ; Set the new cursor
+
+
+; Write one character to the screen without doing anything else, return X
+; position in Y
+
+putchar:
+    	ora	RVS             ; Set revers bit
+        ldy     SCREEN_PTR+1
+	ldx     SCREEN_PTR
+       	jmp     ppubuf_put
+
+;-----------------------------------------------------------------------------
+; Initialize the conio subsystem
+
+conioinit:
+        jsr     ppuinit
+	jsr     paletteinit
+
+	lda     #0
+	sta     RVS
+	sta     CURS_X
+	sta     CURS_Y
+
+        jmp     plot            ; Set the cursor
+
+

libsrc/nes/crt0.s

@@ -8,7 +8,7 @@
 ;
 
         .export         _exit
-	.import		initlib, donelib
+	.import		initlib, donelib, callmain
 	.import	        push0, _main, zerobss
         .import         ppubuf_flush
 
@@ -226,6 +226,6 @@ irq:
 
 .segment "CHARS"
 
-        .incbin "nes/neschar.bin"
+        .include        "neschar.inc"
 
 

libsrc/nes/setcursor.s

@@ -0,0 +1,39 @@
+;
+; Written by Groepaz/Hitmen <groepaz@gmx.net>
+; Cleanup by Ullrich von Bassewitz <uz@cc65.org>
+;
+; Set the cursor position
+
+   	.export         setcursor
+
+   	.include	"nes.inc"
+
+;-----------------------------------------------------------------------------
+
+.proc   setcursor
+
+	tya
+	clc
+	adc     addrlo,x
+	sta	SCREEN_PTR
+
+    	lda     addrhi,x
+    	adc     #0
+    	sta	SCREEN_PTR+1
+        rts
+
+    	rts
+
+.endproc
+
+;-----------------------------------------------------------------------------
+; Tables with screen addresses
+
+addrlo: .repeat screenrows,line
+    	.byte <($2000+((1*32))+(line*charsperline))
+    	.endrepeat
+
+addrhi: .repeat screenrows,line
+	.byte >($2000+((1*32))+(line*charsperline))
+	.endrepeat
+