deal with the 2340 lie in the right place, i think

diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c
index 4e630ea..7d4bbc9 100644 (file)
--- a/sys/dev/atapi/acd.c
+++ b/sys/dev/atapi/acd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: acd.c,v 1.17 1996/12/11 19:08:24 deraadt Exp $        */
+/*     $OpenBSD: acd.c,v 1.18 1996/12/24 01:33:38 deraadt Exp $        */
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -965,6 +965,8 @@ acdgetdisklabel(acd)
        bzero(acd->sc_dk.dk_cpulabel, sizeof(struct cpu_disklabel));
 
        lp->d_secsize = acd->params.blksize;
+       if (lp->d_secsize > 2048)
+               lp->d_secsize = 2048;
        lp->d_ntracks = 1;
        lp->d_nsectors = 100;
        lp->d_ncylinders = (acd->params.disksize / 100) + 1;
@@ -1048,8 +1050,6 @@ acd_size(acd, flags)
 
        ATAPI_DEBUG_PRINT(("acd_size: %ld %ld\n", acd->params.blksize,
            acd->params.disksize));
-       if (acd->params.blksize > 2048)
-               acd->params.blksize = 2048;
        return acd->params.disksize;
 }
 

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 82a995b..02e8273 100644 (file)
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cd.c,v 1.18 1996/12/11 19:08:14 deraadt Exp $ */
+/*     $OpenBSD: cd.c,v 1.19 1996/12/24 01:33:33 deraadt Exp $ */
 /*     $NetBSD: cd.c,v 1.92 1996/05/05 19:52:50 christos Exp $ */
 
 /*
@@ -1053,6 +1053,8 @@ cdgetdisklabel(cd)
        bzero(cd->sc_dk.dk_cpulabel, sizeof(struct cpu_disklabel));
 
        lp->d_secsize = cd->params.blksize;
+       if (lp->d_secsize > 2048)
+               lp->d_secsize = 2048;
        lp->d_ntracks = 1;
        lp->d_nsectors = 100;
        lp->d_ncylinders = (cd->params.disksize / 100) + 1;