From: Alan Cox <alan@etchedpixels.co.uk>
Date: Tue, 20 Oct 2015 16:49:54 +0000 (+0100)
Subject: trs80/dragon: should be setting the multimode flag
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=4512abd306cdd57bf52e962b9f6cd33169dba4ef;p=FUZIX.git

trs80/dragon: should be setting the multimode flag
---

diff --git a/Kernel/platform-dragon-nx32/devtty.c b/Kernel/platform-dragon-nx32/devtty.c
index ebb528ef..28d22540 100644
--- a/Kernel/platform-dragon-nx32/devtty.c
+++ b/Kernel/platform-dragon-nx32/devtty.c
@@ -284,7 +284,7 @@ static struct display display[4] = {
 		0xFF, 0xFF,		/* For now */
 		FMT_MONO_WB,
 		HW_UNACCEL,
-		GFX_TEXT|GFX_MAPPABLE|GFX_VBLANK,
+		GFX_TEXT|GFX_MAPPABLE|GFX_VBLANK|GFX_MULTIMODE,
 		0,
 		GFX_DRAW|GFX_READ|GFX_WRITE,
 	},
@@ -295,7 +295,7 @@ static struct display display[4] = {
 		0xFF, 0xFF,		/* For now */
 		FMT_MONO_WB,
 		HW_UNACCEL,
-		GFX_TEXT|GFX_MAPPABLE|GFX_VBLANK,
+		GFX_TEXT|GFX_MAPPABLE|GFX_VBLANK|GFX_MULTIMODE,
 		0,
 		GFX_DRAW|GFX_READ|GFX_WRITE,
 	},
@@ -309,7 +309,7 @@ static struct display display[4] = {
 		HW_UNACCEL,
 		GFX_MAPPABLE|GFX_VBLANK,
 		0,
-		GFX_DRAW|GFX_READ|GFX_WRITE,
+		GFX_DRAW|GFX_READ|GFX_WRITE|GFX_MULTIMODE,
 	},
 	{
 		3,
@@ -320,7 +320,7 @@ static struct display display[4] = {
 		HW_UNACCEL,
 		GFX_MAPPABLE|GFX_VBLANK,
 		0,
-		GFX_DRAW|GFX_READ|GFX_WRITE,
+		GFX_DRAW|GFX_READ|GFX_WRITE|GFX_MULTIMODE,
 	},
 	/* Possibly we should also allow for SG6 and SG4 ?? */
 };
@@ -385,11 +385,6 @@ static int gfx_draw_op(uarg_t arg, char *ptr, uint8_t *buf)
   return 0;
 }
 
-/*
- *	Start by just reporting the 256x192 mode which is memory mapped
- *	(it's effectively always in our address space). Should really
- *	support setting graphics into the other modes.
- */
 int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 {
 	if (arg >> 8 != 0x03)
diff --git a/Kernel/platform-trs80/devgfx.c b/Kernel/platform-trs80/devgfx.c
index 2d635836..82ce21c0 100644
--- a/Kernel/platform-trs80/devgfx.c
+++ b/Kernel/platform-trs80/devgfx.c
@@ -21,7 +21,7 @@ static const struct display trsdisplay[2] = {
     255, 255,
     FMT_TEXT,
     HW_UNACCEL,
-    0,
+    GFX_MULTIMODE|GFX_TEXT,
     2,
     0
   },
@@ -32,7 +32,7 @@ static const struct display trsdisplay[2] = {
     1, 1,		/* Need adding to ioctls */
     FMT_MONO_BW,
     HW_TRS80GFX,
-    GFX_MAPPABLE|GFX_OFFSCREEN,	/* Can in theory do pans */
+    GFX_MULTIMODE|GFX_MAPPABLE|GFX_OFFSCREEN,	/* Can in theory do pans */
     32,
     GFX_DRAW|GFX_READ|GFX_WRITE
   }