diff options
120 files changed, 159 insertions, 392 deletions
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware index 182dcd7dec4..101e79cfa8c 100644 --- a/distrib/notes/alpha/hardware +++ b/distrib/notes/alpha/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.104 2009/10/02 18:01:45 miod Exp $ +dnl $OpenBSD: hardware,v 1.105 2010/07/03 03:59:15 krw Exp $ OpenBSD/MACHINE OSREV is expected to run on the following hardware. If you have hardware that is listed here and are unable to run OpenBSD, or if you are able to run OpenBSD on hardware not listed here, please @@ -553,7 +553,7 @@ Supported Peripherals: USB Mice (umouse) [-] USB Modems (umodem) [-] USB Printers (ulpt) [-] - USB Scanners (uscanner, usscanner) [-] + USB Scanners (uscanner) [-] USB-USB cables (upl) [-] FDDI Adapters [*] Digital DEFEA EISA FDDI adapters (fea) diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md index be1b8aa6db0..560097b8387 100644 --- a/etc/etc.alpha/MAKEDEV.md +++ b/etc/etc.alpha/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,alpha)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.47 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.48 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -77,7 +77,6 @@ _DEV(radio, 59) _DEV(rmidi, 41) _DEV(rnd, 34) _DEV(speak, 40) -_DEV(ss, 32) _DEV(systrace, 50) _DEV(tun, 7) _DEV(tuner, 58) @@ -113,7 +112,6 @@ dnl *** alpha specific targets dnl target(all, bio)dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.amd64/MAKEDEV.md b/etc/etc.amd64/MAKEDEV.md index 3e0c77b9a16..5d6430dbb7c 100644 --- a/etc/etc.amd64/MAKEDEV.md +++ b/etc/etc.amd64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,amd64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.40 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.41 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -94,7 +94,6 @@ _DEV(radio, 76) _DEV(rmidi, 52) _DEV(rnd, 45) _DEV(speak, 27) -_DEV(ss, 19) _DEV(systrace, 78) _DEV(tun, 40) _DEV(tuner, 49) @@ -123,7 +122,6 @@ dnl dnl amd64 specific targets dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.armish/MAKEDEV.md b/etc/etc.armish/MAKEDEV.md index e3968c3dc25..647ffca17cf 100644 --- a/etc/etc.armish/MAKEDEV.md +++ b/etc/etc.armish/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,armish)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.18 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.19 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -85,7 +85,6 @@ _DEV(rmidi, 57) _DEV(rnd, 40) _DEV(tun, 33) _DEV(uk, 28) -_DEV(ss, 29) _DEV(systrace, 50) _DEV(tuner, 75) _DEV(vi, 38) @@ -107,7 +106,6 @@ dnl dnl *** armish specific targets dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.aviion/MAKEDEV.md b/etc/etc.aviion/MAKEDEV.md index 47f8767e06f..9676e1c2e8f 100644 --- a/etc/etc.aviion/MAKEDEV.md +++ b/etc/etc.aviion/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,aviion)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.10 2010/06/09 16:10:25 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.11 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -46,7 +46,6 @@ dnl target(all, nvram, 0)dnl dnl target(all, ch, 0)dnl -target(all, ss, 0)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl @@ -96,7 +95,6 @@ _DEV(lkm, 24) _DEV(nvram, 10) _DEV(pf, 39) _DEV(rnd, 40) -_DEV(ss, 42) _DEV(systrace, 50) _DEV(tun, 23) _DEV(uk, 41) diff --git a/etc/etc.hp300/MAKEDEV.md b/etc/etc.hp300/MAKEDEV.md index fec941fad39..1bfaa8d2a83 100644 --- a/etc/etc.hp300/MAKEDEV.md +++ b/etc/etc.hp300/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hp300)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.38 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.39 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -86,7 +86,6 @@ _DEV(fdesc, 21) _DEV(lkm, 24) _DEV(pf, 33) _DEV(rnd, 32) -_DEV(ss, 38) _DEV(systrace, 50) _DEV(tun, 23) _DEV(uk, 37) @@ -168,7 +167,6 @@ ppi*) dnl target(all, ch, 0)dnl -target(all, ss, 0)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.hppa/MAKEDEV.md b/etc/etc.hppa/MAKEDEV.md index dfd5bfaf0e5..ee89958834a 100644 --- a/etc/etc.hppa/MAKEDEV.md +++ b/etc/etc.hppa/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.42 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.43 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -71,7 +71,6 @@ _DEV(pci, 31) _DEV(pdc, 22) _DEV(pf, 21) _DEV(rnd, 20) -_DEV(ss, 14) _DEV(systrace, 34) _DEV(tun, 18) _DEV(uk, 15) @@ -96,7 +95,6 @@ dnl *** hppa specific devices dnl target(all, ch, 0)dnl target(all, bio)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.hppa64/MAKEDEV.md b/etc/etc.hppa64/MAKEDEV.md index c679824c81a..7f6663a3234 100644 --- a/etc/etc.hppa64/MAKEDEV.md +++ b/etc/etc.hppa64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.18 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.19 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -62,7 +62,6 @@ _DEV(pci, 31) _DEV(pdc, 22) _DEV(pf, 21) _DEV(rnd, 20) -_DEV(ss, 14) _DEV(systrace, 34) _DEV(tun, 18) _DEV(uk, 15) @@ -85,7 +84,6 @@ dnl dnl *** hppa64 specific devices dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.i386/MAKEDEV.md b/etc/etc.i386/MAKEDEV.md index b296300c7cc..83929ceb269 100644 --- a/etc/etc.i386/MAKEDEV.md +++ b/etc/etc.i386/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,i386)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.55 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.56 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -97,7 +97,6 @@ _DEV(radio, 76) _DEV(rmidi, 52) _DEV(rnd, 45) _DEV(speak, 27) -_DEV(ss, 19) _DEV(systrace, 78) _DEV(tun, 40) _DEV(tuner, 49) @@ -126,7 +125,6 @@ dnl dnl i386 specific targets dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.landisk/MAKEDEV.md b/etc/etc.landisk/MAKEDEV.md index c8ca14010c9..c960c05c557 100644 --- a/etc/etc.landisk/MAKEDEV.md +++ b/etc/etc.landisk/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,landisk)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.20 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.21 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -89,7 +89,6 @@ _DEV(rmidi, 57) _DEV(rnd, 40) _DEV(tun, 33) _DEV(uk, 28) -_DEV(ss, 29) _DEV(systrace, 50) dnl _DEV(tuner, 75) _DEV(vi, 77) @@ -112,7 +111,6 @@ dnl *** landisk specific targets dnl twrget(all, scif, tty, a)dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.loongson/MAKEDEV.md b/etc/etc.loongson/MAKEDEV.md index 9ddec3fec3c..d267d5255b0 100644 --- a/etc/etc.loongson/MAKEDEV.md +++ b/etc/etc.loongson/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,loongson)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.6 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.7 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -75,7 +75,6 @@ dnl _DEV(lkm) _DEV(pci, 29) _DEV(pf, 31) _DEV(rnd, 33) -_DEV(ss, 34) _DEV(systrace, 50) _DEV(tun, 13) _DEV(uk, 32) @@ -93,7 +92,6 @@ dnl dnl *** loongson specific targets dnl dnl target(all, ch, 0)dnl -dnl target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.luna88k/MAKEDEV.md b/etc/etc.luna88k/MAKEDEV.md index d10e23bd9c5..2c7c5c082de 100644 --- a/etc/etc.luna88k/MAKEDEV.md +++ b/etc/etc.luna88k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,luna88k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.14 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.15 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -36,7 +36,6 @@ dnl all) dnl dnl target(all, ch, 0)dnl -target(all, ss, 0)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl @@ -95,7 +94,6 @@ _DEV(lcd, 10) _DEV(lkm, 24) _DEV(pf, 39) _DEV(rnd, 40) -_DEV(ss, 42) _DEV(systrace, 50) _DEV(tun, 23) _DEV(uk, 41) diff --git a/etc/etc.mac68k/MAKEDEV.md b/etc/etc.mac68k/MAKEDEV.md index c3554d2a594..be9135bc85b 100644 --- a/etc/etc.mac68k/MAKEDEV.md +++ b/etc/etc.mac68k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mac68k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.32 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.33 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -58,7 +58,6 @@ _DEV(fdesc, 21) _DEV(lkm, 25) _DEV(pf, 35) _DEV(rnd, 32) -_DEV(ss, 33) _DEV(systrace, 50) _DEV(tun, 24) _DEV(uk, 34) @@ -103,7 +102,6 @@ target(all, bio)dnl target(all, sd, 0, 1, 2, 3, 4)dnl target(all, vnd, 0, 1, 2, 3)dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.macppc/MAKEDEV.md b/etc/etc.macppc/MAKEDEV.md index 8992aff4200..24067fb96e5 100644 --- a/etc/etc.macppc/MAKEDEV.md +++ b/etc/etc.macppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,macppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.42 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.43 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -92,7 +92,6 @@ _DEV(pci, 71) _DEV(pf, 39) _DEV(radio, 76) _DEV(rnd, 40) -_DEV(ss, 42) _DEV(systrace, 50) _DEV(tun, 23) _DEV(tuner, 75) @@ -115,7 +114,6 @@ dnl twrget(all, s64_tzs, tty, a, b)dnl twrget(all, s64_czs, cua, a, b)dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.mvme68k/MAKEDEV.md b/etc/etc.mvme68k/MAKEDEV.md index 267c21fc946..e529f45cfb9 100644 --- a/etc/etc.mvme68k/MAKEDEV.md +++ b/etc/etc.mvme68k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mvme68k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.27 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.28 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -105,7 +105,6 @@ target(all, vmes, 0)dnl target(all, vmel, 0)dnl dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl @@ -169,7 +168,6 @@ _DEV(nvram, 10) _DEV(pf, 39) _DEV(rnd, 40) _DEV(sram, 7) -_DEV(ss, 42) _DEV(systrace, 50) _DEV(tun, 23) _DEV(uk, 41) diff --git a/etc/etc.mvme88k/MAKEDEV.md b/etc/etc.mvme88k/MAKEDEV.md index de59ae9152e..cb799a35233 100644 --- a/etc/etc.mvme88k/MAKEDEV.md +++ b/etc/etc.mvme88k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mvme88k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.26 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.27 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -72,7 +72,6 @@ target(all, vmes, 0)dnl target(all, vmel, 0)dnl dnl target(all, ch, 0)dnl -target(all, ss, 0)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl @@ -129,7 +128,6 @@ _DEV(nvram, 10) _DEV(pf, 39) _DEV(rnd, 40) _DEV(sram, 7) -_DEV(ss, 42) _DEV(systrace, 50) _DEV(tun, 23) _DEV(vmel, 31) diff --git a/etc/etc.mvmeppc/MAKEDEV.md b/etc/etc.mvmeppc/MAKEDEV.md index 99ee92b5adb..3ce45c4d967 100644 --- a/etc/etc.mvmeppc/MAKEDEV.md +++ b/etc/etc.mvmeppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,macppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.32 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.33 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -434,16 +434,6 @@ uk*) chmod 640 uk$unit ;; -ss*) - unit=${i##*[a-z]} - rm -f ss$unit - mknod ss$unit c 42 $unit - chown root:operator ss$unit - chmod 440 ss$unit -# backwards compatibility with older PINTs - rm -f scan$unit - ln -s ss$unit scan$unit - ;; wscons) sh $this wskbd0 wskbd1 wskbd2 wskbd3 sh $this wsmouse0 wsmouse1 wsmouse2 wsmouse3 @@ -516,7 +506,6 @@ dnl dnl *** mvmeppc specific devices dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl diff --git a/etc/etc.palm/MAKEDEV.md b/etc/etc.palm/MAKEDEV.md index 3bcaf3b2432..523e7f7ed3f 100644 --- a/etc/etc.palm/MAKEDEV.md +++ b/etc/etc.palm/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,palm)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.5 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.6 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -83,7 +83,6 @@ _DEV(rmidi, 57) _DEV(rnd, 40) _DEV(tun, 33) _DEV(uk, 28) -_DEV(ss, 29) _DEV(systrace, 50) _DEV(tuner, 75) _DEV(vi, 38) @@ -105,7 +104,6 @@ dnl dnl *** palm specific targets dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, bio)dnl diff --git a/etc/etc.sgi/MAKEDEV.md b/etc/etc.sgi/MAKEDEV.md index 8f7ec01800d..3cc725a0a64 100644 --- a/etc/etc.sgi/MAKEDEV.md +++ b/etc/etc.sgi/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sgi)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.29 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.30 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -73,7 +73,6 @@ dnl _DEV(lkm) _DEV(pci, 29) _DEV(pf, 31) _DEV(rnd, 33) -_DEV(ss, 34) _DEV(systrace, 50) _DEV(tun, 13) _DEV(uk, 32) @@ -90,7 +89,6 @@ dnl dnl *** sgi specific targets dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.socppc/MAKEDEV.md b/etc/etc.socppc/MAKEDEV.md index 5ec9e301cac..e50c4107ac6 100644 --- a/etc/etc.socppc/MAKEDEV.md +++ b/etc/etc.socppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,socppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.9 2010/06/09 16:10:25 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.10 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -74,7 +74,6 @@ _DEV(pci, 71) _DEV(pf, 39) _DEV(radio, 76) _DEV(rnd, 40) -_DEV(ss, 42) _DEV(systrace, 50) _DEV(tun, 23) dnl _DEV(tuner, 75) @@ -93,7 +92,6 @@ dnl dnl *** socppc specific targets dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.sparc/MAKEDEV.md b/etc/etc.sparc/MAKEDEV.md index 118fc57804b..7b3d3ee8afa 100644 --- a/etc/etc.sparc/MAKEDEV.md +++ b/etc/etc.sparc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.42 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.43 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -101,7 +101,6 @@ _DEV(lkm, 112) _DEV(oppr) _DEV(pf, 59) _DEV(rnd, 119) -_DEV(ss, 121) _DEV(systrace, 50) _DEV(tun, 111) _DEV(uk, 120) @@ -127,7 +126,6 @@ twrget(all, s64_tzs, tty, a, b, c, d)dnl twrget(all, s64_czs, cua, a, b, c, d)dnl target(all, bio)dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.sparc64/MAKEDEV.md b/etc/etc.sparc64/MAKEDEV.md index 367e97efd4b..ff983078652 100644 --- a/etc/etc.sparc64/MAKEDEV.md +++ b/etc/etc.sparc64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.58 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.59 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -110,7 +110,6 @@ _DEV(mag, 71) _DEV(pci, 52) _DEV(pf, 73) _DEV(rnd, 119) -_DEV(ss, 59) _DEV(systrace, 50) _DEV(tun, 111) _DEV(uk, 60) @@ -144,7 +143,6 @@ twrget(wscons, wscons, ttyI, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl twrget(wscons, wscons, ttyJ, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl target(all, ccd, 0, 1, 2, 3)dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.vax/MAKEDEV.md b/etc/etc.vax/MAKEDEV.md index ba0ded73f1c..d13147df23b 100644 --- a/etc/etc.vax/MAKEDEV.md +++ b/etc/etc.vax/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,vax)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.40 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.41 2010/07/03 03:59:15 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -135,7 +135,6 @@ _DEV(fdesc, 53) _DEV(lkm, 28) _DEV(pf, 42) _DEV(rnd, 67) -_DEV(ss, 64) _DEV(systrace, 49) _DEV(tun, 57) _DEV(uk, 65) @@ -206,7 +205,6 @@ dnl *** vax specific targets dnl dnl target(all, ut, 0)dnl dnl target(all, ch, 0)dnl -target(all, ss, 0)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/etc/etc.zaurus/MAKEDEV.md b/etc/etc.zaurus/MAKEDEV.md index 39f2567a201..09f626950d8 100644 --- a/etc/etc.zaurus/MAKEDEV.md +++ b/etc/etc.zaurus/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,zaurus)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.25 2010/06/26 23:49:50 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.26 2010/07/03 03:59:16 krw Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -83,7 +83,6 @@ _DEV(rmidi, 57) _DEV(rnd, 40) _DEV(tun, 33) _DEV(uk, 28) -_DEV(ss, 29) _DEV(systrace, 50) _DEV(tuner, 75) _DEV(vi, 38) @@ -105,7 +104,6 @@ dnl dnl *** zaurus specific targets dnl target(all, ch, 0)dnl -target(all, ss, 0, 1)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl target(all, diskmap)dnl diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 1344f4c5894..fc6b21adb49 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.509 2010/07/03 01:02:25 mlarkin Exp $ +# $OpenBSD: Makefile,v 1.510 2010/07/03 03:59:16 krw Exp $ MAN= aac.4 ac97.4 acphy.4 \ acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \ @@ -49,7 +49,7 @@ MAN= aac.4 ac97.4 acphy.4 \ sdmmc.4 sdhc.4 se.4 ses.4 \ sequencer.4 sf.4 sf2r.4 sfr.4 sili.4 siop.4 sis.4 sk.4 sl.4 sli.4 \ sm.4 softraid.4 spdmem.4 sdtemp.4 speaker.4 sppp.4 sqphy.4 \ - ss.4 st.4 ste.4 stge.4 sti.4 \ + st.4 ste.4 stge.4 sti.4 \ stp.4 sv.4 systrace.4 tcic.4 tcp.4 termios.4 tht.4 ti.4 tl.4 \ tlphy.4 thmc.4 tqphy.4 trm.4 trunk.4 tsl.4 tty.4 tun.4 twe.4 txp.4 \ txphy.4 uaudio.4 uark.4 uath.4 uberry.4 ubsa.4 ubsec.4 ubt.4 \ @@ -58,7 +58,7 @@ MAN= aac.4 ac97.4 acphy.4 \ uipaq.4 uk.4 ukbd.4 \ ukphy.4 ulpt.4 umass.4 umbg.4 umct.4 umidi.4 umodem.4 ums.4 umsm.4 \ unix.4 uow.4 upgt.4 upl.4 uplcom.4 ural.4 urio.4 url.4 urlphy.4 \ - urndis.4 urtw.4 usb.4 usbf.4 uscanner.4 uslcom.4 usscanner.4 uthum.4 \ + urndis.4 urtw.4 usb.4 usbf.4 uscanner.4 uslcom.4 uthum.4 \ uticom.4 utrh.4 uts.4 uvideo.4 uvisor.4 uvscom.4 uyap.4 uyurex.4 \ vether.4 vga.4 vgafb.4 vge.4 \ viaenv.4 viapm.4 viasio.4 vic.4 video.4 vlan.4 vmt.4 vnd.4 vr.4 \ diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4 index 6857cbb70c5..289c4c311d0 100644 --- a/share/man/man4/adv.4 +++ b/share/man/man4/adv.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: adv.4,v 1.24 2008/08/31 14:19:09 jmc Exp $ +.\" $OpenBSD: adv.4,v 1.25 2010/07/03 03:59:16 krw Exp $ .\" .\" Copyright (c) 1998, Jason Downs. All rights reserved. .\" @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: August 31 2008 $ +.Dd $Mdocdate: July 3 2010 $ .Dt ADV 4 .Os .Sh NAME @@ -113,7 +113,6 @@ ConnectCom. .Xr intro 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Sh AUTHORS diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4 index 5f245a806d3..7824438dbe4 100644 --- a/share/man/man4/aha.4 +++ b/share/man/man4/aha.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: aha.4,v 1.8 2007/05/31 19:19:48 jmc Exp $ +.\" $OpenBSD: aha.4,v 1.9 2010/07/03 03:59:16 krw Exp $ .\" .\" Copyright (c) 1994 James A. Jegers .\" All rights reserved. @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt AHA 4 .Os .Sh NAME @@ -58,6 +58,5 @@ megabytes of memory. .Xr intro 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4 index 8f9ff5f35f9..368739d0879 100644 --- a/share/man/man4/ahb.4 +++ b/share/man/man4/ahb.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ahb.4,v 1.7 2007/05/31 19:19:48 jmc Exp $ +.\" $OpenBSD: ahb.4,v 1.8 2010/07/03 03:59:16 krw Exp $ .\" .\" Copyright (c) 1994 James A. Jegers .\" All rights reserved. @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt AHB 4 .Os .Sh NAME @@ -42,6 +42,5 @@ driver provides support for the Adaptec AHA-1742 EISA SCSI adapter. .Xr intro 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4 index a5ce78562d6..9191b3ca480 100644 --- a/share/man/man4/ahc.4 +++ b/share/man/man4/ahc.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ahc.4,v 1.37 2010/02/18 13:14:19 schwarze Exp $ +.\" $OpenBSD: ahc.4,v 1.38 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: ahc.4,v 1.1.2.1 1996/08/25 17:22:14 thorpej Exp $ .\" .\" Copyright (c) 1995, 1996 @@ -27,7 +27,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: February 18 2010 $ +.Dd $Mdocdate: July 3 2010 $ .Dt AHC 4 .Os .Sh NAME @@ -262,7 +262,6 @@ restoring SCB data. .Xr pci 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Sh AUTHORS diff --git a/share/man/man4/aic.4 b/share/man/man4/aic.4 index 2bed583c10b..884b0c02342 100644 --- a/share/man/man4/aic.4 +++ b/share/man/man4/aic.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: aic.4,v 1.6 2007/05/31 19:19:49 jmc Exp $ +.\" $OpenBSD: aic.4,v 1.7 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: aic.4,v 1.5 1998/06/07 09:08:45 enami Exp $ .\" .\" Copyright (c) 1997 Jason R. Thorpe. All rights reserved. @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt AIC 4 .Os .Sh NAME @@ -89,6 +89,5 @@ to connect the boot device. .Xr pcmcia 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 diff --git a/share/man/man4/bha.4 b/share/man/man4/bha.4 index e67beb1475d..a82d7140996 100644 --- a/share/man/man4/bha.4 +++ b/share/man/man4/bha.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bha.4,v 1.9 2007/05/31 19:19:49 jmc Exp $ +.\" $OpenBSD: bha.4,v 1.10 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: bha.4,v 1.10 1999/12/17 16:23:21 abs Exp $ .\" .\" Copyright (c) 1994 James A. Jegers @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt BHA 4 .Os .Sh NAME @@ -58,7 +58,6 @@ adapters: .Xr pci 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Sh HISTORY diff --git a/share/man/man4/iha.4 b/share/man/man4/iha.4 index c8b9e83b42d..66d8046a036 100644 --- a/share/man/man4/iha.4 +++ b/share/man/man4/iha.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: iha.4,v 1.14 2007/10/18 21:12:06 otto Exp $ +.\" $OpenBSD: iha.4,v 1.15 2010/07/03 03:59:16 krw Exp $ .\" .\" Copyright (c) 2001, Kenneth R. Westerback. All rights reserved. .\" @@ -23,7 +23,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: October 18 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt IHA 4 .Os .Sh NAME @@ -55,7 +55,6 @@ Iwill 2935UW .Xr pci 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Pp diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4 index 303d5a0b2da..5dee379eebb 100644 --- a/share/man/man4/isp.4 +++ b/share/man/man4/isp.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: isp.4,v 1.26 2010/03/09 22:23:21 schwarze Exp $ +.\" $OpenBSD: isp.4,v 1.27 2010/07/03 03:59:16 krw Exp $ .\" .\" Copyright (c) 1998, 1999 .\" Matthew Jacob, for NASA/Ames Research Center @@ -26,7 +26,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: March 9 2010 $ +.Dd $Mdocdate: July 3 2010 $ .Dt ISP 4 .Os .Sh NAME @@ -77,7 +77,6 @@ initialized upon power-up. .Xr scsi 4 , .Xr sd 4 , .Xr ses 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Sh AUTHORS diff --git a/share/man/man4/oosiop.4 b/share/man/man4/oosiop.4 index d4fcd1d5031..ab8714c3be1 100644 --- a/share/man/man4/oosiop.4 +++ b/share/man/man4/oosiop.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: oosiop.4,v 1.5 2007/05/31 19:19:51 jmc Exp $ +.\" $OpenBSD: oosiop.4,v 1.6 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: osiop.4,v 1.2 2001/09/22 01:44:55 wiz Exp $ .\" .\" Copyright (c) 2001 Izumi Tsutsui. All rights reserved. @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt OOSIOP 4 .Os .Sh NAME @@ -102,7 +102,6 @@ driver. .Xr scsi 4 , .Xr sd 4 , .Xr siop 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Pp diff --git a/share/man/man4/osiop.4 b/share/man/man4/osiop.4 index 13df3008117..f9e515efad7 100644 --- a/share/man/man4/osiop.4 +++ b/share/man/man4/osiop.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: osiop.4,v 1.9 2009/02/17 22:33:37 miod Exp $ +.\" $OpenBSD: osiop.4,v 1.10 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: osiop.4,v 1.2 2001/09/22 01:44:55 wiz Exp $ .\" .\" Copyright (c) 2001 Izumi Tsutsui. All rights reserved. @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: February 17 2009 $ +.Dd $Mdocdate: July 3 2010 $ .Dt OSIOP 4 .Os .Sh NAME @@ -98,7 +98,6 @@ will suffer. .Xr scsi 4 , .Xr sd 4 , .Xr siop 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Pp diff --git a/share/man/man4/pcscp.4 b/share/man/man4/pcscp.4 index 0a10b5d0738..f75a53ac9ba 100644 --- a/share/man/man4/pcscp.4 +++ b/share/man/man4/pcscp.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pcscp.4,v 1.12 2008/06/26 05:42:07 ray Exp $ +.\" $OpenBSD: pcscp.4,v 1.13 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: pcscp.4,v 1.3 1999/09/12 18:47:12 kleink Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -26,7 +26,7 @@ .\" .\" $NetBSD: pcscp.4,v 1.3 1999/09/12 18:47:12 kleink Exp $ .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: July 3 2010 $ .Dt PCSCP 4 .Os .Sh NAME @@ -65,7 +65,6 @@ driver. .Xr pci 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Pp diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index f558c3a5fe6..8934e0a180e 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: scsi.4,v 1.30 2008/01/26 23:07:55 jmc Exp $ +.\" $OpenBSD: scsi.4,v 1.31 2010/07/03 03:59:16 krw Exp $ .\" .\" Copyright (c) 1996 .\" Julian Elischer <julian@freebsd.org>. All rights reserved. @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 26 2008 $ +.Dd $Mdocdate: July 3 2010 $ .Dt SCSI 4 .Os .Sh NAME @@ -165,7 +165,6 @@ shows more detailed information including DMA scatter-gather logs. .Xr safte 4 , .Xr sd 4 , .Xr ses 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 , .Xr scsi 8 diff --git a/share/man/man4/trm.4 b/share/man/man4/trm.4 index 585311975ae..0ad317ff60c 100644 --- a/share/man/man4/trm.4 +++ b/share/man/man4/trm.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: trm.4,v 1.6 2007/05/31 19:19:52 jmc Exp $ +.\" $OpenBSD: trm.4,v 1.7 2010/07/03 03:59:16 krw Exp $ .\" .\" Copyright (c) 2001-2002, Ashley R. Martens and Kenneth R. Westerback. .\" All rights reserved. @@ -26,7 +26,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt TRM 4 .Os .Sh NAME @@ -54,7 +54,6 @@ Tekram DC315/U .Xr pci 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 , .Xr uk 4 .Pp diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4 index 25897acdedf..2816d73bd54 100644 --- a/share/man/man4/uk.4 +++ b/share/man/man4/uk.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: uk.4,v 1.16 2007/05/31 19:19:52 jmc Exp $ +.\" $OpenBSD: uk.4,v 1.17 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: uk.4,v 1.3 1996/10/20 23:15:26 explorer Exp $ .\" .\" Copyright (c) 1996 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 3 2010 $ .Dt UK 4 .Os .Sh NAME @@ -68,7 +68,6 @@ devices. .Xr ch 4 , .Xr scsi 4 , .Xr sd 4 , -.Xr ss 4 , .Xr st 4 .Sh HISTORY The diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4 index 2be23927c3f..2d2bd82b3da 100644 --- a/share/man/man4/usb.4 +++ b/share/man/man4/usb.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: usb.4,v 1.121 2010/04/19 06:44:30 jmc Exp $ +.\" $OpenBSD: usb.4,v 1.122 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 19 2010 $ +.Dd $Mdocdate: July 3 2010 $ .Dt USB 4 .Os .Sh NAME @@ -264,8 +264,6 @@ Maxim/Dallas DS2490 USB 1-Wire adapter Prolific based host-to-host adapters .It Xr uscanner 4 USB scanner support -.It Xr usscanner 4 -SCSI-over-USB scanners .It Xr uts 4 USB touchscreen support .It Xr uyap 4 diff --git a/share/man/man4/usscanner.4 b/share/man/man4/usscanner.4 index bf88e8b05dc..9893904355e 100644 --- a/share/man/man4/usscanner.4 +++ b/share/man/man4/usscanner.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: usscanner.4,v 1.8 2008/06/26 05:42:07 ray Exp $ +.\" $OpenBSD: usscanner.4,v 1.9 2010/07/03 03:59:16 krw Exp $ .\" $NetBSD: usscanner.4,v 1.1 2001/01/11 06:10:01 augustss Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: July 3 2010 $ .Dt USSCANNER 4 .Os .Sh NAME @@ -53,7 +53,6 @@ driver works with the following scanners: .Sh SEE ALSO .Xr intro 4 , .Xr scsi 4 , -.Xr ss 4 , .Xr uhub 4 , .Xr usb 4 , .Xr uscanner 4 diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 80e3193c1eb..b8deedb6a4a 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.62 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.63 2010/07/03 03:59:16 krw Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -49,7 +49,6 @@ bdev_decl(fd); #include "st.h" #include "cd.h" #include "sd.h" -#include "ss.h" #include "uk.h" #include "vnd.h" #include "raid.h" @@ -171,7 +170,7 @@ struct cdevsw cdevsw[] = cdev_mouse_init(NWSKBD,wskbd), /* 29: /dev/kbd XXX */ cdev_mouse_init(NWSMOUSE,wsmouse), /* 30: /dev/mouse XXX */ cdev_lpt_init(NLPT,lpt), /* 31: parallel printer */ - cdev_scanner_init(NSS,ss), /* 32: SCSI scanner */ + cdev_notdef(), /* 32: */ cdev_uk_init(NUK,uk), /* 33: SCSI unknown */ cdev_random_init(1,random), /* 34: random data source */ cdev_pf_init(NPF, pf), /* 35: packet filter */ diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 0913196e482..243fc3f4658 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.212 2010/06/30 20:38:49 tedu Exp $ +# $OpenBSD: GENERIC,v 1.213 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -114,8 +114,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -373,7 +371,6 @@ ahc* at eisa? # Adaptec 274x, aic7770 SCSI # SCSI devices cd* at scsibus? sd* at scsibus? -ss* at scsibus? st* at scsibus? ch* at scsibus? safte* at scsibus? diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 8a461dc1367..82a9570c238 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.80 2009/09/27 19:30:38 sthen Exp $ +# $OpenBSD: RAMDISKBIG,v 1.81 2010/07/03 03:59:16 krw Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -294,7 +294,6 @@ ahc* at eisa? # Adaptec 274x, aic7770 SCSI # SCSI devices cd* at scsibus? sd* at scsibus? -ss* at scsibus? st* at scsibus? ch* at scsibus? uk* at scsibus? diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index 5cf71ed028a..e0d220405fe 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.28 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.29 2010/07/03 03:59:16 krw Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -122,7 +122,6 @@ cdev_decl(wd); cdev_decl(com); cdev_decl(fd); cdev_decl(scd); -#include "ss.h" #include "lpt.h" cdev_decl(lpt); #include "ch.h" @@ -214,7 +213,7 @@ struct cdevsw cdevsw[] = cdev_lpt_init(NLPT,lpt), /* 16: parallel printer */ cdev_ch_init(NCH,ch), /* 17: SCSI autochanger */ cdev_disk_init(NCCD,ccd), /* 18: concatenated disk driver */ - cdev_ss_init(NSS,ss), /* 19: SCSI scanner */ + cdev_notdef(), /* 19 */ cdev_uk_init(NUK,uk), /* 20: unknown SCSI */ cdev_notdef(), /* 21 */ cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index c6b26ccd4bc..d72c1e2be8b 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.291 2010/07/03 01:02:25 mlarkin Exp $ +# $OpenBSD: GENERIC,v 1.292 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -225,8 +225,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -388,7 +386,6 @@ sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives ch* at scsibus? # SCSI autochangers -ss* at scsibus? # SCSI scanners safte* at scsibus? # SCSI accessed fault-tolerant encl ses* at scsibus? # SCSI enclosure services uk* at scsibus? # unknown SCSI diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index e2dedbd730a..04adcc08dd9 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.49 2009/01/13 13:53:50 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.50 2010/07/03 03:59:16 krw Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -107,8 +107,6 @@ wskbd* at ukbd? mux 1 #upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' #urio* at uhub? # Diamond Multimedia Rio 500 #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 7509080fe50..23ba4f17899 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.113 2010/04/06 03:55:47 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.114 2010/07/03 03:59:16 krw Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -118,8 +118,6 @@ wi* at uhub? # WaveLAN IEEE 802.11DS upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' #urio* at uhub? # Diamond Multimedia Rio 500 #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500 diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c index bbee6a071be..e73b1d8f7a5 100644 --- a/sys/arch/arm/arm/conf.c +++ b/sys/arch/arm/arm/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.25 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.26 2010/07/03 03:59:16 krw Exp $ */ /* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */ /* @@ -118,7 +118,6 @@ cdev_decl(pci); #include "cd.h" #include "ch.h" #include "uk.h" -#include "ss.h" #include "bio.h" /* @@ -329,7 +328,7 @@ struct cdevsw cdevsw[] = { cdev_disk_init(NCD,cd), /* 26: SCSI CD-ROM */ cdev_ch_init(NCH,ch), /* 27: SCSI autochanger */ cdev_uk_init(NUK,uk), /* 28: SCSI unknown */ - cdev_scanner_init(NSS,ss), /* 29: SCSI scanner */ + cdev_notdef(), /* 29: */ cdev_lkm_dummy(), /* 30: */ cdev_lkm_dummy(), /* 31: */ cdev_lkm_dummy(), /* 32: */ diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index 98eff064144..2242d4bfb70 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.31 2010/04/26 20:51:51 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.32 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -75,7 +75,6 @@ sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives #ch* at scsibus? # SCSI autochangers -#ss* at scsibus? # SCSI scanners #uk* at scsibus? # unknown SCSI # USB Controllers @@ -146,8 +145,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK index b5ce7362e98..be62e850370 100644 --- a/sys/arch/armish/conf/RAMDISK +++ b/sys/arch/armish/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.15 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.16 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -77,7 +77,6 @@ sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives #ch* at scsibus? # SCSI autochangers -#ss* at scsibus? # SCSI scanners #uk* at scsibus? # unknown SCSI # USB Controllers @@ -137,8 +136,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c index 6b0896f36b6..7f9b6dcb2c5 100644 --- a/sys/arch/aviion/aviion/conf.c +++ b/sys/arch/aviion/aviion/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.10 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.11 2010/07/03 03:59:16 krw Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -52,7 +52,6 @@ #include "pty.h" #include "rd.h" #include "sd.h" -#include "ss.h" #include "st.h" #include "systrace.h" #include "tun.h" @@ -133,7 +132,7 @@ struct cdevsw cdevsw[] = cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41 */ - cdev_ss_init(NSS,ss), /* 42 */ + cdev_notdef(), /* 42 */ cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */ cdev_ch_init(NCH,ch), /* 44: SCSI autochanger */ cdev_notdef(), /* 45 */ diff --git a/sys/arch/aviion/conf/GENERIC b/sys/arch/aviion/conf/GENERIC index ed0fd8bcad5..80940023ee7 100644 --- a/sys/arch/aviion/conf/GENERIC +++ b/sys/arch/aviion/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.5 2010/04/21 19:33:47 miod Exp $ +# $OpenBSD: GENERIC,v 1.6 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -92,7 +92,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC index 4e93b751279..7f972216864 100644 --- a/sys/arch/beagle/conf/GENERIC +++ b/sys/arch/beagle/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.2 2010/06/27 20:15:11 drahn Exp $ +# $OpenBSD: GENERIC,v 1.3 2010/07/03 03:59:16 krw Exp $ # # GENERIC machine description file # @@ -141,8 +141,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -155,7 +153,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? uk* at scsibus? # onboard uarts diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK index aea1e2da333..602676e6129 100644 --- a/sys/arch/beagle/conf/RAMDISK +++ b/sys/arch/beagle/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.7 2010/06/27 20:15:11 drahn Exp $ +# $OpenBSD: RAMDISK,v 1.8 2010/07/03 03:59:16 krw Exp $ # # GENERIC machine description file # @@ -146,8 +146,6 @@ ommmc0 at ahb? addr 0x4809c000 intr 83 # wi* at uhub? # WaveLAN IEEE 802.11DS # urio* at uhub? # Diamond Multimedia Rio 500 # uscanner* at uhub? # USB Scanners -# usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -# scsibus* at usscanner? # #uyap* at uhub? # Y@P firmware loader # udsbr* at uhub? # D-Link DSB-R100 radio # radio* at udsbr? # USB radio @@ -160,7 +158,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? uk* at scsibus? diff --git a/sys/arch/gumstix/conf/GENERIC b/sys/arch/gumstix/conf/GENERIC index 1712a415791..ac1c9a7b88f 100644 --- a/sys/arch/gumstix/conf/GENERIC +++ b/sys/arch/gumstix/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.6 2010/04/26 20:51:51 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.7 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -127,8 +127,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -142,7 +140,6 @@ sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives #ch* at scsibus? # SCSI autochangers -#ss* at scsibus? # SCSI scanners #uk* at scsibus? # unknown SCSI # integrated 16550 UARTs diff --git a/sys/arch/gumstix/conf/RAMDISK b/sys/arch/gumstix/conf/RAMDISK index 7640f262632..d257cacecec 100644 --- a/sys/arch/gumstix/conf/RAMDISK +++ b/sys/arch/gumstix/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.2 2010/04/26 20:51:51 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.3 2010/07/03 03:59:16 krw Exp $ machine gumstix arm @@ -89,8 +89,6 @@ pxaost0 at pxaip? addr 0x40a00000 size 0x20 #wi* at uhub? # WaveLAN IEEE 802.11DS #upl* at uhub? # Prolific PL2301/PL2302 host-to-host #uscanner* at uhub? # USB Scanner driver -#usscanner* at uhub? # USB SCSI scanners -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver #umass* at uhub? # USB Mass Storage devices @@ -105,7 +103,6 @@ pxaost0 at pxaip? addr 0x40a00000 size 0x20 #st* at scsibus? #cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? # integrated 16550 UARTs diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index f25ca470492..66eba0bf90d 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.49 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: GENERIC,v 1.50 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -125,7 +125,6 @@ sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs ch* at scsibus? # SCSI changer devices -ss* at scsibus? # SCSI scanners safte* at scsibus? # SCSI AF-TE ses* at scsibus? # SCSI enclosure services uk* at scsibus? # unknown SCSI devices diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c index 0bc3dcc63f7..31eba67c169 100644 --- a/sys/arch/hp300/hp300/conf.c +++ b/sys/arch/hp300/hp300/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.47 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.48 2010/07/03 03:59:16 krw Exp $ */ /* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */ /*- @@ -51,7 +51,6 @@ bdev_decl(mt); bdev_decl(hd); #include "rd.h" #include "sd.h" -#include "ss.h" #include "st.h" #include "uk.h" #include "vnd.h" @@ -155,7 +154,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NAPCI,apci), /* 35: Apollo APCI UARTs */ cdev_ksyms_init(NKSYMS,ksyms), /* 36: Kernel symbols device */ cdev_uk_init(NUK,uk), /* 37 */ - cdev_ss_init(NSS,ss), /* 38 */ + cdev_notdef(), /* 38 */ cdev_ch_init(NCH,ch), /* 39 */ cdev_wsdisplay_init(NWSDISPLAY,wsdisplay), /* 40: frame buffers */ cdev_mouse_init(NWSKBD,wskbd), /* 41: keyboards */ diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index c1bbd6e2d3f..9aa4f5c4103 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.134 2010/06/29 20:30:32 guenther Exp $ +# $OpenBSD: GENERIC,v 1.135 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -157,8 +157,6 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -357,7 +355,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index a8a11ec92ea..7cb5c2e6a6a 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.89 2009/06/24 15:02:18 todd Exp $ +# $OpenBSD: RAMDISK,v 1.90 2010/07/03 03:59:16 krw Exp $ # # Diskless kernel config # @@ -154,8 +154,6 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio @@ -336,7 +334,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? pseudo-device rd 1 # ramdisk diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index b4a367c019c..9dc75e2ae13 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.50 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.51 2010/07/03 03:59:16 krw Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -47,7 +47,6 @@ #include "st.h" #include "cd.h" #include "ch.h" -#include "ss.h" #include "uk.h" #include "wd.h" bdev_decl(wd); @@ -142,7 +141,7 @@ struct cdevsw cdevsw[] = cdev_tape_init(NST,st), /* 11: SCSI tape */ cdev_disk_init(NCD,cd), /* 12: SCSI cd-rom */ cdev_ch_init(NCH,ch), /* 13: SCSI changer */ - cdev_ss_init(NSS,ss), /* 14: SCSI scanner */ + cdev_notdef(), /* 14: */ cdev_uk_init(NUK,uk), /* 15: SCSI unknown */ cdev_fd_init(1,filedesc), /* 16: file descriptor pseudo-device */ cdev_bpf_init(NBPFILTER,bpf), /* 17: Berkeley packet filter */ diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index ca783d9daa0..2331846eb97 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.18 2010/06/29 20:30:32 guenther Exp $ +# $OpenBSD: GENERIC,v 1.19 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -110,8 +110,6 @@ pci* at ppb? #wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio @@ -185,7 +183,6 @@ ukphy* at mii? # generic unknown PHYs #st* at scsibus? #cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? #safte* at scsibus? #ses* at scsibus? diff --git a/sys/arch/hppa64/conf/RAMDISK b/sys/arch/hppa64/conf/RAMDISK index 8c9aab04e71..1a10077db8a 100644 --- a/sys/arch/hppa64/conf/RAMDISK +++ b/sys/arch/hppa64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.9 2008/06/08 20:37:39 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.10 2010/07/03 03:59:16 krw Exp $ # # Diskless kernel config # @@ -107,8 +107,6 @@ pcmcia* at cardslot? #wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio @@ -187,7 +185,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? uk* at scsibus? pseudo-device rd 1 # ramdisk diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c index a446d5c5af0..2d977690217 100644 --- a/sys/arch/hppa64/hppa64/conf.c +++ b/sys/arch/hppa64/hppa64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.14 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.15 2010/07/03 03:59:16 krw Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -47,7 +47,6 @@ #include "st.h" #include "cd.h" #include "ch.h" -#include "ss.h" #include "uk.h" #include "wd.h" bdev_decl(wd); @@ -133,7 +132,7 @@ struct cdevsw cdevsw[] = cdev_tape_init(NST,st), /* 11: SCSI tape */ cdev_disk_init(NCD,cd), /* 12: SCSI cd-rom */ cdev_ch_init(NCH,ch), /* 13: SCSI changer */ - cdev_ss_init(NSS,ss), /* 14: SCSI scanner */ + cdev_notdef(), /* 14 */ cdev_uk_init(NUK,uk), /* 15: SCSI unknown */ cdev_fd_init(1,filedesc), /* 16: file descriptor pseudo-device */ cdev_bpf_init(NBPFILTER,bpf), /* 17: Berkeley packet filter */ diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index a280478ecfb..71ea77723b7 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.686 2010/07/03 01:02:25 mlarkin Exp $ +# $OpenBSD: GENERIC,v 1.687 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -283,8 +283,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -519,7 +517,6 @@ sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives ch* at scsibus? # SCSI autochangers -ss* at scsibus? # SCSI scanners safte* at scsibus? # SCSI accessed fault-tolerant enclosures ses* at scsibus? # SCSI enclosure services uk* at scsibus? # unknown SCSI diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 4d471d0fa55..69fc33396c4 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.177 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK_CD,v 1.178 2010/07/03 03:59:16 krw Exp $ machine i386 # architecture, used by config; REQUIRED @@ -140,8 +140,6 @@ mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500 diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index eb7f434fbba..b1a15a69c03 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.133 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.134 2010/07/03 03:59:16 krw Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -122,7 +122,6 @@ cdev_decl(wd); #include "com.h" cdev_decl(com); cdev_decl(fd); -#include "ss.h" #include "lpt.h" cdev_decl(lpt); #include "ch.h" @@ -217,7 +216,7 @@ struct cdevsw cdevsw[] = cdev_lpt_init(NLPT,lpt), /* 16: parallel printer */ cdev_ch_init(NCH,ch), /* 17: SCSI autochanger */ cdev_disk_init(NCCD,ccd), /* 18: concatenated disk driver */ - cdev_ss_init(NSS,ss), /* 19: SCSI scanner */ + cdev_notdef(), /* 19 */ cdev_uk_init(NUK,uk), /* 20: unknown SCSI */ cdev_acpiapm_init(1,acpiapm), /* 21: Power Management stuff */ cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index f1f29ebe302..6507f1e0709 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.25 2010/03/03 20:57:28 mk Exp $ +# $OpenBSD: GENERIC,v 1.26 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -143,8 +143,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index e503a4cc71c..416515022f7 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.16 2010/07/03 03:59:16 krw Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -111,7 +111,6 @@ cdev_decl(pci); #include "cd.h" #include "ch.h" #include "uk.h" -#include "ss.h" /* * Audio devices @@ -308,7 +307,7 @@ struct cdevsw cdevsw[] = { cdev_disk_init(NCD,cd), /* 26: SCSI CD-ROM */ cdev_ch_init(NCH,ch), /* 27: SCSI autochanger */ cdev_uk_init(NUK,uk), /* 28: SCSI unknown */ - cdev_scanner_init(NSS,ss), /* 29: SCSI scanner */ + cdev_notdef(), /* 29: */ cdev_lkm_dummy(), /* 30: */ cdev_lkm_dummy(), /* 31: */ cdev_lkm_dummy(), /* 32: */ diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index 4c829bcd639..f5a2e3274c2 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.22 2010/05/08 21:59:53 miod Exp $ +# $OpenBSD: GENERIC,v 1.23 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -200,7 +200,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? uk* at scsibus? pseudo-device hotplug 1 # devices hot plugging diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK index dafdb4dcb40..d0d6c924957 100644 --- a/sys/arch/loongson/conf/RAMDISK +++ b/sys/arch/loongson/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.12 2010/05/08 21:59:53 miod Exp $ +# $OpenBSD: RAMDISK,v 1.13 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -152,7 +152,6 @@ sd* at scsibus? #st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? pseudo-device loop 1 # network loopback diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c index 33536966144..3a6857b3e04 100644 --- a/sys/arch/loongson/loongson/conf.c +++ b/sys/arch/loongson/loongson/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.6 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.7 2010/07/03 03:59:16 krw Exp $ */ /* * Copyright (c) 1992, 1993 @@ -108,7 +108,6 @@ cdev_decl(com); #include "lpt.h" cdev_decl(lpt); #include "ch.h" -#include "ss.h" #include "uk.h" cdev_decl(wd); #include "audio.h" @@ -181,7 +180,7 @@ struct cdevsw cdevsw[] = cdev_pf_init(NPF,pf), /* 31: packet filter */ cdev_uk_init(NUK,uk), /* 32: unknown SCSI */ cdev_random_init(1,random), /* 33: random data source */ - cdev_ss_init(NSS,ss), /* 34: SCSI scanner */ + cdev_notdef(), /* 34: */ cdev_ksyms_init(NKSYMS,ksyms), /* 35: Kernel symbols device */ cdev_ch_init(NCH,ch), /* 36: SCSI autochanger */ cdev_notdef(), /* 37: */ diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC index 1d04d3c4227..166406e3b17 100644 --- a/sys/arch/luna88k/conf/GENERIC +++ b/sys/arch/luna88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.13 2007/02/09 14:26:09 aoyama Exp $ +# $OpenBSD: GENERIC,v 1.14 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -53,7 +53,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c index 19ab1c8c90f..cb043cb20ad 100644 --- a/sys/arch/luna88k/luna88k/conf.c +++ b/sys/arch/luna88k/luna88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.13 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.14 2010/07/03 03:59:16 krw Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -50,7 +50,6 @@ #include "cd.h" #include "ch.h" #include "sd.h" -#include "ss.h" #include "st.h" #include "uk.h" @@ -142,7 +141,7 @@ struct cdevsw cdevsw[] = cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41 */ - cdev_ss_init(NSS,ss), /* 42 */ + cdev_notdef(), /* 42 */ cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */ cdev_ch_init(NCH,ch), /* 44: SCSI autochanger */ cdev_notdef(), /* 45 */ diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index b61603b92ec..8e62e6aabef 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.49 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: GENERIC,v 1.50 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -70,7 +70,6 @@ sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives ch* at scsibus? # SCSI autochangers -ss* at scsibus? # SCSI scanners safte* at scsibus? # SCSI accessed fault-tolerant enclosures ses* at scsibus? # SCSI enclosure services uk* at scsibus? # SCSI unknown diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c index b7c238c2fe7..4a709e09e80 100644 --- a/sys/arch/mac68k/mac68k/conf.c +++ b/sys/arch/mac68k/mac68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.45 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.46 2010/07/03 03:59:16 krw Exp $ */ /* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */ /* @@ -81,7 +81,6 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); cdev_decl(mm); #include "bio.h" #include "pty.h" -#include "ss.h" #include "uk.h" cdev_decl(fd); #include "zsc.h" @@ -143,7 +142,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 30 */ cdev_lkm_dummy(), /* 31 */ cdev_random_init(1,random), /* 32: random data source */ - cdev_ss_init(NSS,ss), /* 33: SCSI scanner */ + cdev_notdef(), /* 33 */ cdev_uk_init(NUK,uk), /* 34: SCSI unknown */ cdev_pf_init(NPF,pf), /* 35: packet filter */ cdev_audio_init(NASC,asc), /* 36: ASC audio device */ diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index baee5825df9..770aefca7c8 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.196 2010/04/09 19:24:17 jasper Exp $g +# $OpenBSD: GENERIC,v 1.197 2010/07/03 03:59:16 krw Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -278,8 +278,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -383,7 +381,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 1611394c861..208588a7c97 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.89 2009/06/24 11:38:40 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.90 2010/07/03 03:59:16 krw Exp $ # # PPC GENERIC config file # @@ -199,8 +199,6 @@ zyd* at uhub? # Zydas ZD1211 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS #uscanner* at uhub? # USB Scanner driver -#usscanner* at uhub? # USB SCSI scanners -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices @@ -226,7 +224,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? pseudo-device loop 1 # network loopback diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c index 83d110835a6..7a6328065cf 100644 --- a/sys/arch/macppc/macppc/conf.c +++ b/sys/arch/macppc/macppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.41 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.42 2010/07/03 03:59:16 krw Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -44,7 +44,6 @@ #include "sd.h" #include "st.h" #include "cd.h" -#include "ss.h" #include "uk.h" #include "rd.h" #include "wd.h" @@ -187,7 +186,7 @@ struct cdevsw cdevsw[] = { cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41: unknown SCSI */ - cdev_ss_init(NSS,ss), /* 42: SCSI scanner */ + cdev_notdef(), /* 42 */ cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */ cdev_audio_init(NAUDIO,audio), /* 44: generic audio I/O */ cdev_video_init(NVIDEO,video), /* 45: generic video I/O */ diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC index 7d1cc702355..69a00cce8ba 100644 --- a/sys/arch/mvme68k/conf/GENERIC +++ b/sys/arch/mvme68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.34 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: GENERIC,v 1.35 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -118,7 +118,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147 index 96ae96188cc..91e91838708 100644 --- a/sys/arch/mvme68k/conf/MVME147 +++ b/sys/arch/mvme68k/conf/MVME147 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME147,v 1.24 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: MVME147,v 1.25 2010/07/03 03:59:17 krw Exp $ machine mvme68k m68k @@ -53,5 +53,4 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162 index eb17009e5b1..ae93dcd5cb5 100644 --- a/sys/arch/mvme68k/conf/MVME162 +++ b/sys/arch/mvme68k/conf/MVME162 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME162,v 1.27 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: MVME162,v 1.28 2010/07/03 03:59:17 krw Exp $ machine mvme68k m68k @@ -60,7 +60,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167 index 78c0f30796a..23801c6a510 100644 --- a/sys/arch/mvme68k/conf/MVME167 +++ b/sys/arch/mvme68k/conf/MVME167 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME167,v 1.27 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: MVME167,v 1.28 2010/07/03 03:59:17 krw Exp $ machine mvme68k m68k @@ -56,7 +56,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177 index 8f335d86ba5..9cddddf8444 100644 --- a/sys/arch/mvme68k/conf/MVME177 +++ b/sys/arch/mvme68k/conf/MVME177 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME177,v 1.16 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: MVME177,v 1.17 2010/07/03 03:59:17 krw Exp $ machine mvme68k m68k @@ -55,7 +55,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c index 07db58f1d6a..8bce151960a 100644 --- a/sys/arch/mvme68k/mvme68k/conf.c +++ b/sys/arch/mvme68k/mvme68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.48 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.49 2010/07/03 03:59:17 krw Exp $ */ /*- * Copyright (c) 1995 Theo de Raadt @@ -67,7 +67,6 @@ #include "sd.h" #include "cd.h" #include "ch.h" -#include "ss.h" #include "uk.h" #ifdef notyet #include "xd.h" @@ -203,7 +202,7 @@ struct cdevsw cdevsw[] = cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41: unknown SCSI */ - cdev_ss_init(NSS,ss), /* 42: SCSI scanner */ + cdev_notdef(), /* 42 */ cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */ cdev_ch_init(NCH,ch), /* 44: SCSI autochanger */ cdev_lkm_dummy(), /* 45 */ diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index c028a6a36ca..662c80f8af0 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.53 2009/02/14 17:41:40 miod Exp $ +# $OpenBSD: GENERIC,v 1.54 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -85,7 +85,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187 index 87197155109..6c5965a2ab1 100644 --- a/sys/arch/mvme88k/conf/M187 +++ b/sys/arch/mvme88k/conf/M187 @@ -1,4 +1,4 @@ -# $OpenBSD: M187,v 1.36 2009/02/14 17:42:00 miod Exp $ +# $OpenBSD: M187,v 1.37 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -74,7 +74,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index 4b52238e5b1..eb4e0158cf8 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,4 +1,4 @@ -# $OpenBSD: M188,v 1.29 2009/02/14 17:42:00 miod Exp $ +# $OpenBSD: M188,v 1.30 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -67,7 +67,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index bbff7688177..4c10bc3fc9a 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,4 +1,4 @@ -# $OpenBSD: M197,v 1.32 2009/02/14 17:42:00 miod Exp $ +# $OpenBSD: M197,v 1.33 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -69,7 +69,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c index 4a404035cc3..0f084dddf7e 100644 --- a/sys/arch/mvme88k/mvme88k/conf.c +++ b/sys/arch/mvme88k/mvme88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.40 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.41 2010/07/03 03:59:17 krw Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -50,7 +50,6 @@ #include "cd.h" #include "ch.h" #include "sd.h" -#include "ss.h" #include "st.h" #include "uk.h" @@ -188,7 +187,7 @@ struct cdevsw cdevsw[] = cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41 */ - cdev_ss_init(NSS,ss), /* 42 */ + cdev_notdef(), /* 42 */ cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */ cdev_ch_init(NCH,ch), /* 44: SCSI autochanger */ cdev_notdef(), /* 45 */ diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC index c9942127ddf..90108234e3b 100644 --- a/sys/arch/mvmeppc/conf/GENERIC +++ b/sys/arch/mvmeppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 2005/08/03 16:30:34 martin Exp $ +# $OpenBSD: GENERIC,v 1.11 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -85,7 +85,6 @@ sd0 at scsibus? target 0 lun 0 #st* at scsibus? #cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? #safte* at scsibus? #ses* at scsibus? diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK index c4c6952dbdf..4372c76699f 100644 --- a/sys/arch/mvmeppc/conf/RAMDISK +++ b/sys/arch/mvmeppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.11 2005/05/27 02:08:14 martin Exp $ +# $OpenBSD: RAMDISK,v 1.12 2010/07/03 03:59:17 krw Exp $ # # MVMEPPC GENERIC config file # @@ -81,7 +81,6 @@ sd0 at scsibus? target 0 lun 0 #st* at scsibus? #cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? pseudo-device rd 1 # ram disk diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c index dea3b7df549..c34ece36fa8 100644 --- a/sys/arch/mvmeppc/mvmeppc/conf.c +++ b/sys/arch/mvmeppc/mvmeppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.27 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.28 2010/07/03 03:59:17 krw Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -88,7 +88,6 @@ cdev_decl(bugtty); #include "st.h" #include "uk.h" -#include "ss.h" cdev_decl(wd); @@ -162,7 +161,7 @@ struct cdevsw cdevsw[] = { cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41: unknown SCSI */ - cdev_ss_init(NSS,ss), /* 42: SCSI scanner */ + cdev_notdef(), /* 42 */ cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */ cdev_notdef(), /* 44 */ cdev_notdef(), /* 45 */ diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC index 2dffe084c40..419b611b2ff 100644 --- a/sys/arch/palm/conf/GENERIC +++ b/sys/arch/palm/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.5 2010/04/26 20:51:51 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.6 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -115,8 +115,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -130,7 +128,6 @@ sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives #ch* at scsibus? # SCSI autochangers -#ss* at scsibus? # SCSI scanners #uk* at scsibus? # unknown SCSI # integrated 16550 UARTs diff --git a/sys/arch/palm/conf/RAMDISK b/sys/arch/palm/conf/RAMDISK index 5051a4e0420..9c3cfd7d0a3 100644 --- a/sys/arch/palm/conf/RAMDISK +++ b/sys/arch/palm/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.6 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.7 2010/07/03 03:59:17 krw Exp $ machine palm arm @@ -80,8 +80,6 @@ ural* at uhub? # Ralink RT2500 wi* at uhub? # WaveLAN IEEE 802.11DS upl* at uhub? # Prolific PL2301/PL2302 host-to-host #uscanner* at uhub? # USB Scanner driver -#usscanner* at uhub? # USB SCSI scanners -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices @@ -98,7 +96,6 @@ sd* at scsibus? #st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? # integrated 16550 UARTs diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index 1f468ab7259..a462257bef2 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.34 2010/03/28 17:15:24 miod Exp $ +# $OpenBSD: GENERIC-IP27,v 1.35 2010/07/03 03:59:17 krw Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -241,7 +241,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index b9870689c7c..58a37c585a9 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.28 2010/03/28 17:15:24 miod Exp $ +# $OpenBSD: GENERIC-IP30,v 1.29 2010/07/03 03:59:17 krw Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -233,7 +233,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32 index 3bd551e2a26..759c8951ad4 100644 --- a/sys/arch/sgi/conf/GENERIC-IP32 +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP32,v 1.19 2010/03/28 17:15:24 miod Exp $ +# $OpenBSD: GENERIC-IP32,v 1.20 2010/07/03 03:59:17 krw Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. # @@ -229,7 +229,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index 8d25b324c73..9b7c3287e6c 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.22 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.23 2010/07/03 03:59:17 krw Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -216,7 +216,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? #### PSEUDO Devices diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 07e95a1e9a7..70d68fe6724 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP30,v 1.18 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.19 2010/07/03 03:59:17 krw Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. @@ -209,7 +209,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? #### PSEUDO Devices diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index 21cd067e6c1..47973d5abc3 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP32,v 1.14 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.15 2010/07/03 03:59:17 krw Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. @@ -200,7 +200,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? #### PSEUDO Devices diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c index a18d31729a7..62f41264296 100644 --- a/sys/arch/sgi/sgi/conf.c +++ b/sys/arch/sgi/sgi/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.23 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.24 2010/07/03 03:59:17 krw Exp $ */ /* * Copyright (c) 1992, 1993 @@ -101,7 +101,6 @@ cdev_decl(com); #include "lpt.h" cdev_decl(lpt); #include "ch.h" -#include "ss.h" #include "uk.h" cdev_decl(wd); #include "audio.h" @@ -172,7 +171,7 @@ struct cdevsw cdevsw[] = cdev_pf_init(NPF,pf), /* 31: packet filter */ cdev_uk_init(NUK,uk), /* 32: unknown SCSI */ cdev_random_init(1,random), /* 33: random data source */ - cdev_ss_init(NSS,ss), /* 34: SCSI scanner */ + cdev_notdef(), /* 34: */ cdev_ksyms_init(NKSYMS,ksyms), /* 35: Kernel symbols device */ cdev_ch_init(NCH,ch), /* 36: SCSI autochanger */ cdev_notdef(), /* 37: */ diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 101281389fc..e6f9a8dc160 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.96 2010/07/02 19:57:14 tedu Exp $ +# $OpenBSD: GENERIC,v 1.97 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -347,7 +347,6 @@ sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs ch* at scsibus? # SCSI changer devices -ss* at scsibus? # SCSI scanners safte* at scsibus? # SCSI accessed fault-tolerant enclosures ses* at scsibus? # SCSI enclosure services uk* at scsibus? # unknown SCSI devices diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index 708c32f09cd..ee5d214b87c 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.69 2010/07/02 19:57:15 tedu Exp $ +# $OpenBSD: RAMDISK,v 1.70 2010/07/03 03:59:17 krw Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -320,7 +320,6 @@ sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs ch* at scsibus? # SCSI changer devices -#ss* at scsibus? # SCSI scanners #uk* at scsibus? # unknown SCSI devices # Floppy controller and drive found on SPARCstations. diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4 index 9dad08c15dc..f65c5043dbb 100644 --- a/sys/arch/sparc/conf/SUN4 +++ b/sys/arch/sparc/conf/SUN4 @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4,v 1.38 2010/07/02 19:57:15 tedu Exp $ +# $OpenBSD: SUN4,v 1.39 2010/07/03 03:59:17 krw Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -162,7 +162,6 @@ sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs ch* at scsibus? # SCSI changer devices -ss* at scsibus? # SCSI scanners uk* at scsibus? # unknown SCSI devices pseudo-device wsmux 2 # mouse & keyboard multiplexor diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index de472ba8d54..2008010434a 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.61 2010/07/02 19:57:15 tedu Exp $ +# $OpenBSD: SUN4C,v 1.62 2010/07/03 03:59:17 krw Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -183,7 +183,6 @@ sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs ch* at scsibus? # SCSI changer devices -ss* at scsibus? # SCSI scanners uk* at scsibus? # unknown SCSI devices # Floppy controller and drive found on SPARCstations. diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index aab337b883e..538121a3760 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.77 2010/07/02 19:57:15 tedu Exp $ +# $OpenBSD: SUN4M,v 1.78 2010/07/03 03:59:17 krw Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -242,7 +242,6 @@ sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs ch* at scsibus? # SCSI changer devices -ss* at scsibus? # SCSI scanners uk* at scsibus? # unknown SCSI devices # Floppy controller and drive found on SPARCstations. diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c index d3cc30c9b47..a6f1969a5b5 100644 --- a/sys/arch/sparc/sparc/conf.c +++ b/sys/arch/sparc/sparc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.51 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.52 2010/07/03 03:59:17 krw Exp $ */ /* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */ /* @@ -60,7 +60,6 @@ #include "ccd.h" #include "raid.h" #include "ch.h" -#include "ss.h" #include "uk.h" #include "sd.h" #include "st.h" @@ -262,7 +261,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 118 */ cdev_random_init(1,random), /* 119: random generator */ cdev_uk_init(NUK,uk), /* 120: unknown SCSI */ - cdev_ss_init(NSS,ss), /* 121: SCSI scanner */ + cdev_notdef(), /* 121 */ cdev_ksyms_init(NKSYMS,ksyms), /* 122: Kernel symbols device */ cdev_disk_init(NRAID,raid), /* 123: RAIDframe disk driver */ cdev_bio_init(NBIO,bio), /* 124: ioctl tunnel */ diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index e941a99722a..9a80595d6c8 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.251 2010/03/03 20:57:28 mk Exp $ +# $OpenBSD: GENERIC,v 1.252 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -238,8 +238,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -420,7 +418,6 @@ sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs ch* at scsibus? # SCSI changer devices -ss* at scsibus? # SCSI scanners safte* at scsibus? # SCSI accessed fault-tolerant encl ses* at scsibus? # SCSI enclosure services uk* at scsibus? # unknown SCSI devices diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c index 833c710f9ea..c93b5f8cf73 100644 --- a/sys/arch/sparc64/sparc64/conf.c +++ b/sys/arch/sparc64/sparc64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.55 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.56 2010/07/03 03:59:17 krw Exp $ */ /* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */ /* @@ -60,7 +60,6 @@ #include "vnd.h" #include "ccd.h" #include "ch.h" -#include "ss.h" #include "sd.h" #include "st.h" #include "cd.h" @@ -222,7 +221,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 56 */ cdev_notdef(), /* 57 */ cdev_disk_init(NCD,cd), /* 58: SCSI CD-ROM */ - cdev_scanner_init(NSS,ss), /* 59: SCSI scanner */ + cdev_notdef(), /* 59 */ cdev_uk_init(NUK,uk), /* 60: SCSI unknown */ cdev_disk_init(NRD,rd), /* 61: memory disk */ cdev_notdef(), /* 62 */ diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index a95844efbb6..0d96e7b7ef6 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.52 2010/06/29 18:46:34 tedu Exp $ +# $OpenBSD: GENERIC,v 1.53 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -149,7 +149,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index 209f5ff40aa..46f2b995565 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.32 2010/06/29 18:46:34 tedu Exp $ +# $OpenBSD: RAMDISK,v 1.33 2010/07/03 03:59:17 krw Exp $ machine vax # machine type @@ -155,7 +155,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #safte* at scsibus? #ses* at scsibus? #uk* at scsibus? diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index 2a28f826f5e..6460d3d442e 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.59 2010/06/09 15:25:33 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.60 2010/07/03 03:59:17 krw Exp $ */ /* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ /*- @@ -339,7 +339,6 @@ cdev_decl(ii); #include "tun.h" #include "ch.h" -#include "ss.h" #include "uk.h" #ifdef NNPFS @@ -423,7 +422,7 @@ struct cdevsw cdevsw[] = cdev_disk_init(NCD,cd), /* 61: SCSI CD-ROM */ cdev_disk_init(NRD,rd), /* 62: memory disk driver */ cdev_ch_init(NCH,ch), /* 63: SCSI autochanger */ - cdev_scanner_init(NSS,ss), /* 64: SCSI scanner */ + cdev_notdef(), /* 64 */ cdev_uk_init(NUK,uk), /* 65: SCSI unknown */ cdev_tty_init(NDL,dl), /* 66: DL11 */ cdev_random_init(1,random), /* 67: random data source */ diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 74cbfe07d64..f547268cf27 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.76 2010/04/26 20:51:51 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.77 2010/07/03 03:59:17 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -128,8 +128,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? # USB Scanners -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -143,7 +141,6 @@ sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives #ch* at scsibus? # SCSI autochangers -#ss* at scsibus? # SCSI scanners #uk* at scsibus? # unknown SCSI # integrated 16550 UARTs diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index a5e57439430..267d96491c1 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.40 2010/04/26 20:51:51 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.41 2010/07/03 03:59:17 krw Exp $ machine zaurus arm @@ -90,8 +90,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS upl* at uhub? # Prolific PL2301/PL2302 host-to-host #uscanner* at uhub? # USB Scanner driver -#usscanner* at uhub? # USB SCSI scanners -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices @@ -108,7 +106,6 @@ sd* at scsibus? #st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? # integrated 16550 UARTs diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index 4779312f4ab..741ed827d35 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.90 2010/03/20 21:05:42 matthieu Exp $ +# $OpenBSD: files.usb,v 1.91 2010/07/03 03:59:17 krw Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -290,11 +290,6 @@ device uscanner attach uscanner at uhub file dev/usb/uscanner.c uscanner needs-flag -# Avision SCSI over USB, HP5300 -device usscanner: scsi -attach usscanner at uhub -file dev/usb/usscanner.c usscanner - # Prism3 WI @ USB attach wi at uhub with wi_usb file dev/usb/if_wi_usb.c wi_usb diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 7954816ea4b..839bf4d76d8 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.41 2009/10/13 19:33:19 pirofti Exp $ */ +/* $OpenBSD: uscanner.c,v 1.42 2010/07/03 03:59:17 krw Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -108,26 +108,9 @@ static const struct uscan_info uscanner_devs[] = { {{ USB_VENDOR_HP, USB_PRODUCT_HP_4300C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_S20 }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_5200C }, 0 }, -#if 0 - /* Handled by usscanner */ - {{ USB_VENDOR_HP, USB_PRODUCT_HP_5300C }, 0 }, -#endif {{ USB_VENDOR_HP, USB_PRODUCT_HP_6200C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_6300C }, 0 }, -#if 0 - /* XXX Should be handled by usscanner */ - /* Microtek */ - {{ USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2 }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6 }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2 }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL }, 0 }, -#endif - /* Mustek */ {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU }, 0 }, {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F }, 0 }, diff --git a/sys/scsi/files.scsi b/sys/scsi/files.scsi index 64cb16e1485..2066b8f9579 100644 --- a/sys/scsi/files.scsi +++ b/sys/scsi/files.scsi @@ -1,4 +1,4 @@ -# $OpenBSD: files.scsi,v 1.21 2010/07/02 20:21:13 miod Exp $ +# $OpenBSD: files.scsi,v 1.22 2010/07/03 03:59:17 krw Exp $ # $NetBSD: files.scsi,v 1.4 1996/05/16 04:01:08 mycroft Exp $ # # Config.new file and device description for machine-independent SCSI code. @@ -28,12 +28,6 @@ device st: tape attach st at scsibus file scsi/st.c st needs-flag -device ss -attach ss at scsibus -file scsi/ss.c ss needs-flag -file scsi/ss_mustek.c ss -file scsi/ss_scanjet.c ss - device uk: disk attach uk at scsibus file scsi/uk.c uk needs-flag diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 5e7f3f0f62f..859881a28d8 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.97 2010/06/08 12:46:49 jsing Exp $ */ +/* $OpenBSD: conf.h,v 1.98 2010/07/03 03:59:17 krw Exp $ */ /* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */ /*- @@ -192,13 +192,6 @@ extern struct cdevsw cdevsw[]; dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ 0, seltrue, (dev_type_mmap((*))) enodev, D_TAPE } -/* open, close, read, ioctl */ -#define cdev_scanner_init(c,n) { \ - dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ - (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, \ - 0, seltrue, (dev_type_mmap((*))) enodev } - /* open, close, read, write, ioctl, stop, tty */ #define cdev_tty_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ @@ -334,13 +327,6 @@ extern struct cdevsw cdevsw[]; (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ (dev_type_mmap((*))) enodev } -/* open, close, read, ioctl */ -#define cdev_ss_init(c,n) { \ - dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ - (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, \ - (dev_type_mmap((*))) enodev } - /* open, close, ioctl, mmap */ #define cdev_fb_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ |