Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

nscsi: Correct SCSI command names (#11426)

Browse Source
This commit is contained in:
Miëtek Bak‏ 2023-07-21 09:37:54 +02:00 committed by GitHub
parent de9828d944
commit 627d839a9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 85 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/bus/nscsi/cd.cpp
View File

@ -299,8 +299,8 @@ void nscsi_cdrom_device::scsi_command()
scsi_status_complete(SS_GOOD);
break;
case SC_RECIEVE_DIAG_RES: {
LOG("command RECIEVE DIAGNOSTICS RESULTS");
case SC_RECEIVE_DIAGNOSTIC_RESULTS: {
LOG("command RECEIVE DIAGNOSTIC RESULTS");
int size = (scsi_cmdbuf[3] << 8) | scsi_cmdbuf[4];
int pos = 0;
scsi_cmdbuf[pos++] = 0;
@ -317,8 +317,8 @@ void nscsi_cdrom_device::scsi_command()
break;
}
case SC_SEND_DIAGNOSTICS: {
LOG("command SEND DIAGNOSTICS");
case SC_SEND_DIAGNOSTIC: {
LOG("command SEND DIAGNOSTIC");
int size = (scsi_cmdbuf[3] << 8) | scsi_cmdbuf[4];
if(scsi_cmdbuf[1] & 4) {
// Self-test

10
src/devices/bus/nscsi/hd.cpp
View File

@ -403,8 +403,8 @@ void nscsi_harddisk_device::scsi_command()
scsi_status_complete(SS_GOOD);
break;
case SC_RECIEVE_DIAG_RES: {
LOG("command RECIEVE DIAGNOSTICS RESULTS\n");
case SC_RECEIVE_DIAGNOSTIC_RESULTS: {
LOG("command RECEIVE DIAGNOSTIC RESULTS\n");
int size = (scsi_cmdbuf[3] << 8) | scsi_cmdbuf[4];
int pos = 0;
scsi_cmdbuf[pos++] = 0;
@ -421,8 +421,8 @@ void nscsi_harddisk_device::scsi_command()
break;
}
case SC_SEND_DIAGNOSTICS: {
LOG("command SEND DIAGNOSTICS\n");
case SC_SEND_DIAGNOSTIC: {
LOG("command SEND DIAGNOSTIC\n");
int size = (scsi_cmdbuf[3] << 8) | scsi_cmdbuf[4];
if(scsi_cmdbuf[1] & 4) {
// Self-test
@ -523,7 +523,7 @@ void nscsi_harddisk_device::scsi_command()
scsi_status_complete(SS_GOOD);
break;
case SC_VERIFY:
case SC_VERIFY_10:
LOG("command VERIFY BytChk %d\n", !!(scsi_cmdbuf[1] & 0x02));
if (!(scsi_cmdbuf[1] & 0x02))
scsi_status_complete(SS_GOOD);

2
src/devices/bus/nscsi/s1410.cpp
View File

@ -55,7 +55,7 @@ void nscsi_s1410_device::scsi_command()
switch(scsi_cmdbuf[0]) {
case SC_TEST_UNIT_READY:
case SC_REZERO:
case SC_REZERO_UNIT:
case SC_REASSIGN_BLOCKS:
case SC_READ:
case SC_WRITE:

2
src/devices/bus/nscsi/s1410.h
View File

@ -43,7 +43,7 @@ protected:
// SCSI commands
enum {
SC_TEST_UNIT_READY = 0x00,
SC_REZERO = 0x01,
SC_REZERO_UNIT = 0x01,
SC_REQUEST_SENSE = 0x03,
SC_FORMAT_UNIT = 0x04,
SC_CHECK_TRACK_FORMAT = 0x05,

22
src/devices/machine/nscsi_bus.cpp
View File

@ -198,17 +198,17 @@ nscsi_full_device::nscsi_full_device(const machine_config &mconfig, device_type
}
const char *const nscsi_full_device::command_names[256] = {
/* 00 */ "TEST_UNIT_READY", "REZERO", "?", "REQUEST_SENSE", "FORMAT_UNIT", "?", "?", "REASSIGN_BLOCKS",
/* 08 */ "READ_6/RECIEVE", "?", "WRITE_6/SEND", "SEEK", "?", "?", "?", "?",
/* 10 */ "?", "?", "INQUIRY", "?", "?", "MODE_SELECT_6", "RESERVE_6", "RELEASE_6",
/* 18 */ "?", "?", "MODE_SENSE_6", "START_STOP_UNIT", "RECIEVE_DIAG_RES", "SEND_DIAGNOSTICS", "PREVENT_ALLOW_MEDIUM_REMOVAL", "?",
/* 20 */ "?", "?", "?", "READ_FORMAT_CAPACITIES", "?", "READ_CAPACITY", "?", "?",
/* 00 */ "TEST_UNIT_READY", "REWIND/REZERO_UNIT", "REQUEST_BLOCK_ADDRESS", "REQUEST_SENSE", "FORMAT/FORMAT_UNIT", "READ_BLOCK_LIMITS", "?", "INITIALIZE_ELEMENT_STATUS/REASSIGN_BLOCKS",
/* 08 */ "GET_MESSAGE_6/READ_6/RECEIVE", "?", "PRINT/SEND_MESSAGE_6/SEND_6/WRITE_6", "SEEK_6/SLEW_AND_PRINT", "SEEK_BLOCK", "?", "?", "READ_REVERSE",
/* 10 */ "SYNCHRONIZE_BUFFER/WRITE_FILEMARKS", "SPACE", "INQUIRY", "VERIFY_6", "RECOVER_BUFFERED_DATA", "MODE_SELECT_6", "RESERVE_6/RESERVE_UNIT", "RELEASE_6/RELEASE_UNIT",
/* 18 */ "COPY", "ERASE", "MODE_SENSE_6", "LOAD_UNLOAD/SCAN/STOP_PRINT/START_STOP_UNIT", "RECEIVE_DIAGNOSTIC_RESULTS", "SEND_DIAGNOSTIC", "PREVENT_ALLOW_MEDIUM_REMOVAL", "?",
/* 20 */ "?", "?", "?", "READ_FORMAT_CAPACITIES", "SET_WINDOW", "GET_WINDOW/READ_CAPACITY/READ_CD_RECORDED_CAPACITY", "?", "?",
/* 28 */ "READ_10", "READ_GENERATION", "WRITE_10", "SEEK_10", "ERASE_10", "READ_UPDATED_BLOCK_10", "WRITE_VERIFY", "VERIFY",
/* 30 */ "SEARCH_DATA_HIGH_10", "SEARCH_DATA_EQUAL_10", "SEARCH_DATA_LOW_10", "SET_LIMITS_10", "PREFETCH", "SYNC_CACHE", "LOCK_UNLOCK_CACHE", "READ_DEFECT_DATA",
/* 38 */ "MEDIUM_SCAN", "COMPARE", "COPY_AND_VERIFY", "WRITE_BUFFER", "READ_DATA_BUFFER", "UPDATE_BLOCK", "READ_LONG", "WRITE_LONG",
/* 28 */ "GET_MESSAGE_10/READ_10", "READ_GENERATION", "SEND_MESSAGE_10/SEND_10/WRITE_10", "LOCATE/POSITION_TO_ELEMENT/SEEK_10", "ERASE_10", "READ_UPDATED_BLOCK", "WRITE_AND_VERIFY_10", "VERIFY_10",
/* 30 */ "SEARCH_DATA_HIGH_10", "OBJECT_POSITION/SEARCH_DATA_EQUAL_10", "SEARCH_DATA_LOW_10", "SET_LIMITS_10", "PREFETCH/READ_POSITION", "SYNCHRONIZE_CACHE", "LOCK_UNLOCK_CACHE", "READ_DEFECT_DATA_10",
/* 38 */ "MEDIUM_SCAN", "COMPARE", "COPY_AND_VERIFY", "WRITE_BUFFER", "READ_BUFFER", "UPDATE_BLOCK", "READ_LONG", "WRITE_LONG",
/* 40 */ "CHANGE_DEFINITION", "WRITE_SAME", "READ_SUB_CHANNEL", "READ_TOC_PMA_ATIP", "READ_HEADER", "PLAY_AUDIO_10", "GET_CONFIGURATION", "PLAY_AUDIO_MSF",
/* 48 */ "PLAY_AUDIO_TRACK_INDEX", "PLAY_RELATIVE_10", "GET_EVENT_STATUS_NOTIFICATION", "PAUSE_RESUME", "LOG_SELECT", "LOG_SENSE", "STOP_PLAY_SCAN", "?",
/* 48 */ "PLAY_AUDIO_TRACK_INDEX", "PLAY_TRACK_RELATIVE_10", "GET_EVENT_STATUS_NOTIFICATION", "PAUSE_RESUME", "LOG_SELECT", "LOG_SENSE", "STOP_PLAY_SCAN", "?",
/* 50 */ "XDWRITE", "READ_DISC_INFORMATION/XPWRITE", "READ_TRACK_INFORMATION/XDREAD", "RESERVE_TRACK", "SEND_OPC_INFORMATION", "MODE_SELECT_10", "RESERVE_10", "RELEASE_10",
/* 58 */ "REPAIR_TRACK", "READ_MASTER_CUE", "MODE_SENSE_10", "CLOSE_TRACK_SESSION", "READ_BUFFER_CAPACITY", "SEND_CUE_SHEET", "PERSISTENT_RESERVE_IN", "PERSISTENT_RESERVE_OUT",
/* 80 */ "XDWRITE_EXTENDED", "REBUILD", "REGENERATE", "EXTENDED_COPY", "RECEIVE_COPY_RESULTS", "?", "?", "?",
@ -641,8 +641,8 @@ void nscsi_full_device::scsi_unknown_command()
void nscsi_full_device::scsi_command()
{
switch(scsi_cmdbuf[0]) {
case SC_REZERO:
LOG("command REZERO\n");
case SC_REZERO_UNIT:
LOG("command REZERO UNIT\n");
scsi_status_complete(SS_GOOD);
break;
case SC_REQUEST_SENSE:

90
src/devices/machine/nscsi_bus.h
View File

@ -104,27 +104,27 @@ public:
// Here because some controllers interpret messages
enum {
SM_COMMAND_COMPLETE = 0x00,
SM_EXTENDED_MSG = 0x01,
SM_SAVE_DATA_PTR = 0x02,
SM_RESTORE_PTR = 0x03,
SM_EXTENDED_MESSAGE = 0x01,
SM_SAVE_DATA_POINTER = 0x02,
SM_RESTORE_POINTERS = 0x03,
SM_DISCONNECT = 0x04,
SM_INITIATOR_ERROR = 0x05,
SM_INITIATOR_DETECTED_ERROR = 0x05,
SM_ABORT = 0x06,
SM_MSG_REJECT = 0x07,
SM_NOP = 0x08,
SM_MSG_PARITY = 0x09,
SM_LCMD_COMPLETE = 0x0a,
SM_LCMD_COMPLETE_F = 0x0b,
SM_MESSAGE_REJECT = 0x07,
SM_NO_OPERATION = 0x08,
SM_MESSAGE_PARITY_ERROR = 0x09,
SM_LINKED_COMMAND_COMPLETE = 0x0a,
SM_LINKED_COMMAND_COMPLETE_WITH_FLAG = 0x0b,
SM_BUS_DEVICE_RESET = 0x0c,
SM_ABORT_TAG = 0x0d,
SM_CLEAR_QUEUE = 0x0e,
SM_INIT_RECOVERY = 0x0f,
SM_INITIATE_RECOVERY = 0x0f,
SM_RELEASE_RECOVERY = 0x10,
SM_TERMINATE_IO = 0x11,
SM_SIMPLE_QUEUE = 0x20,
SM_HEAD_QUEUE = 0x21,
SM_ORDERED_QUEUE = 0x22,
SM_IGNORE_WIDE_RES = 0x23
SM_TERMINATE_IO_PROCESS = 0x11,
SM_SIMPLE_QUEUE_TAG = 0x20,
SM_HEAD_OF_QUEUE_TAG = 0x21,
SM_ORDERED_QUEUE_TAG = 0x22,
SM_IGNORE_WIDE_RESIDUE = 0x23
};
void connect_to_bus(nscsi_bus_device *bus, int refid, int default_scsi_id);
@ -173,6 +173,7 @@ protected:
SK_VENDOR_SPECIFIC = 0x09,
SK_COPY_ABORTED = 0x0a,
SK_ABORTED_COMMAND = 0x0b,
SK_EQUAL = 0x0c,
SK_VOLUME_OVERFLOW = 0x0d,
SK_MISCOMPARE = 0x0e,
SK_COMPLETED = 0x0f
@ -189,47 +190,80 @@ protected:
static const char *const command_names[256];
enum {
SC_TEST_UNIT_READY = 0x00,
SC_REZERO = 0x01,
SC_REWIND = 0x01,
SC_REZERO_UNIT = 0x01,
SC_REQUEST_BLOCK_ADDRESS = 0x02,
SC_REQUEST_SENSE = 0x03,
SC_FORMAT = 0x04,
SC_FORMAT_UNIT = 0x04,
SC_READ_BLOCK_LIMITS = 0x05,
SC_INITIALIZE_ELEMENT_STATUS = 0x07,
SC_REASSIGN_BLOCKS = 0x07,
SC_GET_MESSAGE_6 = 0x08,
SC_READ_6 = 0x08,
SC_RECIEVE = 0x08,
SC_RECEIVE = 0x08,
SC_PRINT = 0x0a,
SC_SEND_MESSAGE_6 = 0x0a,
SC_SEND_6 = 0x0a,
SC_WRITE_6 = 0x0a,
SC_SEND = 0x0a,
SC_SEEK = 0x0b,
SC_SEEK_6 = 0x0b,
SC_SLEW_AND_PRINT = 0x0b,
SC_SEEK_BLOCK = 0x0c,
SC_READ_REVERSE = 0x0f,
SC_SYNCHRONIZE_BUFFER = 0x10,
SC_WRITE_FILEMARKS = 0x10,
SC_SPACE = 0x11,
SC_INQUIRY = 0x12,
SC_VERIFY_6 = 0x13,
SC_RECOVER_BUFFERED_DATA = 0x14,
SC_MODE_SELECT_6 = 0x15,
SC_RESERVE_6 = 0x16,
SC_RESERVE_UNIT = 0x16,
SC_RELEASE_6 = 0x17,
SC_RELEASE_UNIT = 0x17,
SC_COPY = 0x18,
SC_ERASE = 0x19,
SC_MODE_SENSE_6 = 0x1a,
SC_LOAD_UNLOAD = 0x1b,
SC_SCAN = 0x1b,
SC_STOP_PRINT = 0x1b,
SC_START_STOP_UNIT = 0x1b,
SC_RECIEVE_DIAG_RES = 0x1c,
SC_SEND_DIAGNOSTICS = 0x1d,
SC_RECEIVE_DIAGNOSTIC_RESULTS = 0x1c,
SC_SEND_DIAGNOSTIC = 0x1d,
SC_PREVENT_ALLOW_MEDIUM_REMOVAL = 0x1e,
SC_READ_FORMAT_CAPACITIES = 0x23,
SC_SET_WINDOW = 0x24,
SC_GET_WINDOW = 0x25,
SC_READ_CAPACITY = 0x25,
SC_READ_CD_RECORDED_CAPACITY = 0x25,
SC_GET_MESSAGE_10 = 0x28,
SC_READ_10 = 0x28,
SC_READ_GENERATION = 0x29,
SC_SEND_MESSAGE_10 = 0x2a,
SC_SEND_10 = 0x2a,
SC_WRITE_10 = 0x2a,
SC_LOCATE = 0x2b,
SC_POSITION_TO_ELEMENT = 0x2b,
SC_SEEK_10 = 0x2b,
SC_ERASE_10 = 0x2c,
SC_READ_UPDATED_BLOCK_10 = 0x2d,
SC_WRITE_VERIFY = 0x2e,
SC_VERIFY = 0x2f,
SC_READ_UPDATED_BLOCK = 0x2d,
SC_WRITE_AND_VERIFY_10 = 0x2e,
SC_VERIFY_10 = 0x2f,
SC_SEARCH_DATA_HIGH_10 = 0x30,
SC_OBJECT_POSITION = 0x31,
SC_SEARCH_DATA_EQUAL_10 = 0x31,
SC_SEARCH_DATA_LOW_10 = 0x32,
SC_SET_LIMITS_10 = 0x33,
SC_PREFETCH = 0x34,
SC_SYNC_CACHE = 0x35,
SC_READ_POSITION = 0x34,
SC_SYNCHRONIZE_CACHE = 0x35,
SC_LOCK_UNLOCK_CACHE = 0x36,
SC_READ_DEFECT_DATA = 0x37,
SC_READ_DEFECT_DATA_10 = 0x37,
SC_MEDIUM_SCAN = 0x38,
SC_COMPARE = 0x39,
SC_COPY_AND_VERIFY = 0x3a,
SC_WRITE_BUFFER = 0x3b,
SC_READ_DATA_BUFFER = 0x3c,
SC_READ_BUFFER = 0x3c,
SC_UPDATE_BLOCK = 0x3d,
SC_READ_LONG = 0x3e,
SC_WRITE_LONG = 0x3f,
@ -242,7 +276,7 @@ protected:
SC_GET_CONFIGURATION = 0x46,
SC_PLAY_AUDIO_MSF = 0x47,
SC_PLAY_AUDIO_TRACK_INDEX = 0x48,
SC_PLAY_RELATIVE_10 = 0x49,
SC_PLAY_TRACK_RELATIVE_10 = 0x49,
SC_GET_EVENT_STATUS_NOTIFICATION = 0x4a,
SC_PAUSE_RESUME = 0x4b,
SC_LOG_SELECT = 0x4c,

2
src/devices/machine/wd33c9x.cpp
View File

@ -1342,7 +1342,7 @@ void wd33c9x_base_device::step(bool timeout)
if (sat && m_xfr_phase == S_PHASE_MSG_IN) {
if (m_regs[COMMAND_PHASE] <= COMMAND_PHASE_CP_BYTES_C) {
switch (m_last_message) {
case SM_SAVE_DATA_PTR:
case SM_SAVE_DATA_POINTER:
set_scsi_state(FINISHED);
irq_fifo_push(SCSI_STATUS_SAVE_DATA_POINTERS);
m_regs[COMMAND_PHASE] = COMMAND_PHASE_SAVE_DATA_POINTER;