--- ide-scsi.c.org	Wed Jul 15 03:32:52 1998
+++ ide-scsi.c	Wed Jul 15 03:35:48 1998
@@ -156,7 +156,8 @@
 static inline void idescsi_transform_pc1 (ide_drive_t *drive, idescsi_pc_t *pc)
 {
 	idescsi_scsi_t *scsi = drive->scsi;
-	u8 *c = pc->c;
+	u8 *c = pc->c, *buf = pc->buffer, *sc = pc->scsi_cmd->cmnd;
+	int i;
 
 	if (scsi->media == TYPE_ROM) {
 		if (c[0] == READ_6 || c[0] == WRITE_6) {
@@ -164,6 +165,14 @@
 			c[3] = c[1] & 0x1f;	c[2] = 0;		c[1] &= 0xe0;
 			c[0] += (READ_10 - READ_6);
 		}
+		if (c[0] == MODE_SENSE || (c[0] == MODE_SELECT && buf[3] == 8)) {
+			pc->request_transfer -= 4;
+			memset (c, 0, 12);
+			c[0] = sc[0] | 0x40;	c[2] = sc[2];		c[8] = sc[4] - 4;
+			if (c[0] == MODE_SENSE_10) return;
+			for (i = 0; i <= 7; i++) buf[i] = 0;
+			for (i = 8; i < pc->buffer_size - 4; i++) buf[i] = buf[i + 4];
+		}
 	}
 }
 
@@ -171,8 +180,15 @@
 {
 	idescsi_scsi_t *scsi = drive->scsi;
 	u8 *buf = pc->buffer;
+	int i;
 
 	if (scsi->media == TYPE_ROM) {
+		if (pc->c[0] == MODE_SENSE_10 && pc->scsi_cmd->cmnd[0] == MODE_SENSE) {
+			buf[0] = buf[1];	buf[1] = buf[2];
+			buf[2] = 0;		buf[3] = 8;
+			for (i = pc->buffer_size - 1; i >= 12; i--) buf[i] = buf[i - 4];
+			for (i = 11; i >= 4; i--) buf[i] = 0;
+		}
 		if (pc->c[0] == INQUIRY)
 			buf[2] |= 2;
 	}