Previous

199869 Revisions

Next

r26163 Thursday 14th November, 2013 at 21:43:42 UTC by smf
Added SCSI status code & set it in all command handlers. It is sent over the bus when in status phase. In case of an error further information should be set in m_sense_key/m_sense_asc/m_sense_ascq & m_sense_information so that it can be returned by executing a request sense command [smf]

[src/emu/bus/ieee488]	d9060hd.c
[src/emu/machine]	cdu76s.c cr589.c scsihle.c scsihle.h t10mmc.c t10sbc.c t10spc.c t10spc.h
[src/mame/machine]	gdrom.c
[src/mess/machine]	acb4070.c s1410.c

trunk/src/mame/machine/gdrom.c

r26162	r26163
110	110	{
111	111	case 0x11: // REQ_MODE
112	112	m_phase = SCSI_PHASE_DATAIN;
	113	m_status_code = SCSI_STATUS_CODE_GOOD;
113	114	printf("REQ_MODE %02x %02x %02x %02x %02x %02x\n",
114	115	command[0], command[1],
115	116	command[2], command[3],
r26162	r26163
122	123	case 0x12: // SET_MODE
123	124	logerror("GDROM: SET_MODE\n");
124	125	m_phase = SCSI_PHASE_DATAOUT;
	126	m_status_code = SCSI_STATUS_CODE_GOOD;
125	127	//transferOffset = command[2];
126	128	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
127	129	printf("SET_MODE %02x %02x\n",command[2],command[4]);
r26162	r26163
169	171	}
170	172
171	173	m_phase = SCSI_PHASE_DATAIN;
	174	m_status_code = SCSI_STATUS_CODE_GOOD;
172	175	m_transfer_length = blocks * m_sector_bytes;
173	176	}
174	177	break;
r26162	r26163
206	209	}
207	210
208	211	m_phase = SCSI_PHASE_DATAIN;
	212	m_status_code = SCSI_STATUS_CODE_GOOD;
209	213	m_transfer_length = length;
210	214	break;
211	215	}
212	216
213	217	case 0x70:
214	218	m_phase = SCSI_PHASE_STATUS;
	219	m_status_code = SCSI_STATUS_CODE_GOOD;
215	220	m_transfer_length = 0;
216	221	break;
217	222
218	223	case 0x71:
219	224	m_phase = SCSI_PHASE_DATAIN;
	225	m_status_code = SCSI_STATUS_CODE_GOOD;
220	226	m_transfer_length = sizeof(GDROM_Cmd71_Reply);
221	227	break;
222	228
r26162	r26163
224	230	if(command[1] & 0xf)
225	231	{
226	232	m_phase = SCSI_PHASE_DATAIN;
	233	m_status_code = SCSI_STATUS_CODE_GOOD;
227	234	m_transfer_length = 0xe;
228	235	}
229	236	else

trunk/src/emu/machine/scsihle.c

r26162	r26163
178	178	else
179	179	m_phase = SCSI_PHASE_STATUS;
180	180
	181	m_status_code = SCSI_STATUS_CODE_GOOD;
181	182	bytes_left=4;
182	183	dataout_timer->adjust(attotime::from_seconds(FORMAT_UNIT_TIMEOUT));
183	184	break;
r26162	r26163
187	188	command_local=1;
188	189	bytes_left=0;
189	190	m_phase = SCSI_PHASE_STATUS;
	191	m_status_code = SCSI_STATUS_CODE_GOOD;
190	192	break;
191	193
192	194	case SCSI_CMD_READ_DEFECT:
r26162	r26163
200	202
201	203	bytes_left=4;
202	204	m_phase = SCSI_PHASE_DATAIN;
	205	m_status_code = SCSI_STATUS_CODE_GOOD;
203	206	break;
204	207
205	208	// write buffer
r26162	r26163
208	211	command_local=1;
209	212	bytes_left=(command[7]<<8)+command[8];
210	213	m_phase = SCSI_PHASE_DATAOUT;
	214	m_status_code = SCSI_STATUS_CODE_GOOD;
211	215	break;
212	216
213	217	// read buffer
r26162	r26163
216	220	command_local=1;
217	221	bytes_left=(command[7]<<8)+command[8];
218	222	m_phase = SCSI_PHASE_DATAIN;
	223	m_status_code = SCSI_STATUS_CODE_GOOD;
