Imported Upstream version 0.79.3
This commit is contained in:
67
scsi-linux.c
67
scsi-linux.c
@@ -141,38 +141,60 @@ static void assert_cdb_length(unsigned char cdb, int cdb_size, int expected_size
|
||||
cdb_size, cdb, expected_size);
|
||||
}
|
||||
|
||||
static void test_cdb(unsigned char *cdb, int cdb_size)
|
||||
static void assert_cdb_direction(unsigned char cdb, int expected, int given)
|
||||
{
|
||||
if(expected != given)
|
||||
PrintLog("SendPacket(): Wrong data direction %d for opcode %0x (expected %d)\n",
|
||||
given, cdb, expected);
|
||||
}
|
||||
|
||||
static void test_cdb(unsigned char *cdb, int cdb_size, int direction)
|
||||
{
|
||||
switch(cdb[0])
|
||||
{ case 0x00: assert_cdb_length(cdb[0], cdb_size, 6); /* TEST UNIT READY */
|
||||
assert_cdb_direction(cdb[0], DATA_NONE, direction);
|
||||
break;
|
||||
case 0x12: assert_cdb_length(cdb[0], cdb_size, 6); /* INQUIRY */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x1b: assert_cdb_length(cdb[0], cdb_size, 6); /* START STOP */
|
||||
assert_cdb_direction(cdb[0], DATA_NONE, direction);
|
||||
break;
|
||||
case 0x1e: assert_cdb_length(cdb[0], cdb_size, 6); /* PREVENT ALLOW MEDIUM REMOVAL */
|
||||
assert_cdb_direction(cdb[0], DATA_NONE, direction);
|
||||
break;
|
||||
case 0x23: assert_cdb_length(cdb[0], cdb_size, 10); /* READ FORMAT CAPACITIES */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x25: assert_cdb_length(cdb[0], cdb_size, 10); /* READ CAPACITY */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x28: assert_cdb_length(cdb[0], cdb_size, 10); /* READ(10) */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x43: assert_cdb_length(cdb[0], cdb_size, 10); /* READ TOC/PMA/ATIP */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x46: assert_cdb_length(cdb[0], cdb_size, 10); /* GET CONFIGURATION */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x51: assert_cdb_length(cdb[0], cdb_size, 10); /* READ DISC INFORMATION */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x52: assert_cdb_length(cdb[0], cdb_size, 10); /* READ TRACK INFORMATION */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0x55: assert_cdb_length(cdb[0], cdb_size, 10); /* MODE SELECT */
|
||||
assert_cdb_direction(cdb[0], DATA_WRITE, direction);
|
||||
break;
|
||||
case 0x5a: assert_cdb_length(cdb[0], cdb_size, 10); /* MODE SENSE */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0xad: assert_cdb_length(cdb[0], cdb_size, 12); /* READ DVD STRUCTURE */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
case 0xbe: assert_cdb_length(cdb[0], cdb_size, 12); /* READ CD */
|
||||
assert_cdb_direction(cdb[0], DATA_READ, direction);
|
||||
break;
|
||||
default:
|
||||
PrintLog("SendPacket(): Unknown opcode %0x\n", cdb[0]);
|
||||
@@ -181,15 +203,18 @@ static void test_cdb(unsigned char *cdb, int cdb_size)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The CDROM ioctl() interface has been used since the first dvdisaster
|
||||
* release - it's the proven way of accessing the drive.
|
||||
* The CDROM ioctl() interface has been used since the first dvdisaster release.
|
||||
* However with recent 2.6 kernels it seems to become outdated - several parallel
|
||||
* SCSI cards are already exhibiting failures using this interface.
|
||||
* Starting with dvdisaster 0.79.3, the SG_IO interface has become
|
||||
* the default now. You can revert back to old behaviour using --driver=cdrom.
|
||||
*/
|
||||
|
||||
static int send_packet_cdrom(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char *buf, int size, Sense *sense, int data_mode)
|
||||
{ struct cdrom_generic_command cgc;
|
||||
|
||||
#ifdef ASSERT_CDB_LENGTH
|
||||
test_cdb(cmd, cdb_size);
|
||||
test_cdb(cmd, cdb_size, data_mode);
|
||||
#endif
|
||||
|
||||
memset(&cgc, 0, sizeof(cgc));
|
||||
@@ -207,6 +232,9 @@ static int send_packet_cdrom(DeviceHandle *dh, unsigned char *cmd, int cdb_size,
|
||||
case DATA_WRITE:
|
||||
cgc.data_direction = CGC_DATA_WRITE;
|
||||
break;
|
||||
case DATA_NONE:
|
||||
cgc.data_direction = CGC_DATA_NONE;
|
||||
break;
|
||||
default:
|
||||
Stop("illegal data_mode: %d", data_mode);
|
||||
}
|
||||
@@ -216,15 +244,18 @@ static int send_packet_cdrom(DeviceHandle *dh, unsigned char *cmd, int cdb_size,
|
||||
|
||||
/*
|
||||
* Access to the drive through the generic SCSI interface
|
||||
* has been added in dvdisaster 0.72 - it may have undetected flaws.
|
||||
* Only use it if there are problems with the normal CDROM interface
|
||||
* (some ancient parallel SCSI adapters/drives seem to fall into this
|
||||
* category).
|
||||
* has been added in dvdisaster 0.72 - it seems to be better
|
||||
* maintained than the older CDROM_SEND_PACKET interface now.
|
||||
* Especially parallel SCSI cdroms require this now.
|
||||
*/
|
||||
|
||||
static int send_packet_generic(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char *buf, int size, Sense *sense, int data_mode)
|
||||
{ struct sg_io_hdr sg_io;
|
||||
|
||||
#ifdef ASSERT_CDB_LENGTH
|
||||
test_cdb(cmd, cdb_size, data_mode);
|
||||
#endif
|
||||
|
||||
memset(&sg_io, 0, sizeof(sg_io));
|
||||
sg_io.interface_id = 'S';
|
||||
|
||||
@@ -235,6 +266,9 @@ static int send_packet_generic(DeviceHandle *dh, unsigned char *cmd, int cdb_siz
|
||||
case DATA_WRITE:
|
||||
sg_io.dxfer_direction = SG_DXFER_TO_DEV;
|
||||
break;
|
||||
case DATA_NONE:
|
||||
sg_io.dxfer_direction = SG_DXFER_NONE;
|
||||
break;
|
||||
default:
|
||||
Stop("illegal data_mode: %d", data_mode);
|
||||
}
|
||||
@@ -269,9 +303,20 @@ static int send_packet_generic(DeviceHandle *dh, unsigned char *cmd, int cdb_siz
|
||||
|
||||
int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char *buf, int size, Sense *sense, int data_mode)
|
||||
{
|
||||
if(!Closure->useSGioctl)
|
||||
return send_packet_cdrom(dh, cmd, cdb_size, buf, size, sense, data_mode);
|
||||
else return send_packet_generic(dh, cmd, cdb_size, buf, size, sense, data_mode);
|
||||
switch(Closure->useSCSIDriver)
|
||||
{
|
||||
case DRIVER_SG:
|
||||
return send_packet_generic(dh, cmd, cdb_size, buf, size, sense, data_mode);
|
||||
|
||||
case DRIVER_CDROM:
|
||||
return send_packet_cdrom(dh, cmd, cdb_size, buf, size, sense, data_mode);
|
||||
|
||||
default:
|
||||
Stop("no SCSI driver selected");
|
||||
break;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
#endif /* SYS_LINUX */
|
||||
|
||||
Reference in New Issue
Block a user