From 9d6814b39e8ad983506cba275002cd02c70cb9ae Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Fri, 3 Jan 2020 21:31:28 +0100
Subject: [PATCH] reenabled scren cursor

---
 c64/kernal/interrupts/ea31.default_irq_handler.s |  4 ++--
 c64/kernal/screen/cursor.s                       | 11 +++--------
 c64/kernal/screen/cursor_show.s                  |  4 ----
 c64/kernal/screen/screen_add_40_to_pntr.s        |  2 ++
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/c64/kernal/interrupts/ea31.default_irq_handler.s b/c64/kernal/interrupts/ea31.default_irq_handler.s
index 67912afd..be964c9f 100644
--- a/c64/kernal/interrupts/ea31.default_irq_handler.s
+++ b/c64/kernal/interrupts/ea31.default_irq_handler.s
@@ -11,8 +11,8 @@ default_irq_handler:
 
 #endif // CONFIG_RS232_UP9600
 
-/* YYY disabled for rework
-	jsr cursor_blink */
+
+	jsr cursor_blink
 	jsr JSCNKEY
 	jsr JUDTIM // update jiffy clock
 
diff --git a/c64/kernal/screen/cursor.s b/c64/kernal/screen/cursor.s
index fdf585c6..d9d3d66c 100644
--- a/c64/kernal/screen/cursor.s
+++ b/c64/kernal/screen/cursor.s
@@ -11,13 +11,7 @@
 // - PNTR  (current screen x position)
 //
 
-cursor_disable:
-	rts
 
-cursor_hide_if_visible:
-	rts
-
-/* YYY disabled for rework
 cursor_blink:
 	// Is the cursor enabled?
 	lda BLNSW
@@ -34,9 +28,10 @@ cursor_blink:
 	// FALLTROUGH
 
 cursor_draw:
-	jsr screen_calculate_line_pointer // XXX try to make this call not needed
+	jsr screen_calculate_PNT_USER // YYY try to make this call not needed
 
 	ldy PNTR
+	// XXX clip PNTR to 0-39
 	lda (PNT),y
 	sta GDBLN
 	eor #$80
@@ -66,6 +61,7 @@ cursor_undraw:
 
 	lda GDBLN
 	ldy PNTR
+	// XXX clip PNTR to 0-39
 	sta (PNT),y
 	lda GDCOL
 	sta (USER),y
@@ -85,4 +81,3 @@ cursor_blink_timer_reset:
 
 cursor_blink_end:
 	rts
-*/
\ No newline at end of file
diff --git a/c64/kernal/screen/cursor_show.s b/c64/kernal/screen/cursor_show.s
index 3c29c870..6cd78afe 100644
--- a/c64/kernal/screen/cursor_show.s
+++ b/c64/kernal/screen/cursor_show.s
@@ -6,10 +6,7 @@
 // - BLNCT (cursor blink countdown)
 //
 
-cursor_show_if_enabled:
-	rts
 
-/* YYY disabled for rework
 cursor_show_if_enabled:
 	lda BLNSW
 	bne cursor_show_end
@@ -36,4 +33,3 @@ cursor_show:
 
 cursor_show_end:
 	rts
-*/
diff --git a/c64/kernal/screen/screen_add_40_to_pntr.s b/c64/kernal/screen/screen_add_40_to_pntr.s
index ff5d9f36..7e4b2c46 100644
--- a/c64/kernal/screen/screen_add_40_to_pntr.s
+++ b/c64/kernal/screen/screen_add_40_to_pntr.s
@@ -1,4 +1,5 @@
 
+/* YYY disabled - most likely not needed
 
 screen_add_40_to_PNTR:
 	
@@ -8,3 +9,4 @@ screen_add_40_to_PNTR:
 	sta PNTR
 
 	rts
+*/
\ No newline at end of file