diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-06-03 17:29:56 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-06-03 17:29:56 +0000 |
| commit | ec73af6142e95e87e5708b24cca25f347597919b (patch) | |
| tree | 9871b0e90560d2321efd770e3cd828cf3aad79c8 /sys/scsi | |
| parent | 50c427201f2890c31ee7e168ca49ebfd3ea711b3 (diff) | |
Move definitions of struct cd_softc{} and CDRETRIES from cdvar.h into
cd.h. Remove include of cdvar.h from cd.c. cdvar.h becomes expendable.
No functional change.
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 4 | ||||
| -rw-r--r-- | sys/scsi/cd.h | 34 |
2 files changed, 34 insertions, 4 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 85ea941a7ac..3428b5f0e82 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.82 2005/06/03 15:50:10 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.83 2005/06/03 17:29:55 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -76,8 +76,6 @@ #include <ufs/ffs/fs.h> /* for BBSIZE and SBSIZE */ -#include "cdvar.h" - #define CDOUTSTANDING 4 #define CDUNIT(z) DISKUNIT(z) diff --git a/sys/scsi/cd.h b/sys/scsi/cd.h index 2361d5972c2..301924875f1 100644 --- a/sys/scsi/cd.h +++ b/sys/scsi/cd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.h,v 1.4 2005/05/28 22:53:00 krw Exp $ */ +/* $OpenBSD: cd.h,v 1.5 2005/06/03 17:29:55 krw Exp $ */ /* $NetBSD: scsi_cd.h,v 1.6 1996/03/19 03:06:39 mycroft Exp $ */ /* @@ -209,4 +209,36 @@ struct cd_audio_page { #define CD_NORMAL_DENSITY_CODE 0x00 /* from Toshiba CD-ROM specs */ #define CD_DA_DENSITY_CODE 0x82 /* from Toshiba CD-ROM specs */ +#define CDRETRIES 4 + +struct cd_softc { + struct device sc_dev; + struct disk sc_dk; + + int flags; +#define CDF_LOCKED 0x01 +#define CDF_WANTED 0x02 +#define CDF_WLABEL 0x04 /* label is writable */ +#define CDF_LABELLING 0x08 /* writing label */ +#define CDF_ANCIENT 0x10 /* disk is ancient; for minphys */ +#ifdef CDDA +#define CDF_CDDA 0x20 +#endif + struct scsi_link *sc_link; /* contains our targ, lun, etc. */ + struct cd_parms { + int blksize; + u_long disksize; /* total number sectors */ + } params; +#ifdef CDDA + struct cd_parms orig_params; /* filled in when CD-DA mode starts */ +#endif + struct buf buf_queue; + char name[16]; /* product name, for default disklabel */ + const struct cd_ops *sc_ops; /* our bus-dependent ops vector */ + +#if NRND > 0 + rndsource_element_t rnd_source; +#endif +}; + #endif |