summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2016-09-04 10:51:25 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2016-09-04 10:51:25 +0000
commit08416d927d2cb6a26c8d180a400b7fd51482ee9c (patch)
tree59281081b576698a9a8950928873589c53fd9624 /sys/arch
parentfa011f38546161218d878c25c58ee1fed5aa53e8 (diff)
Remove support for tape block devices. Nobody mount(8)s tapes any longer.
ok deraadt@ guenther@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/conf.c6
-rw-r--r--sys/arch/amd64/amd64/conf.c6
-rw-r--r--sys/arch/arm/arm/conf.c6
-rw-r--r--sys/arch/hppa/hppa/conf.c6
-rw-r--r--sys/arch/i386/i386/conf.c6
-rw-r--r--sys/arch/landisk/landisk/conf.c6
-rw-r--r--sys/arch/loongson/loongson/conf.c6
-rw-r--r--sys/arch/luna88k/luna88k/conf.c5
-rw-r--r--sys/arch/macppc/macppc/conf.c5
-rw-r--r--sys/arch/octeon/octeon/conf.c6
-rw-r--r--sys/arch/sgi/sgi/conf.c6
-rw-r--r--sys/arch/socppc/socppc/conf.c5
-rw-r--r--sys/arch/sparc64/sparc64/conf.c6
13 files changed, 36 insertions, 39 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 625ba1a4819..97f567ca527 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.82 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.83 2016/09/04 10:51:23 naddy Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -57,7 +57,7 @@ struct bdevsw bdevsw[] =
{
bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */
bdev_swap_init(1,sw), /* 1: swap pseudo-device */
- bdev_tape_init(NST,st), /* 2: SCSI tape */
+ bdev_notdef(), /* 2: was: SCSI tape */
bdev_disk_init(NCD,cd), /* 3: SCSI CD-ROM */
bdev_disk_init(NFD,fd), /* 4: Floppy disk */
bdev_notdef(), /* 5 */
@@ -260,7 +260,7 @@ int chrtoblktbl[] = {
/* 9 */ 9, /* vnd */
/* 10 */ NODEV,
/* 11 */ NODEV,
- /* 12 */ 2, /* st */
+ /* 12 */ NODEV,
/* 13 */ 3, /* cd */
/* 14 */ NODEV,
/* 15 */ NODEV,
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 57e2e2c93b8..731a1d87f72 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.59 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.60 2016/09/04 10:51:23 naddy Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -58,7 +58,7 @@ struct bdevsw bdevsw[] =
bdev_disk_init(NFD,fd), /* 2: floppy diskette */
bdev_notdef(), /* 3 */
bdev_disk_init(NSD,sd), /* 4: SCSI disk */
- bdev_tape_init(NST,st), /* 5: SCSI tape */
+ bdev_notdef(), /* 5: was: SCSI tape */
bdev_disk_init(NCD,cd), /* 6: SCSI CD-ROM */
bdev_notdef(), /* 7 */
bdev_notdef(), /* 8 */
@@ -355,7 +355,7 @@ int chrtoblktbl[] = {
/* 11 */ NODEV,
/* 12 */ NODEV,
/* 13 */ 4, /* sd */
- /* 14 */ 5, /* st */
+ /* 14 */ NODEV,
/* 15 */ 6, /* cd */
/* 16 */ NODEV,
/* 17 */ NODEV,
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 1beeb40ee0b..0e6aaa43da6 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.48 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.49 2016/09/04 10:51:23 naddy Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -173,7 +173,7 @@ struct bdevsw bdevsw[] = {
bdev_notdef(), /* 22: */
bdev_notdef(), /* 23: */
bdev_disk_init(NSD,sd), /* 24: SCSI disk */
- bdev_tape_init(NST,st), /* 25: SCSI tape */
+ bdev_notdef(), /* 25: was: SCSI tape */
bdev_disk_init(NCD,cd), /* 26: SCSI cdrom */
bdev_notdef(), /* 27: */
bdev_notdef(), /* 28: */
@@ -448,7 +448,7 @@ int chrtoblktbl[] = {
/* 22 */ NODEV,
/* 23 */ NODEV,
/* 24 */ 24, /* sd */
- /* 25 */ 25, /* st */
+ /* 25 */ NODEV,
/* 26 */ 26, /* cd */
};
int nchrtoblktbl = nitems(chrtoblktbl);
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 4f8e4b132c6..11766084833 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.65 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.66 2016/09/04 10:51:23 naddy Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -65,7 +65,7 @@ struct bdevsw bdevsw[] =
bdev_disk_init(NVND,vnd), /* 2: vnode disk driver */
bdev_disk_init(NRD,rd), /* 3: RAM disk */
bdev_disk_init(NSD,sd), /* 4: SCSI disk */
- bdev_tape_init(NST,st), /* 5: SCSI tape */
+ bdev_notdef(), /* 5: was: SCSI tape */
bdev_disk_init(NCD,cd), /* 6: SCSI CD-ROM */
bdev_disk_init(NFD,fd), /* 7: floppy drive */
bdev_disk_init(NWD,wd), /* 8: ST506 drive */
@@ -215,7 +215,7 @@ int chrtoblktbl[] = {
/* 8 */ 2, /* vnd */
/* 9 */ 3, /* rd */
/* 10 */ 4, /* sd */
- /* 11 */ 5, /* st */
+ /* 11 */ NODEV,
/* 12 */ 6, /* cd */
/* 13 */ NODEV,
/* 14 */ NODEV,
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 63c6499fc50..812d82d8550 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.156 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.157 2016/09/04 10:51:23 naddy Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -60,7 +60,7 @@ struct bdevsw bdevsw[] =
bdev_disk_init(NFD,fd), /* 2: floppy diskette */
bdev_notdef(), /* 3 */
bdev_disk_init(NSD,sd), /* 4: SCSI disk */
- bdev_tape_init(NST,st), /* 5: SCSI tape */
+ bdev_notdef(), /* 5: was: SCSI tape */
bdev_disk_init(NCD,cd), /* 6: SCSI CD-ROM */
bdev_notdef(), /* 7 */
bdev_notdef(), /* 8 */
@@ -347,7 +347,7 @@ int chrtoblktbl[] = {
/* 11 */ NODEV,
/* 12 */ NODEV,
/* 13 */ 4, /* sd */
- /* 14 */ 5, /* st */
+ /* 14 */ NODEV,
/* 15 */ 6, /* cd */
/* 16 */ NODEV,
/* 17 */ NODEV,
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 181e9b72763..2a0c59d3a70 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.36 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.37 2016/09/04 10:51:23 naddy Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -160,7 +160,7 @@ struct bdevsw bdevsw[] = {
bdev_notdef(), /* 22: */
bdev_notdef(), /* 23: */
bdev_disk_init(NSD,sd), /* 24: SCSI disk */
- bdev_tape_init(NST,st), /* 25: SCSI tape */
+ bdev_notdef(), /* 25: was: SCSI tape */
bdev_disk_init(NCD,cd), /* 26: SCSI cdrom */
bdev_notdef(), /* 27: */
bdev_notdef(), /* 28: */
@@ -424,7 +424,7 @@ int chrtoblktbl[] = {
/* 22 */ NODEV,
/* 23 */ NODEV,
/* 24 */ 24, /* sd */
- /* 25 */ 25, /* st */
+ /* 25 */ NODEV,
/* 26 */ 26, /* cd */
};
int nchrtoblktbl = nitems(chrtoblktbl);
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index d54f0c3242e..3aa932a0485 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.22 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.23 2016/09/04 10:51:23 naddy Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -71,7 +71,7 @@ struct bdevsw bdevsw[] =
bdev_notdef(), /* 7: */
bdev_disk_init(NRD,rd), /* 8: RAM disk (for install) */
bdev_notdef(), /* 9: */
- bdev_tape_init(NST,st), /* 10: SCSI tape */
+ bdev_notdef(), /* 10: was: SCSI tape */
bdev_notdef(), /* 11: */
bdev_notdef(), /* 12: */
bdev_notdef(), /* 13: */
@@ -268,7 +268,7 @@ int chrtoblktbl[] = {
/* 7 */ NODEV,
/* 8 */ 3, /* cd */
/* 9 */ 0, /* sd */
- /* 10 */ 10, /* st */
+ /* 10 */ NODEV,
/* 11 */ 2, /* vnd */
/* 12 */ NODEV,
/* 13 */ NODEV,
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index 022e489f07e..e0468a5969b 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.29 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.30 2016/09/04 10:51:23 naddy Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -79,7 +79,7 @@ struct bdevsw bdevsw[] =
bdev_notdef(), /* 2 */
bdev_swap_init(1,sw), /* 3: swap pseudo-device */
bdev_disk_init(NSD,sd), /* 4: SCSI disk */
- bdev_tape_init(NST,st), /* 5: SCSI tape */
+ bdev_notdef(), /* 5: was: SCSI tape */
bdev_disk_init(NCD,cd), /* 6: SCSI CD-ROM */
bdev_disk_init(NRD,rd), /* 7: ramdisk */
bdev_disk_init(NVND,vnd), /* 8: vnode disk driver */
@@ -224,6 +224,5 @@ int chrtoblktbl[] = {
/* 17 */ NODEV,
/* 18 */ 7, /* rd */
/* 19 */ 8, /* vnd */
- /* 20 */ 5, /* st */
};
int nchrtoblktbl = nitems(chrtoblktbl);
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index a77bccdf813..fc5f2073a96 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.66 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.67 2016/09/04 10:51:24 naddy Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -58,7 +58,7 @@ struct bdevsw bdevsw[] = {
bdev_disk_init(NSD,sd), /* 2 SCSI Disk */
bdev_disk_init(NCD,cd), /* 3 SCSI CD-ROM */
bdev_notdef(), /* 4 unknown*/
- bdev_tape_init(NST,st), /* 5 SCSI tape */
+ bdev_notdef(), /* 5 was: SCSI tape */
bdev_notdef(), /* 6 unknown*/
bdev_notdef(), /* 7 unknown*/
bdev_notdef(), /* 8 */
@@ -283,7 +283,6 @@ int chrtoblktbl[] = {
/* 17 */ 17, /* rd */
/* 18 */ NODEV,
/* 19 */ 14, /* vnd */
- /* 20 */ 5, /* st */
};
int nchrtoblktbl = nitems(chrtoblktbl);
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index 46c1f0d1326..bdf9353e534 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.19 2016/09/02 17:06:12 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.20 2016/09/04 10:51:24 naddy Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@ struct bdevsw bdevsw[] =
bdev_notdef(), /* 7: */
bdev_disk_init(NRD,rd), /* 8: RAM disk (for install) */
bdev_notdef(), /* 9: */
- bdev_tape_init(NST,st), /* 10: SCSI tape */
+ bdev_notdef(), /* 10: was: SCSI tape */
bdev_notdef(), /* 11: */
bdev_notdef(), /* 12: */
bdev_notdef(), /* 13: */
@@ -288,7 +288,7 @@ int chrtoblktbl[] = {
/* 7 */ NODEV,
/* 8 */ 3, /* cd */
/* 9 */ 0, /* sd */
- /* 10 */ 10, /* st */
+ /* 10 */ NODEV,
/* 11 */ 2, /* vnd */
/* 12 */ NODEV,
/* 13 */ NODEV,
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 21508bc135a..c88b0a48c1f 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.38 2016/09/02 17:06:13 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.39 2016/09/04 10:51:24 naddy Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -71,7 +71,7 @@ struct bdevsw bdevsw[] =
bdev_notdef(), /* 7: */
bdev_disk_init(NRD,rd), /* 8: RAM disk (for install) */
bdev_notdef(), /* 9: */
- bdev_tape_init(NST,st), /* 10: SCSI tape */
+ bdev_notdef(), /* 10: was: SCSI tape */
bdev_notdef(), /* 11: */
bdev_notdef(), /* 12: */
bdev_notdef(), /* 13: */
@@ -269,7 +269,7 @@ int chrtoblktbl[] = {
/* 7 */ NODEV,
/* 8 */ 3, /* cd */
/* 9 */ 0, /* sd */
- /* 10 */ 10, /* st */
+ /* 10 */ NODEV,
/* 11 */ 2, /* vnd */
/* 12 */ NODEV,
/* 13 */ NODEV,
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index c567012ad02..ead905c5646 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.27 2016/09/02 17:06:13 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.28 2016/09/04 10:51:24 naddy Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -56,7 +56,7 @@ struct bdevsw bdevsw[] = {
bdev_disk_init(NSD,sd), /* 2 SCSI Disk */
bdev_disk_init(NCD,cd), /* 3 SCSI CD-ROM */
bdev_notdef(), /* 4 unknown*/
- bdev_tape_init(NST,st), /* 5 SCSI tape */
+ bdev_notdef(), /* 5 was: SCSI tape */
bdev_notdef(), /* 6 unknown*/
bdev_notdef(), /* 7 unknown*/
bdev_notdef(), /* 8 */
@@ -261,7 +261,6 @@ int chrtoblktbl[] = {
/* 17 */ 17, /* rd */
/* 18 */ NODEV,
/* 19 */ 14, /* vnd */
- /* 20 */ 5, /* st */
};
int nchrtoblktbl = nitems(chrtoblktbl);
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 211598eefe4..7132352fe0d 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.78 2016/09/02 17:06:13 goda Exp $ */
+/* $OpenBSD: conf.c,v 1.79 2016/09/04 10:51:24 naddy Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -130,7 +130,7 @@ struct bdevsw bdevsw[] =
bdev_disk_init(NVND,vnd), /* 8: vnode disk driver */
bdev_notdef(), /* 9: was: concatenated disk driver */
bdev_notdef(), /* 10: SMD disk -- not this arch */
- bdev_tape_init(NST,st), /* 11: SCSI tape */
+ bdev_notdef(), /* 11: was: SCSI tape */
bdev_disk_init(NWD,wd), /* 12: IDE disk */
bdev_notdef(), /* 13 */
bdev_notdef(), /* 14 */
@@ -354,7 +354,7 @@ int chrtoblktbl[] = {
/* 15 */ NODEV,
/* 16 */ NODEV,
/* 17 */ 7,
- /* 18 */ 11,
+ /* 18 */ NODEV,
/* 19 */ NODEV,
/* 20 */ NODEV,
/* 21 */ NODEV,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 01:09:24 +0000