From a1b2962facc27a79e31a9ac0416576f9796d2ea8 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 8 Jun 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-06-08

---
 alphapc/sd53c8xx.c | 6 +++---
 pc/sd53c8xx.c      | 6 +++---
 pc/vganeomagic.c   | 5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/alphapc/sd53c8xx.c b/alphapc/sd53c8xx.c
index cd391bf131995e19118891aaa1a0b9b64c71963e..7fdd7a99b585ddac3d6575c8580fd3e80777c3ff 100644
--- a/alphapc/sd53c8xx.c
+++ b/alphapc/sd53c8xx.c
@@ -1843,9 +1843,9 @@ mb();
 		status = SDcheck;
 		r->flags |= SDvalidsense;
 	}
-	KPRINT("sd53c8xx: %d: r flags %8.8uX status %d rlen %d\n",
-		target, r->flags, r->status, r->dlen);
-	return status;
+	KPRINT("sd53c8xx: %d: r flags %8.8uX status %d rlen %ld\n",
+		target, r->flags, status, r->rlen);
+	return r->status = status;
 }
 
 #define NCR_VID 	0x1000
diff --git a/pc/sd53c8xx.c b/pc/sd53c8xx.c
index d49a4543761d9e5e918faa65a318483992b52390..06b5fdbed30d67f3b188449e52f9939c373a9395 100644
--- a/pc/sd53c8xx.c
+++ b/pc/sd53c8xx.c
@@ -1792,9 +1792,9 @@ docheck:
 		status = SDcheck;
 		r->flags |= SDvalidsense;
 	}
-	KPRINT("sd53c8xx: %d: r flags %8.8uX status %d rlen %d\n",
-		target, r->flags, r->status, r->dlen);
-	return status;
+	KPRINT("sd53c8xx: %d: r flags %8.8uX status %d rlen %ld\n",
+		target, r->flags, status, r->rlen);
+	return r->status = status;
 }
 
 #define NCR_VID 	0x1000
diff --git a/pc/vganeomagic.c b/pc/vganeomagic.c
index 7f835b808cc91b028dab30dcadb90375a252fc89..230a5c22ce793515dfd1f7747fc706bfb2ec6f7d 100644
--- a/pc/vganeomagic.c
+++ b/pc/vganeomagic.c
@@ -37,6 +37,7 @@ neomagiclinear(VGAscr* scr, int* size, int* align)
 		switch(p->did){
 		case 0x0004:		/* MagicGraph 128XD */
 		case 0x0005:		/* MagicMedia 256AV */
+		case 0x0006:		/* MagicMedia 256ZX */
 			aperture = p->mem[0].bar & ~0x0F;
 			*size = p->mem[0].size;
 			break;
@@ -93,6 +94,10 @@ neomagicenable(VGAscr* scr)
 			curoff = 0x1000;
 			vmsize = 2560*1024;
 			break;
+		case 0x0006:		/* MagicMedia 256ZX */
+			curoff = 0x1000;
+			vmsize = 4096*1024;
+			break;
 		default:
 			return;
 		}