3 files changed, 11 insertions(+), 6 deletions(-)

M alphapc/sd53c8xx.c
M pc/sd53c8xx.c
M pc/vganeomagic.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

@@ 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

@@ 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;
 		}