219	224	break;
220	225	}
221	226
r26162	r26163
287	292	break;
288	293
289	294	case SCSI_PHASE_STATUS:
290		scsi_out( SCSI_STATUS_OK | SCSI_MASK_CD | SCSI_MASK_IO, SCSI_MASK_DATA | SCSI_MASK_CD | SCSI_MASK_IO | SCSI_MASK_MSG );
	295	scsi_out( m_status_code | SCSI_MASK_CD | SCSI_MASK_IO, SCSI_MASK_DATA | SCSI_MASK_CD | SCSI_MASK_IO | SCSI_MASK_MSG );
291	296	scsi_out_req_delay( 1 );
292	297	break;
293	298

trunk/src/emu/machine/scsihle.h

r26162	r26163
66	66	// Status / Sense data taken from Adaptec ACB40x0 documentation.
67	67	//
68	68
69		#define SCSI_STATUS_OK              0x00
70		#define SCSI_STATUS_CHECK           0x02
71		#define SCSI_STATUS_EQUAL           0x04
72		#define SCSI_STATUS_BUSY            0x08
73
74	69	// SCSI IDs
75	70	enum
76	71	{

trunk/src/emu/machine/t10mmc.c

r26162	r26163
112	112	case 0x12: // INQUIRY
113	113	logerror("T10MMC: INQUIRY\n");
114	114	m_phase = SCSI_PHASE_DATAIN;
	115	m_status_code = SCSI_STATUS_CODE_GOOD;
115	116	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
116	117	if (m_transfer_length > 36)
117	118	m_transfer_length = 36;
r26162	r26163
120	121	case 0x15: // MODE SELECT(6)
121	122	logerror("T10MMC: MODE SELECT(6) length %x control %x\n", command[4], command[5]);
122	123	m_phase = SCSI_PHASE_DATAOUT;
	124	m_status_code = SCSI_STATUS_CODE_GOOD;
123	125	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
124	126	break;
125	127
126	128	case 0x1a: // MODE SENSE(6)
127	129	m_phase = SCSI_PHASE_DATAIN;
	130	m_status_code = SCSI_STATUS_CODE_GOOD;
128	131	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
129	132	break;
130	133
131	134	case 0x1b: // START STOP UNIT
132	135	abort_audio();
133	136	m_phase = SCSI_PHASE_STATUS;
	137	m_status_code = SCSI_STATUS_CODE_GOOD;
134	138	m_transfer_length = 0;
135	139	break;
136	140
137	141	case 0x1e: // PREVENT ALLOW MEDIUM REMOVAL
138	142	m_phase = SCSI_PHASE_STATUS;
	143	m_status_code = SCSI_STATUS_CODE_GOOD;
139	144	m_transfer_length = 0;
140	145	break;
141	146
142	147	case 0x25: // READ CAPACITY
143	148	m_phase = SCSI_PHASE_DATAIN;
	149	m_status_code = SCSI_STATUS_CODE_GOOD;
144	150	m_transfer_length = 8;
145	151	break;
146	152
r26162	r26163
164	170	abort_audio();
165	171
166	172	m_phase = SCSI_PHASE_DATAIN;
	173	m_status_code = SCSI_STATUS_CODE_GOOD;
167	174	m_transfer_length = blocks * m_sector_bytes;
168	175	break;
169	176
170	177	case 0x42: // READ SUB-CHANNEL
171	178	//                      logerror("T10MMC: READ SUB-CHANNEL type %d\n", command[3]);
172	179	m_phase = SCSI_PHASE_DATAIN;
	180	m_status_code = SCSI_STATUS_CODE_GOOD;
173	181	m_transfer_length = SCSILengthFromUINT16( &command[ 7 ] );
174	182	break;
175	183
r26162	r26163
203	211	abort_audio();
204	212
205	213	m_phase = SCSI_PHASE_DATAIN;
	214	m_status_code = SCSI_STATUS_CODE_GOOD;
206	215	m_transfer_length = length;
207	216	break;
208	217	}
r26162	r26163
236	245	}
237	246
238	247	m_phase = SCSI_PHASE_STATUS;
	248	m_status_code = SCSI_STATUS_CODE_GOOD;
239	249	m_transfer_length = 0;
240	250	break;
241	251
r26162	r26163
269	279	}
270	280
271	281	m_phase = SCSI_PHASE_STATUS;
	282	m_status_code = SCSI_STATUS_CODE_GOOD;
272	283	m_transfer_length = 0;
273	284	break;
274	285
r26162	r26163
280	291
281	292	logerror("T10MMC: PAUSE/RESUME: %s\n", command[8]&1 ? "RESUME" : "PAUSE");
282	293	m_phase = SCSI_PHASE_STATUS;
	294	m_status_code = SCSI_STATUS_CODE_GOOD;
