From 72294dc011c366ffbba40e3d6fccda3c031a0741 Mon Sep 17 00:00:00 2001
From: cpg <cpg@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Fri, 21 Jul 2000 08:26:44 +0000
Subject: [PATCH] removed DIRECT_SCREEN define

git-svn-id: svn://svn.cc65.org/cc65/trunk@176 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 libsrc/atari/Makefile |  2 +-
 libsrc/atari/cclear.s |  4 --
 libsrc/atari/chline.s |  4 --
 libsrc/atari/clrscr.s | 12 ------
 libsrc/atari/cputc.s  | 95 +------------------------------------------
 5 files changed, 3 insertions(+), 114 deletions(-)

diff --git a/libsrc/atari/Makefile b/libsrc/atari/Makefile
index 40f9a7c7c..c66d9f41d 100644
--- a/libsrc/atari/Makefile
+++ b/libsrc/atari/Makefile
@@ -2,7 +2,7 @@
 # makefile for CC65 Atari runtime library
 #
 
-ATARIDEFS = -DDIRECT_SCREEN
+ATARIDEFS =
 
 .SUFFIXES: .o .s .c
 
diff --git a/libsrc/atari/cclear.s b/libsrc/atari/cclear.s
index f4ee4e94f..8ab7dee96 100644
--- a/libsrc/atari/cclear.s
+++ b/libsrc/atari/cclear.s
@@ -19,11 +19,7 @@ _cclear:
        	cmp	#0		; Is the length zero?
        	beq	L9  		; Jump if done
     	sta	tmp1				     
-.ifdef DIRECT_SCREEN
 L1:    	lda    	#0		; Blank - screen code
-.else
-L1:    	lda    	#$20		; Blank
-.endif
    	jsr	cputdirect	; Direct output
    	dec	tmp1
 	bne	L1
diff --git a/libsrc/atari/chline.s b/libsrc/atari/chline.s
index 6b5e6a19b..ffc4717a3 100644
--- a/libsrc/atari/chline.s
+++ b/libsrc/atari/chline.s
@@ -19,11 +19,7 @@ _chline:
    	cmp	#0		; Is the length zero?
    	beq	L9  		; Jump if done
 	sta	tmp1
-.ifdef DIRECT_SCREEN
 L1:    	lda    	#$12+64		; Horizontal line, screen code
-.else
-L1:    	lda    	#$12 		; Horizontal line
-.endif
    	jsr	cputdirect	; Direct output
    	dec	tmp1
 	bne	L1
diff --git a/libsrc/atari/clrscr.s b/libsrc/atari/clrscr.s
index ac8f89619..946f3a2da 100644
--- a/libsrc/atari/clrscr.s
+++ b/libsrc/atari/clrscr.s
@@ -5,11 +5,7 @@
 ;
 
 	.export		_clrscr
-
 	.include	"atari.inc"
-
-.ifdef DIRECT_SCREEN
-
 	.importzp	ptr1
 
 _clrscr:lda	SAVMSC		; screen memory
@@ -37,11 +33,3 @@ done:	sta	COLCRS
 	sta	ROWCRS
 	rts
 
-.else
-
-	.import		putchar
-_clrscr:
-	lda	#ATCLR
-	jmp	putchar
-
-.endif
diff --git a/libsrc/atari/cputc.s b/libsrc/atari/cputc.s
index c7d30a460..652c6589d 100644
--- a/libsrc/atari/cputc.s
+++ b/libsrc/atari/cputc.s
@@ -8,6 +8,8 @@
     	.export	       	_cputcxy, _cputc
 	.export		plot, cputdirect, putchar
 	.import		popa, _gotoxy, mul40
+	.importzp	tmp4,ptr4
+	.import		_revflag
 
 	.include	"atari.inc"
 
@@ -17,11 +19,6 @@ _cputcxy:
 	jsr	_gotoxy		; Set cursor, drop x
 	pla			; Restore C
 
-.ifdef DIRECT_SCREEN
-
-	.importzp tmp4,ptr4
-	.import	_revflag
-
 _cputc:
 	cmp	#$0D		; CR
 	bne	L4
@@ -87,91 +84,3 @@ L3:	clc
 	.rodata
 ataint:	.byte	64,0,32,96
 
-;****************************************************************
-.else	;***** above DIRECT_SCREEN, below thru OS ***************
-;****************************************************************
-
-	.import		__do_oserror,cursor,__oserror
-
-
-; Plot a character - also used as internal function
-
-_cputc: cmp	#$0D  		; CR?
-    	bne	L1
-    	lda	#0
-    	sta	COLCRS
-       	beq    	plot		; Recalculate pointers
-
-; don't know whether this is needed. the compiler generates
-; already ATEOL chars for \n
-
-L1: 	cmp	#$0A  	  	; LF?
-       	bne	L2
-	lda	#ATEOL
-
-; Printable char of some sort
-
-L2:
-cputdirect:
-	pha
-	and	#$7f
-	cmp	#32		; control char?
-	bcs	goon
-	lda	#$1b
-	jsr	putchar
-goon:	pla
-	jsr	putchar		; Write the character to the screen
-
-plot:	ldy	COLCRS
-	ldx	ROWCRS
-	rts
-
-; Write one character to the screen without doing anything else, return X
-; position in Y
-
-putchar:
-.if 0
-	tax
-	lda	#>(retr-1)
-	pha
-	lda	#<(retr-1)
-	pha
-	lda	ICPTH
-	pha
-	lda	ICPTL
-	pha
-	lda	#0
-	sta	LOGCOL
-	txa
-	rts
-retr:
-.endif
-.if 1
-	pha
-	ldx	#0		; iocb #0 (screen editor)
-	txa
-	sta	ICBLL,x
-	sta	ICBLH,x
-	sta	ICBAL,x
-	sta	ICBAH,x
-	lda	#PUTCHR
-	sta	ICCOM,x
-	lda	cursor
-	beq	putc7
-	lda	#0
-	beq	putc8
-putc7:	lda	#1
-putc8:	sta	CRSINH
-	pla
-	jsr	CIOV
-	bpl	putc9
-	jmp	__do_oserror	; update system specific error code
-
-putc9:	tya
-	ldx	#0
-	stx	__oserror
-	ldy	COLCRS
-.endif
-	rts
-
-.endif	; not defined DIRECT_SCREEN
-- 
2.39.5