Silenced a compiler warning. Worked further on /dev/srM test. Not done yet.

This commit is contained in:
Thomas Schmitt 2006-12-11 11:58:52 +00:00
parent dc7c9efb78
commit 76cf98c90f
2 changed files with 13 additions and 4 deletions

View File

@ -1 +1 @@
#define Cdrskin_timestamP "2006.12.11.101350"
#define Cdrskin_timestamP "2006.12.11.115802"

View File

@ -96,15 +96,22 @@ Hint: You should also look into sg-freebsd-port.c, which is a younger and
/* Set this to 1 in order to get on stderr messages from sg_enumerate() */
static int linux_sg_enumerate_debug = 0;
/* The device file family to use for (emulated) generic SCSI transport.
This must be a printf formatter with one single placeholder for int
in the range of 0 to 31 . The resulting addresses must provide SCSI
address parameters Host, Channel, Id, Lun and also Bus.
E.g.: "/dev/sg%d"
*/
/* NOT READY YET !!! DO NOT SET TO OTHER THAN "/dev/sg%d" !!! */
static char linux_sg_device_family[80] = {"/dev/sg%d"};
/* Set this to 1 in order to accept any TYPE_* (see scsi/scsi.h) */
/* NOT READY YET !!! DO NOT SET TO 1 !!! */
static int linux_sg_accept_any_type = 0;
/* The device file family to use for SCSI transport over ATA.
This must be a printf formatter with one single placeholder for a
_single_ char in the range of 'a' to 'z'. This placeholder _must_ be
@ -114,8 +121,9 @@ static char linux_sg_device_family[80] = {"/dev/sg%d"};
static char linux_ata_device_family[80] = {"/dev/hd%c"};
/* >>> Not implemented yet:
Set this to 1 in order to get on stderr messages from ata_enumerate() */
Set this to 1 in order to get on stderr messages from ata_enumerate()i
static int linux_ata_enumerate_verbous = 0;
*/
@ -480,9 +488,10 @@ static void sg_enumerate(void)
errno, strerror(errno));
continue;
}
if (sid.scsi_type != TYPE_ROM) {
if (sid.scsi_type != TYPE_ROM && !linux_sg_accept_any_type) {
if (linux_sg_enumerate_debug)
fprintf(stderr, "sid.scsi_type != TYPE_ROM\n");
fprintf(stderr, "sid.scsi_type = %d (!= TYPE_ROM)\n",
sid.scsi_type);
continue;
}