diff options
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 8 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 43e16e3089a..78efcbf8514 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.125 2007/05/25 05:37:16 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.126 2007/06/01 00:07:48 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -1191,12 +1191,6 @@ cdgetdisklabel(dev_t dev, struct cd_softc *cd, struct disklabel *lp, lp->d_magic2 = DISKMAGIC; lp->d_checksum = dkcksum(lp); - /* The raw partition is special. */ - lp->d_partitions[RAW_PART].p_offset = 0; - lp->d_partitions[RAW_PART].p_size = lp->d_secperunit; - lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED; - lp->d_npartitions = RAW_PART + 1; - if (cd_load_toc(cd, toc, CD_LBA_FORMAT)) { audioonly = 0; /* No valid TOC found == not an audio CD. */ goto done; diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index bb3f69875af..b6127a40ba4 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.128 2007/05/31 18:07:18 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.129 2007/06/01 00:07:48 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1039,11 +1039,6 @@ sdgetdisklabel(dev_t dev, struct sd_softc *sd, struct disklabel *lp, 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_partitions[RAW_PART].p_fstype = FS_UNUSED; - lp->d_npartitions = RAW_PART + 1; - lp->d_magic = DISKMAGIC; lp->d_magic2 = DISKMAGIC; lp->d_checksum = dkcksum(lp); |