diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-06-21 18:50:25 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-06-21 18:50:25 +0000 |
| commit | ad9cbfe6ecb56a2e6038fc1d8747fd71ec1123fd (patch) | |
| tree | f5e0a60f57bf97e927c18a36ec39250a88a88374 /sys/scsi/cd.h | |
| parent | c580f097f14fce63bc6d06d1d07c188f50dd88b6 (diff) | |
Eliminate cd_size() and use scsi_size() + tweaked cd_get_params()
instead. We do not make use of the PMI and RELADDR bits in the
READ CAPACITY command, and thus there is no difference between
cd and sd capacity handling. Brings cd and sd more into line,
shrinks code and makes things easier to understand.
Make types for blocksize and disksize consistant and MI.
Make cdopen() as silent as sdopen().
ok marco@
Diffstat (limited to 'sys/scsi/cd.h')
| -rw-r--r-- | sys/scsi/cd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/scsi/cd.h b/sys/scsi/cd.h index 5965b6a7153..4ec7db3ec81 100644 --- a/sys/scsi/cd.h +++ b/sys/scsi/cd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.h,v 1.16 2008/06/17 01:32:49 krw Exp $ */ +/* $OpenBSD: cd.h,v 1.17 2008/06/21 18:50:24 krw Exp $ */ /* $NetBSD: scsi_cd.h,v 1.6 1996/03/19 03:06:39 mycroft Exp $ */ /* @@ -289,8 +289,8 @@ struct cd_softc { #endif struct scsi_link *sc_link; /* contains our targ, lun, etc. */ struct cd_parms { - int blksize; - u_long disksize; /* total number sectors */ + u_int32_t blksize; + daddr64_t disksize; /* total number sectors */ } params; #ifdef CDDA struct cd_parms orig_params; /* filled in when CD-DA mode starts */ |