Imported Upstream version 0.72.3

This commit is contained in:
TANIGUCHI Takaki
2012-03-06 11:08:15 +09:00
parent 294f8623c4
commit 4cebc5af7d
813 changed files with 6705 additions and 3158 deletions

View File

@@ -1,5 +1,5 @@
/* dvdisaster: Additional error correction for optical media.
* Copyright (C) 2004-2009 Carsten Gnoerlich.
* Copyright (C) 2004-2011 Carsten Gnoerlich.
* Project home page: http://www.dvdisaster.com
* Email: carsten@dvdisaster.com -or- cgnoerlich@fsfe.org
*
@@ -91,6 +91,11 @@ char* DefaultDevice()
DeviceHandle* OpenDevice(char *device)
{ DeviceHandle *dh;
AlignedBuffer *ab;
Sense *sense;
unsigned char cmd[MAX_CDB_SIZE];
int length;
int phy_int_std;
dh = g_malloc0(sizeof(DeviceHandle));
dh->fd = open(device, O_RDWR | O_NONBLOCK);
@@ -103,6 +108,66 @@ DeviceHandle* OpenDevice(char *device)
dh->device = g_strdup(device);
/*** Probe for parallel SCSI.
We can't use the CDROM_SEND_PACKET ioctl with it. */
Verbose("# *** OpenDevice(%s) - GET CONFIGURATION ***\n", device);
length = 2048;
ab = CreateAlignedBuffer(length);
sense = &dh->sense;
/* Query length of returned data */
memset(cmd, 0, MAX_CDB_SIZE);
cmd[0] = 0x46; /* GET CONFIGURATION */
cmd[1] = 0x02; /* only specified feature */
cmd[2] = 0;
cmd[3] = 1; /* we want the core feature (0x0001) */
cmd[7] = length>>8;
cmd[8] = length&0xff; /* Allocation length */
if(SendPacket(dh, cmd, 10, ab->buf, length, sense, DATA_READ)<0)
{
FreeAlignedBuffer(ab);
Verbose("# failed -> could not get core feature: %s\n",
GetSenseString(sense->sense_key, sense->asc, sense->ascq, 0));
if(Closure->useSCSIDriver == DRIVER_CDROM_FORCED)
Verbose("# Would like to play it safe, but CDROM_SEND_PACKET ioctl()\n"
"# forced via command line. Prepare for wreckage.\n");
else
{ Verbose("# Playing it safe. Forcing use of SG_IO ioctl().\n");
dh->forceSG_IO = TRUE;
}
return dh;
}
length = ab->buf[0]<<24 | ab->buf[1] | ab->buf[2] | ab->buf[3];
if(length < 12)
{ FreeAlignedBuffer(ab);
Verbose("# failed -> invalid length for core feature: %d\n", length);
return dh;
}
phy_int_std = ab->buf[12]<<24 | ab->buf[13]<<16 | ab->buf[14]<<8 | ab->buf[15];
Verbose("# physical interface standard: %d\n", phy_int_std);
switch(phy_int_std)
{ case 2: Verbose("# ATAPI. Hopefully not behind a bridge.\n");
break;
case 1: if(Closure->useSCSIDriver == DRIVER_CDROM_FORCED)
Verbose("# SCSI, but CDROM_SEND_PACKET ioctl() forced via command line.\n"
"# Prepare for wreckage.\n");
else
{ Verbose("# SCSI. Forcing use of SG_IO ioctl().\n");
dh->forceSG_IO = TRUE;
}
break;
}
FreeAlignedBuffer(ab);
return dh;
}
@@ -141,38 +206,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 +268,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.72.2 and 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 +297,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 +309,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 +331,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);
}
@@ -268,10 +367,34 @@ 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);
{ int driver = Closure->useSCSIDriver;
/* Using the CDROM_SEND_PACKET ioctl kills parallel SCSI adapters.
Redirect the necessary probing commands to the SG_IO driver. */
if( (cmd[0] == 0x46 || cmd[0] == 0x12) && driver != DRIVER_CDROM_FORCED)
driver = DRIVER_SG;
if(dh->forceSG_IO)
driver = DRIVER_SG;
/* dispatch to appropriate driver */
switch(driver)
{
case DRIVER_SG:
return send_packet_generic(dh, cmd, cdb_size, buf, size, sense, data_mode);
case DRIVER_CDROM_DEFAULT:
case DRIVER_CDROM_FORCED:
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 */