diff options
| author | mjacob <mjacob@FreeBSD.org> | 2000-01-17 06:27:37 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2000-01-17 06:27:37 +0000 |
| commit | dd92ee5ec9487fad17edb81a90cdfde89d8c6a17 (patch) | |
| tree | 248957b16755b96be26ed0777974194e4911e695 /sys/cam/scsi/scsi_cd.c | |
| parent | d25de619abae37b3d9718395cb7709c57c6c3ec5 (diff) | |
| download | FreeBSD-src-dd92ee5ec9487fad17edb81a90cdfde89d8c6a17.zip FreeBSD-src-dd92ee5ec9487fad17edb81a90cdfde89d8c6a17.tar.gz | |
Do the minor changes needed because of change to ccb_getdev structure.
JKH Trading Stamps applied.
Reviewed by: gibbs@freebsd.org, ken@freebsd.org
Diffstat (limited to 'sys/cam/scsi/scsi_cd.c')
| -rw-r--r-- | sys/cam/scsi/scsi_cd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 7513f4e..c2e2e25 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -498,7 +498,8 @@ cdasync(void *callback_arg, u_int32_t code, cgd = (struct ccb_getdev *)arg; - if ((cgd->pd_type != T_CDROM) && (cgd->pd_type != T_WORM)) + if (SID_TYPE(&cgd->inq_data) != T_CDROM + && SID_TYPE(&cgd->inq_data) != T_WORM) break; /* @@ -604,7 +605,7 @@ cdregister(struct cam_periph *periph, void *arg) * the structure and indicate that we don't have the blocksize * yet. Unlike other SCSI peripheral drivers, we explicitly set * the device type here to be CDROM, rather than just ORing in - * cgd->pd_type. This is because this driver can attach to either + * the device type. This is because this driver can attach to either * CDROM or WORM devices, and we want this peripheral driver to * show up in the devstat list as a CD peripheral driver, not a * WORM peripheral driver. WORM drives will also have the WORM @@ -1689,7 +1690,7 @@ cddone(struct cam_periph *periph, union ccb *done_ccb) scsi_sense_key_text[sense_key], scsi_sense_desc(asc,ascq, &cgd.inq_data)); - else if (cgd.pd_type == T_CDROM) { + else if (SID_TYPE(&cgd.inq_data) == T_CDROM) { /* * We only print out an error for * CDROM type devices. For WORM |
