mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-19 10:53:58 +00:00
Fix a benign type mismatch i've introduced in rev 1.40.
Pointed out by: bde
This commit is contained in:
parent
f71a0a5ba8
commit
ecd20d9e4d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=22135
@ -931,7 +931,7 @@ static errval
|
|||||||
scsi_interpret_sense(xs)
|
scsi_interpret_sense(xs)
|
||||||
struct scsi_xfer *xs;
|
struct scsi_xfer *xs;
|
||||||
{
|
{
|
||||||
struct scsi_sense_data *sense;
|
struct scsi_sense_data_new *sense;
|
||||||
struct scsi_sense_extended *ext;
|
struct scsi_sense_extended *ext;
|
||||||
struct scsi_link *sc_link = xs->sc_link;
|
struct scsi_link *sc_link = xs->sc_link;
|
||||||
u_int32_t key;
|
u_int32_t key;
|
||||||
@ -946,7 +946,7 @@ scsi_interpret_sense(xs)
|
|||||||
if (xs->flags & SCSI_ERR_OK)
|
if (xs->flags & SCSI_ERR_OK)
|
||||||
return (ESUCCESS);
|
return (ESUCCESS);
|
||||||
|
|
||||||
sense = &(xs->sense);
|
sense = (struct scsi_sense_data_new *)&(xs->sense);
|
||||||
ext = &(sense->ext.extended);
|
ext = &(sense->ext.extended);
|
||||||
#ifdef SCSIDEBUG
|
#ifdef SCSIDEBUG
|
||||||
if (sc_link->flags & SDEV_DB1) {
|
if (sc_link->flags & SDEV_DB1) {
|
||||||
@ -956,20 +956,20 @@ scsi_interpret_sense(xs)
|
|||||||
sense->error_code & SSD_ERRCODE,
|
sense->error_code & SSD_ERRCODE,
|
||||||
sense->error_code & SSD_ERRCODE_VALID ? 1 : 0);
|
sense->error_code & SSD_ERRCODE_VALID ? 1 : 0);
|
||||||
printf("seg%x key%x ili%x eom%x fmark%x\n",
|
printf("seg%x key%x ili%x eom%x fmark%x\n",
|
||||||
sense->ext.extended.segment,
|
ext->segment,
|
||||||
sense->ext.extended.flags & SSD_KEY,
|
ext->flags & SSD_KEY,
|
||||||
sense->ext.extended.flags & SSD_ILI ? 1 : 0,
|
ext->flags & SSD_ILI ? 1 : 0,
|
||||||
sense->ext.extended.flags & SSD_EOM ? 1 : 0,
|
ext->flags & SSD_EOM ? 1 : 0,
|
||||||
sense->ext.extended.flags & SSD_FILEMARK ? 1 : 0);
|
ext->flags & SSD_FILEMARK ? 1 : 0);
|
||||||
printf("info: %x %x %x %x followed by %d extra bytes\n",
|
printf("info: %x %x %x %x followed by %d extra bytes\n",
|
||||||
sense->ext.extended.info[0],
|
ext->info[0],
|
||||||
sense->ext.extended.info[1],
|
ext->info[1],
|
||||||
sense->ext.extended.info[2],
|
ext->info[2],
|
||||||
sense->ext.extended.info[3],
|
ext->info[3],
|
||||||
sense->ext.extended.extra_len);
|
ext->extra_len);
|
||||||
printf("extra: ");
|
printf("extra: ");
|
||||||
while (count < sense->ext.extended.extra_len) {
|
while (count < ext->extra_len) {
|
||||||
printf("%x ", sense->ext.extended.extra_bytes[count++]);
|
printf("%x ", ext->extra_bytes[count++]);
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user