--- np2/cbus/atapicmd.c	2005/03/05 11:58:02	1.4
+++ np2/cbus/atapicmd.c	2005/04/05 13:48:09	1.7
@@ -17,9 +17,24 @@
 #include	"atapicmd.h"
 #include	"sxsi.h"
 
+#define	YUIDEBUG
+
 
 // INQUIRY
 static const UINT8 cdrom_inquiry[] = {
+#ifdef YUIDEBUG
+	// うちのドライブの奴 NECCDは Product Level 3.00以上で modesense10のコードがちげー
+	0x05,	// CD-ROM
+	0x80,	// bit7: Removable Medium Bit, other: Reserved
+	0x00,	// version [7-6: ISO, ECMA: 5-3, 2-0: ANSI(00)]
+	0x21,	// 7-4: ATAPI version, 3-0: Response Data Format
+	0x1f,	// Additional length
+	0x00,0x00,0x00,	// Reserved
+	'N', 'E', 'C', ' ', ' ', ' ', ' ', ' ',	// Vendor ID
+	'C', 'D', '-', 'R', 'O', 'M', ' ', 'D',	// Product ID
+	'R', 'I', 'V', 'E', ':', '2', '5', '1',	// Product ID
+	'4', '.', '0', '9'	// Product Revision Level
+#else
 	0x05,	// CD-ROM
 	0x80,	// bit7: Removable Medium Bit, other: Reserved
 	0x00,	// version [7-6: ISO, ECMA: 5-3, 2-0: ANSI(00)]
@@ -30,6 +45,7 @@ static const UINT8 cdrom_inquiry[] = {
 	'C', 'D', '-', 'R', 'O', 'M', ' ', 'D',	// Product ID
 	'R', 'I', 'V', 'E', ' ', ' ', ' ', ' ',	// Product ID
 	'1', '.', '0', ' '	// Product Revision Level
+#endif
 };
 
 static void senddata(IDEDRV drv, UINT size, UINT limit) {
@@ -99,6 +115,7 @@ static void atapi_cmd_read_capacity(IDED
 static void atapi_cmd_read(IDEDRV drv, UINT32 lba, UINT32 leng);
 static void atapi_cmd_mode_select(IDEDRV drv);
 static void atapi_cmd_mode_sense(IDEDRV drv);
+static void atapi_cmd_readsubch(IDEDRV drv);
 static void atapi_cmd_readtoc(IDEDRV drv);
 
 void atapicmd_a0(IDEDRV drv) {
@@ -178,6 +195,11 @@ void atapicmd_a0(IDEDRV drv) {
 		atapi_cmd_mode_sense(drv);
 		break;
 
+	case 0x42:
+		TRACEOUT(("atapicmd: read sub channel"));
+		atapi_cmd_readsubch(drv);
+		break;
+
 	case 0x43:		// read TOC
 		TRACEOUT(("atapicmd: read TOC"));
 		atapi_cmd_readtoc(drv);
@@ -318,10 +340,17 @@ static const BYTE defval_pagecode_0e[PC_
 	0x0e, 0x0e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x4b,
 	0x01, 0xff, 0x02, 0xff, 0x00, 0x00, 0x00, 0x00,
 };
+
 static const BYTE defval_pagecode_2a[PC_2A_SIZE] = {
+#ifdef YUIDEBUG
+	0x2a, 0x12, 0x00, 0x00, 0x71, 0x65, 0x89, 0x07,
+	0x02, 0xc2, 0x00, 0xff, 0x00, 0x80, 0x02, 0xc2,
+	0x00, 0x00, 0x00, 0x00,
+#else
 	0x2a, 0x12, 0x00, 0x00, 0x00, 0x00, 0x20, 0x03,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00,
+#endif
 };
 
 // 0x55: MODE SELECT
@@ -364,8 +393,14 @@ static void atapi_cmd_mode_sense(IDEDRV 
 	if (!(drv->media & IDEIO_MEDIA_LOADED)) {
 		drv->buf[2] = 0x70;	// Door closed, no disc present
 	}
+	else if ((drv->media & (IDEIO_MEDIA_COMBINE)) == IDEIO_MEDIA_AUDIO) {
+		drv->buf[2] = 0x02;	// 120mm CD-ROM audio only
+	}
+	else if ((drv->media & (IDEIO_MEDIA_COMBINE)) == IDEIO_MEDIA_COMBINE) {
+		drv->buf[2] = 0x03;	// 120mm CD-ROM data & audio combined
+	}
 	else {
-		drv->buf[2] = 0x00;	// 120mm CD-ROM data only
+		drv->buf[2] = 0x01;	// 120mm CD-ROM data only
 	}
 	cnt = 8;
 	if (cnt > leng) {
@@ -441,6 +476,11 @@ static void atapi_cmd_mode_sense(IDEDRV 
 		if (cnt > leng) {
 			goto length_exceeded;
 		}
+#if 0
+		/*FALLTHROUGH*/
+
+	case 0x00:
+#endif
 		break;
 
 	default:
@@ -468,21 +508,24 @@ length_exceeded:
 	senddata(drv, cnt, leng);
 }
 
-static void atapi_cmd_readtoc(IDEDRV drv) {
 
+static void atapi_cmd_readsubch(IDEDRV drv) {
+
+	SXSIDEV	sxsi;
 	UINT	leng;
-	UINT	format;
 
+	sxsi = sxsi_getptr(drv->sxsidrv);
+	if ((sxsi == NULL) || (sxsi->devtype != SXSIDEV_CDROM) ||
+		(!(sxsi->flag & SXSIFLAG_READY))) {
+		senderror(drv);
+		return;
+	}
 	leng = (drv->buf[7] << 8) + drv->buf[8];
-	format = (drv->buf[9] >> 6);
-	TRACEOUT(("atapi_cmd_readtoc fmt=%d leng=%d", format, leng));
-	switch(format) {
-		case 1:	// multi session
-			ZeroMemory(drv->buf, 12);
-			drv->buf[1] = 0x0a;
-			drv->buf[2] = 0x01;
-			drv->buf[3] = 0x01;
-			senddata(drv, 12, leng);
+	switch(drv->buf[3]) {
+		case 0x01:			// CD-ROM current pos
+			ZeroMemory(drv->buf, 16);
+			drv->buf[4] = 0x01;
+			senddata(drv, 16, leng);
 			break;
 
 		default:
@@ -491,4 +534,47 @@ static void atapi_cmd_readtoc(IDEDRV drv
 	}
 }
 
+static void atapi_cmd_readtoc(IDEDRV drv) {
+
+	SXSIDEV	sxsi;
+	UINT	leng;
+	UINT	format;
+	UINT	datasize;
+
+	sxsi = sxsi_getptr(drv->sxsidrv);
+	if ((sxsi == NULL) || (sxsi->devtype != SXSIDEV_CDROM) ||
+		(!(sxsi->flag & SXSIFLAG_READY))) {
+		senderror(drv);
+		return;
+	}
+
+	leng = (drv->buf[7] << 8) + drv->buf[8];
+	format = (drv->buf[9] >> 6);
+	TRACEOUT(("atapi_cmd_readtoc fmt=%d leng=%d", format, leng));
+
+	switch (format) {
+	case 0: // track info
+		datasize = sxsicd_gettocinfo(sxsi, drv->buf + 2);
+		drv->buf[0] = (UINT8)(datasize >> 8);
+		drv->buf[1] = (UINT8)(datasize >> 0);
+		senddata(drv, datasize + 2, leng);
+		break;
+
+	case 1:	// multi session
+		ZeroMemory(drv->buf, 12);
+		drv->buf[1] = 0x0a;
+		drv->buf[2] = 0x01;
+		drv->buf[3] = 0x01;
+		drv->buf[5] = 0x14;
+		drv->buf[6] = 0x01;
+		drv->buf[10] = 0x02;
+		senddata(drv, 12, leng);
+		break;
+
+	default:
+		senderror(drv);
+		break;
+	}
+}
+
 #endif	/* SUPPORT_IDEIO */