283	295	m_transfer_length = 0;
284	296	break;
285	297
r26162	r26163
288	300
289	301	logerror("T10MMC: STOP_PLAY_SCAN\n");
290	302	m_phase = SCSI_PHASE_STATUS;
	303	m_status_code = SCSI_STATUS_CODE_GOOD;
291	304	m_transfer_length = 0;
292	305	break;
293	306
294	307	case 0x55: // MODE SELECT(10)
295	308	logerror("T10MMC: MODE SELECT length %x control %x\n", command[7]<<8 | command[8], command[1]);
296	309	m_phase = SCSI_PHASE_DATAOUT;
	310	m_status_code = SCSI_STATUS_CODE_GOOD;
297	311	m_transfer_length = SCSILengthFromUINT16( &command[ 7 ] );
298	312	break;
299	313
300	314	case 0x5a: // MODE SENSE(10)
301	315	m_phase = SCSI_PHASE_DATAIN;
	316	m_status_code = SCSI_STATUS_CODE_GOOD;
302	317	m_transfer_length = SCSILengthFromUINT16( &command[ 7 ] );
303	318	break;
304	319
r26162	r26163
332	347	}
333	348
334	349	m_phase = SCSI_PHASE_STATUS;
	350	m_status_code = SCSI_STATUS_CODE_GOOD;
335	351	m_transfer_length = 0;
336	352	break;
337	353
r26162	r26163
354	370	abort_audio();
355	371
356	372	m_phase = SCSI_PHASE_DATAIN;
	373	m_status_code = SCSI_STATUS_CODE_GOOD;
357	374	m_transfer_length = blocks * m_sector_bytes;
358	375	break;
359	376
360	377	case 0xbb: // SET CD SPEED
361	378	logerror("T10MMC: SET CD SPEED to %d kbytes/sec.\n", command[2]<<8 | command[3]);
362	379	m_phase = SCSI_PHASE_STATUS;
	380	m_status_code = SCSI_STATUS_CODE_GOOD;
363	381	m_transfer_length = 0;
364	382	break;
365	383

trunk/src/emu/machine/cr589.c

r26162	r26163
48	48	case 0x3b: // WRITE BUFFER
49	49	bufferOffset = ( command[ 3 ] << 16 ) | ( command[ 4 ] << 8 ) | command[ 5 ];
50	50	m_phase = SCSI_PHASE_DATAOUT;
	51	m_status_code = SCSI_STATUS_CODE_GOOD;
51	52	m_transfer_length = ( command[ 6 ] << 16 ) | ( command[ 7 ] << 8 ) | command[ 8 ];
52	53	break;
53	54
54	55	case 0x3c: // READ BUFFER
55	56	bufferOffset = ( command[ 3 ] << 16 ) | ( command[ 4 ] << 8 ) | command[ 5 ];
56	57	m_phase = SCSI_PHASE_DATAIN;
	58	m_status_code = SCSI_STATUS_CODE_GOOD;
57	59	m_transfer_length = ( command[ 6 ] << 16 ) | ( command[ 7 ] << 8 ) | command[ 8 ];
58	60	break;
59	61
60	62	case 0xcc: // FIRMWARE DOWNLOAD ENABLE
61	63	m_phase = SCSI_PHASE_DATAOUT;
	64	m_status_code = SCSI_STATUS_CODE_GOOD;
62	65	m_transfer_length = SCSILengthFromUINT16( &command[7] );
63	66	break;
64	67

trunk/src/emu/machine/t10spc.c

