Merge pull request #1134 from six809/coco3-rgb-monitor-detect

coco3: fix RGB monitor detect
EtchedPixels · Jan 8, 2025 · 3f76948 · 3f76948
2 parents 6895a88 + 0aea695
commit 3f76948
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Kernel/platform/platform-coco3/coco3.s b/Kernel/platform/platform-coco3/coco3.s
@@ -146,6 +146,10 @@ init_hardware:
 	;; High speed poke
 	sta	0xffd9		; high speed poke
 	sta	0xffdf		; RAM mode
+	;; configure PIA1B to read monitor detect line
+	clr	$ff23
+	ldd	#$f037
+	std	$ff22
 	;; set system RAM size
 	jsr	_scanmem	; X = number of pages
 	tfr 	x,d

diff --git a/Kernel/platform/platform-coco3/devtty.c b/Kernel/platform/platform-coco3/devtty.c
@@ -530,7 +530,7 @@ void devtty_init()
 	/* set default keyboard delay/repeat rates */
 	keyrepeat.first = REPEAT_FIRST * (TICKSPERSEC / 10);
 	keyrepeat.continual = REPEAT_CONTINUAL * (TICKSPERSEC / 10);
-	is_rgb = *((volatile uint8_t *)0xFF22) & 8;
+	is_rgb = (*((volatile uint8_t *)0xFF22) & 8) == 0;
 	if (is_rgb)
 		apply_defmode(0);
 	else {