From 451b34bc758426010adfdf56a75b89eb079ea5c8 Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Fri, 31 May 2013 01:50:07 +0200
Subject: [PATCH] When turning the ROM off and on, also change the chargen
 pointer.

---
 libsrc/atari/shadow_ram_handlers.s | 37 ++++++------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/libsrc/atari/shadow_ram_handlers.s b/libsrc/atari/shadow_ram_handlers.s
index d3532b238..e2de0c319 100644
--- a/libsrc/atari/shadow_ram_handlers.s
+++ b/libsrc/atari/shadow_ram_handlers.s
@@ -17,11 +17,17 @@
 	lda	PORTB
 	and	#$fe
 	sta	PORTB
+	lda	#>__CHARGEN_START__
+	sta	CHBAS
+	sta	CHBASE
 .endmacro
 .macro	enable_rom
 	lda	PORTB
 	ora	#1
 	sta	PORTB
+	lda	#$E0
+	sta	CHBAS
+	sta	CHBASE
 .endmacro
 
 .segment "INIT"
@@ -35,6 +41,7 @@ sram_init:
 	ldx	#0
 	stx	NMIEN		; disable NMI
 
+; disable ROMs
 	disable_rom
 
 ; setup interrupt vectors
@@ -67,11 +74,6 @@ sram_init:
 	lda	#>my_SIOV
 	sta	SIOV+2
 
-; set new chargen
-	lda	#>__CHARGEN_START__
-	sta	CHBAS
-	sta	CHBASE
-
 ; enable interrupts
 	lda	#$40
 	sta	NMIEN
@@ -147,29 +149,4 @@ kret:	pha
 	pla
 	rts
 
-.if 0
-	.import	KEYBDV_wrapper
-        .import cursor,mul40
-
-_cgetc:
-        jsr     setcursor
-.if .not .defined(__ATARIXL__)
-        jsr     @1
-.else
-	jsr	KEYBDV_wrapper
-.endif
-        ldx     #0
-        rts
-
-.if .not .defined(__ATARIXL__)
-@1:     lda     KEYBDV+5
-        pha
-        lda     KEYBDV+4
-        pha
-        lda     #12
-        sta     ICAX1Z          ; fix problems with direct call to KEYBDV
-        rts
-.endif
-.endif
-
 .endif	; .if .defined(__ATARIXL__)