diff options
| -rw-r--r-- | etc/MAKEDEV | 3 | ||||
| -rw-r--r-- | etc/etc.i386/MAKEDEV | 3 | ||||
| -rw-r--r-- | lib/libdisk/create_chunk.c | 4 | ||||
| -rw-r--r-- | lib/libdisk/disk.c | 4 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/pci/ncr.c | 6 | ||||
| -rw-r--r-- | sys/scsi/cd.c | 4 |
8 files changed, 19 insertions, 11 deletions
diff --git a/etc/MAKEDEV b/etc/MAKEDEV index 0ea5e09..71a9f08 100644 --- a/etc/MAKEDEV +++ b/etc/MAKEDEV @@ -102,7 +102,7 @@ # perfmon CPU performance-monitoring counters # pci PCI configuration-space access from user mode # -# $Id: MAKEDEV,v 1.127 1996/11/01 08:49:13 bde Exp $ +# $Id: MAKEDEV,v 1.128 1996/11/14 14:28:26 andreas Exp $ # PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH @@ -175,6 +175,7 @@ all) sh MAKEDEV std # standard sh MAKEDEV wd0 wd1 wd2 wd3 fd0 fd1 sd0 sd1 sd2 sd3 # bdev, disk sh MAKEDEV cd0 mcd0 scd0 matcd0 wcd0 # bdev, cdrom + sh MAKEDEV od0 # bdev, ODD sh MAKEDEV ft0 wt0 st0 # bdev, tape sh MAKEDEV ttyd0 ttyd1 ttyd2 ttyd3 # cdev, serial sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3 # cdev, serial diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV index 0ea5e09..71a9f08 100644 --- a/etc/etc.i386/MAKEDEV +++ b/etc/etc.i386/MAKEDEV @@ -102,7 +102,7 @@ # perfmon CPU performance-monitoring counters # pci PCI configuration-space access from user mode # -# $Id: MAKEDEV,v 1.127 1996/11/01 08:49:13 bde Exp $ +# $Id: MAKEDEV,v 1.128 1996/11/14 14:28:26 andreas Exp $ # PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH @@ -175,6 +175,7 @@ all) sh MAKEDEV std # standard sh MAKEDEV wd0 wd1 wd2 wd3 fd0 fd1 sd0 sd1 sd2 sd3 # bdev, disk sh MAKEDEV cd0 mcd0 scd0 matcd0 wcd0 # bdev, cdrom + sh MAKEDEV od0 # bdev, ODD sh MAKEDEV ft0 wt0 st0 # bdev, tape sh MAKEDEV ttyd0 ttyd1 ttyd2 ttyd3 # cdev, serial sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3 # cdev, serial diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index 32d8012..3c1eff7 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: create_chunk.c,v 1.23 1996/03/24 18:55:37 joerg Exp $ + * $Id: create_chunk.c,v 1.24 1996/04/29 05:03:01 jkh Exp $ * */ @@ -257,6 +257,8 @@ MakeDev(struct chunk *c1, const char *path) bmaj = 0, cmaj = 3; else if (!strncmp(p, "sd", 2)) bmaj = 4, cmaj = 13; + else if (!strncmp(p, "od", 2)) + bmaj = 20, cmaj = 70; else { return 0; } diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c index 0565d2c..990fca5 100644 --- a/lib/libdisk/disk.c +++ b/lib/libdisk/disk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: disk.c,v 1.22 1996/04/29 05:03:02 jkh Exp $ + * $Id: disk.c,v 1.23 1996/11/27 22:44:33 phk Exp $ * */ @@ -285,7 +285,7 @@ Collapse_Disk(struct disk *d) } #endif -static char * device_list[] = {"wd","sd",0}; +static char * device_list[] = {"wd","sd","od",0}; char ** Disk_Names() diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 657a067..84ec8eb 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $ +# $Id: GENERIC,v 1.78 1996/11/16 01:09:17 gibbs Exp $ machine "i386" cpu "I386_CPU" @@ -62,6 +62,7 @@ device wcd0 #IDE CD-ROM # A single entry for any of these controllers (ncr, ahb, ahc) is sufficient # for any number of installed devices. controller ncr0 +options MAX_LUN=2 #ncr0: for PD drive controller ahb0 controller ahc0 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 657a067..84ec8eb 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $ +# $Id: GENERIC,v 1.78 1996/11/16 01:09:17 gibbs Exp $ machine "i386" cpu "I386_CPU" @@ -62,6 +62,7 @@ device wcd0 #IDE CD-ROM # A single entry for any of these controllers (ncr, ahb, ahc) is sufficient # for any number of installed devices. controller ncr0 +options MAX_LUN=2 #ncr0: for PD drive controller ahb0 controller ahc0 diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 673fe09..5b4e7b9 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.82 1996/10/14 10:09:52 se Exp $ +** $Id: ncr.c,v 1.83 1996/11/08 23:46:04 se Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -53,7 +53,9 @@ #ifdef FAILSAFE #define SCSI_NCR_DFLT_TAGS (0) +#ifndef MAX_LUN #define MAX_LUN (1) +#endif /* MAX_LUN */ #define CDROM_ASYNC #endif /* FAILSAFE */ @@ -1250,7 +1252,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.82 1996/10/14 10:09:52 se Exp $\n"; + "\n$Id: ncr.c,v 1.83 1996/11/08 23:46:04 se Exp $\n"; static const u_long ncr_version = NCR_VERSION * 11 + (u_long) sizeof (struct ncb) * 7 diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index d18add7..1661e55 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 1.72 1996/07/23 21:52:18 phk Exp $ + * $Id: cd.c,v 1.73 1996/09/06 23:09:06 phk Exp $ */ #include "opt_bounce.h" @@ -200,7 +200,7 @@ cdattach(struct scsi_link *sc_link) if (sc_link->quirks & CD_Q_NO_TOUCH) { dp->disksize = 0; } else { - cd_get_parms(unit, SCSI_NOSLEEP | SCSI_NOMASK); + cd_get_parms(unit, SCSI_NOSLEEP | SCSI_NOMASK | SCSI_SILENT); } if (dp->disksize) { printf("cd present [%ld x %ld byte records]", |
