diff options
| -rw-r--r-- | sys/dev/atapi/acd.c | 8 | ||||
| -rw-r--r-- | sys/scsi/cd.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c index 886f72de68c..2efee890feb 100644 --- a/sys/dev/atapi/acd.c +++ b/sys/dev/atapi/acd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acd.c,v 1.31 1998/07/11 03:48:24 deraadt Exp $ */ +/* $OpenBSD: acd.c,v 1.32 1998/07/12 01:20:20 deraadt Exp $ */ /* * Copyright (c) 1996 Manuel Bouyer. All rights reserved. @@ -51,6 +51,8 @@ #include <dev/atapi/atapilink.h> #include <dev/atapi/atapi.h> +#include <ufs/ffs/fs.h> /* for BBSIZE and SBSIZE */ + #define CDUNIT(z) DISKUNIT(z) #define CDPART(z) DISKPART(z) #define MAKECDDEV(maj, unit, part) MAKEDISKDEV(maj, unit, part) @@ -1013,6 +1015,10 @@ acdgetdisklabel(acd) if (acd_read_toc (acd, CD_LBA_FORMAT, 0, toc, len)) goto done; + /* XXX - these values for BBSIZE and SBSIZE assume ffs */ + lp->d_bbsize = BBSIZE; + lp->d_sbsize = SBSIZE; + /* The raw partition is special. */ lp->d_partitions[RAW_PART].p_offset = 0; lp->d_partitions[RAW_PART].p_size = diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 10d5f7d77bc..cb8372ce589 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.30 1998/03/27 18:40:54 millert Exp $ */ +/* $OpenBSD: cd.c,v 1.31 1998/07/12 01:20:18 deraadt Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -71,6 +71,8 @@ #include <scsi/scsi_disk.h> /* rw_big and start_stop come from there */ #include <scsi/scsiconf.h> +#include <ufs/ffs/fs.h> /* for BBSIZE and SBSIZE */ + #define CDOUTSTANDING 4 #define CDRETRIES 1 @@ -1070,6 +1072,10 @@ cdgetdisklabel(dev, cd) lp->d_interleave = 1; lp->d_flags = D_REMOVABLE; + /* XXX - these values for BBSIZE and SBSIZE assume ffs */ + lp->d_bbsize = BBSIZE; + lp->d_sbsize = SBSIZE; + lp->d_partitions[RAW_PART].p_offset = 0; lp->d_partitions[RAW_PART].p_size = lp->d_secperunit * (lp->d_secsize / DEV_BSIZE); |