r26162	r26163
15	15	void t10spc::t10_reset()
16	16	{
17	17	m_phase = SCSI_PHASE_BUS_FREE;
	18	m_status_code = SCSI_STATUS_CODE_GOOD;
18	19	m_sense_key = 0;
19	20	m_sense_asc = 0;
20	21	m_sense_ascq = 0;
r26162	r26163
35	36	{
36	37	case SCSI_CMD_TEST_UNIT_READY:
37	38	m_phase = SCSI_PHASE_STATUS;
	39	m_status_code = SCSI_STATUS_CODE_GOOD;
38	40	m_transfer_length = 0;
39	41	break;
40	42
41	43	case SCSI_CMD_RECALIBRATE:
42	44	m_phase = SCSI_PHASE_STATUS;
	45	m_status_code = SCSI_STATUS_CODE_GOOD;
43	46	m_transfer_length = 0;
44	47	break;
45	48
46	49	case SCSI_CMD_REQUEST_SENSE:
47	50	m_phase = SCSI_PHASE_DATAIN;
	51	m_status_code = SCSI_STATUS_CODE_GOOD;
48	52	if (command[4] == 0)
49	53	{
50	54	m_transfer_length = 4;
r26162	r26163
61	65
62	66	case SCSI_CMD_SEND_DIAGNOSTIC:
63	67	m_phase = SCSI_PHASE_DATAOUT;
	68	m_status_code = SCSI_STATUS_CODE_GOOD;
64	69	m_transfer_length = SCSILengthFromUINT16(&command[3]);
65	70	break;
66	71
67	72	default:
68	73	logerror( "SCSIDEV unknown command %02x\n", command[ 0 ] );
	74	m_status_code = SCSI_STATUS_CODE_GOOD;
69	75	m_transfer_length = 0;
70	76	break;
71	77	}

trunk/src/emu/machine/t10spc.h

r26162	r26163
45	45	SCSI_SENSE_ASC_ASCQ_ILLEGAL_MODE_FOR_THIS_TRACK = 0x6400
46	46	};
47	47
	48	enum status_code_t
	49	{
	50	SCSI_STATUS_CODE_GOOD = 0x00,
	51	SCSI_STATUS_CODE_CHECK_CONDITION = 0x02,
	52	SCSI_STATUS_CODE_CONDITION_MET = 0x04,
	53	SCSI_STATUS_CODE_BUSY = 0x08,
	54	SCSI_STATUS_CODE_INTERMEDIATE = 0x14,
	55	SCSI_STATUS_CODE_RESERVATION_CONFLICT = 0x18,
	56	SCSI_STATUS_CODE_COMMAND_TERMINATED = 0x22,
	57	SCSI_STATUS_CODE_TASK_SET_FULL = 0x28,
	58	SCSI_STATUS_CODE_ACA_ACTIVE = 0x30,
	59	SCSI_STATUS_CODE_TASK_ABORTED = 0x40
	60	};
	61
48	62	void set_sense(sense_key_t key, sense_asc_ascq_t asc_ascq);
49	63
50	64	UINT8 command[ 32 ];
51	65	int commandLength;
52	66	int m_transfer_length;
53	67	int m_phase;
	68	status_code_t m_status_code;
54	69	UINT8 m_sense_key;
55	70	UINT8 m_sense_asc;
56	71	UINT8 m_sense_ascq;

trunk/src/emu/machine/t10sbc.c

r26162	r26163
36	36	{
37	37	case 0x04: // FORMAT UNIT
38	38	m_phase = SCSI_PHASE_STATUS;
	39	m_status_code = SCSI_STATUS_CODE_GOOD;
39	40	m_transfer_length = 0;
40	41	break;
41	42
r26162	r26163
46	47	logerror("T10SBC: READ at LBA %x for %x blocks\n", lba, blocks);
47	48
48	49	m_phase = SCSI_PHASE_DATAIN;
	50	m_status_code = SCSI_STATUS_CODE_GOOD;
49	51	m_transfer_length = blocks * m_sector_bytes;
50	52	break;
51	53
r26162	r26163
56	58	logerror("T10SBC: WRITE to LBA %x for %x blocks\n", lba, blocks);
57	59
58	60	m_phase = SCSI_PHASE_DATAOUT;
	61	m_status_code = SCSI_STATUS_CODE_GOOD;
59	62	m_transfer_length = blocks * m_sector_bytes;
60	63	break;
61	64
62	65	case 0x12: // INQUIRY
63	66	m_phase = SCSI_PHASE_DATAIN;
	67	m_status_code = SCSI_STATUS_CODE_GOOD;
64	68	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
65	69	break;
66	70
67	71	case 0x15: // MODE SELECT (used to set CDDA volume)
68	72	logerror("T10SBC: MODE SELECT length %x control %x\n", command[4], command[5]);
69	73	m_phase = SCSI_PHASE_DATAOUT;
	74	m_status_code = SCSI_STATUS_CODE_GOOD;
70	75	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
71	76	break;
72	77
73	78	case 0x1a: // MODE SENSE(6)
74	79	m_phase = SCSI_PHASE_DATAIN;
	80	m_status_code = SCSI_STATUS_CODE_GOOD;
75	81	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
76	82	break;
77	83
78	84	case 0x25: // READ CAPACITY
79	85	m_phase = SCSI_PHASE_DATAIN;
	86	m_status_code = SCSI_STATUS_CODE_GOOD;
80	87	m_transfer_length = 8;
81	88	break;
82	89
r26162	r26163
87	94	logerror("T10SBC: READ at LBA %x for %x blocks\n", lba, blocks);
88	95
89	96	m_phase = SCSI_PHASE_DATAIN;
	97	m_status_code = SCSI_STATUS_CODE_GOOD;
90	98	m_transfer_length = blocks * m_sector_bytes;
91	99	break;
92	100
r26162	r26163
97	105	logerror("T10SBC: WRITE to LBA %x for %x blocks\n", lba, blocks);
98	106
99	107	m_phase = SCSI_PHASE_DATAOUT;
	108	m_status_code = SCSI_STATUS_CODE_GOOD;
100	109	m_transfer_length = blocks * m_sector_bytes;
101	110	break;
102	111
r26162	r26163
107	116	logerror("T10SBC: READ at LBA %x for %x blocks\n", lba, blocks);
108	117
109	118	m_phase = SCSI_PHASE_DATAIN;
	119	m_status_code = SCSI_STATUS_CODE_GOOD;
110	120	m_transfer_length = blocks * m_sector_bytes;
111	121	break;
112	122

trunk/src/emu/machine/cdu76s.c

r26162	r26163
7	7	case 0x12: // INQUIRY
8	8	logerror("CDU76S: INQUIRY\n");
9	9	m_phase = SCSI_PHASE_DATAIN;
	10	m_status_code = SCSI_STATUS_CODE_GOOD;
10	11	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
11	12	break;
12	13	}

trunk/src/emu/bus/ieee488/d9060hd.c

r26162	r26163
24	24	case D9060HD_CMD_PHYSICAL_DEVICE_ID:
25	25	case D9060HD_CMD_DRIVE_DIAGS:
26	26	m_phase = SCSI_PHASE_STATUS;
	27	m_status_code = SCSI_STATUS_CODE_GOOD;
27	28	m_transfer_length = 0;
28	29	break;
29	30

trunk/src/mess/machine/s1410.c

r26162	r26163
259	259
260	260	case S1410_CMD_INIT_DRIVE_PARAMS:
261	261	m_phase = SCSI_PHASE_DATAOUT;
	262	m_status_code = SCSI_STATUS_CODE_GOOD;
262	263	m_transfer_length = TRANSFERLENGTH_INIT_DRIVE_PARAMS;
263	264	break;
264	265
265	266	case S1410_CMD_FORMAT_ALT_TRACK:
266	267	m_phase = SCSI_PHASE_DATAOUT;
	268	m_status_code = SCSI_STATUS_CODE_GOOD;
267	269	m_transfer_length = TRANSFERLENGTH_FORMAT_ALT_TRACK;
268	270	break;
269	271
270	272	case S1410_CMD_WRITE_SEC_BUFFER:
271	273	m_phase = SCSI_PHASE_DATAOUT;
	274	m_status_code = SCSI_STATUS_CODE_GOOD;
272	275	m_transfer_length = TRANSFERLENGTH_SECTOR_BUFFER;
273	276	break;
274	277
275	278	case S1410_CMD_READ_SEC_BUFFER:
276	279	m_phase = SCSI_PHASE_DATAIN;
	280	m_status_code = SCSI_STATUS_CODE_GOOD;
277	281	m_transfer_length = TRANSFERLENGTH_SECTOR_BUFFER;
278	282	break;
279	283
r26162	r26163
282	286	case S1410_CMD_DRIVE_DIAGS:
283	287	case S1410_CMD_CONTROLER_DIAGS:
284	288	m_phase = SCSI_PHASE_STATUS;
	289	m_status_code = SCSI_STATUS_CODE_GOOD;
285	290	m_transfer_length = 0;
286	291	break;
287	292

trunk/src/mess/machine/acb4070.c

r26162	r26163
25	25	{
26	26	case ACB4070_CMD_WRITE_DATA_BUFFER:
27	27	m_phase = SCSI_PHASE_DATAOUT;
	28	m_status_code = SCSI_STATUS_CODE_GOOD;
28	29	m_transfer_length = TRANSFERLENGTH_DATA_BUFFER;
29	30	break;
30	31
31	32	case ACB4070_CMD_READ_DATA_BUFFER:
32	33	m_phase = SCSI_PHASE_DATAIN;
	34	m_status_code = SCSI_STATUS_CODE_GOOD;
33	35	m_transfer_length = TRANSFERLENGTH_DATA_BUFFER;
34	36	break;
35	37
36	38	case SCSI_CMD_MODE_SELECT:
37	39	m_phase = SCSI_PHASE_DATAOUT;
	40	m_status_code = SCSI_STATUS_CODE_GOOD;
38	41	m_transfer_length = SCSILengthFromUINT8( &command[ 4 ] );
39	42	break;
40	43

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team