diff options
37 files changed, 111 insertions, 60 deletions
diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md index 1a5952d8803..d3ca2205b81 100644 --- a/etc/etc.alpha/MAKEDEV.md +++ b/etc/etc.alpha/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.32 2007/05/27 01:50:35 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.33 2007/05/28 22:26:01 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -61,6 +61,7 @@ _DEV(ulpt, 47) _DEV(usb, 45) _TITLE(spec) _DEV(au, 24) +_DEV(bio, 53) _DEV(bktr, 58) _DEV(bpf, 11) _DEV(cry, 57) @@ -105,6 +106,7 @@ ttyB*|ttyc*) dnl dnl *** alpha specific targets dnl +target(all, bio)dnl target(all, ch, 0)dnl target(all, ss, 0, 1)dnl target(all, xfs, 0)dnl diff --git a/etc/etc.armish/MAKEDEV.md b/etc/etc.armish/MAKEDEV.md index c43f14d853e..9aadcf4b001 100644 --- a/etc/etc.armish/MAKEDEV.md +++ b/etc/etc.armish/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.4 2007/05/27 01:50:35 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.5 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -68,6 +68,7 @@ _DEV(uscan, 69) _TITLE(spec) _DEV(apm, 34) _DEV(au, 36) +_DEV(bio, 52) _DEV(hotplug, 37) _DEV(bktr, 75) _DEV(bpf, 22) @@ -105,6 +106,7 @@ twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.aviion/MAKEDEV.md b/etc/etc.aviion/MAKEDEV.md index 0b404b78109..247fb574260 100644 --- a/etc/etc.aviion/MAKEDEV.md +++ b/etc/etc.aviion/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.3 2007/05/27 01:50:35 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.4 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -49,6 +49,7 @@ target(all, ss, 0)dnl target(all, xfs, 0)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, rd, 0)dnl target(all, cd, 0, 1)dnl @@ -84,6 +85,7 @@ _DEV(ptm, 52) _DEV(pty, 5) _DEV(tty, 4) _TITLE(spec) +_DEV(bio, 49) _DEV(bpf, 22) _DEV(fdesc, 21) _DEV(lkm, 24) diff --git a/etc/etc.cats/MAKEDEV.md b/etc/etc.cats/MAKEDEV.md index dc33322fa4e..7d93d2d2d99 100644 --- a/etc/etc.cats/MAKEDEV.md +++ b/etc/etc.cats/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.17 2007/05/27 01:50:35 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.18 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -66,6 +66,7 @@ _DEV(usb, 64) _DEV(uscan, 69) _TITLE(spec) _DEV(au, 36) +_DEV(bio, 52) _DEV(bktr, 75) _DEV(bpf, 22) _DEV(cry, 47) @@ -99,6 +100,7 @@ twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.hp300/MAKEDEV.md b/etc/etc.hp300/MAKEDEV.md index 42be4fc15f7..4ddfad72af7 100644 --- a/etc/etc.hp300/MAKEDEV.md +++ b/etc/etc.hp300/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.29 2007/05/27 01:50:35 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.30 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -79,6 +79,7 @@ _DEV(wsmouse, 42) _TITLE(prn) _DEV(ppi, 11) _TITLE(spec) +_DEV(bio, 49) _DEV(bpf, 22) _DEV(fdesc, 21) _DEV(lkm, 24) @@ -170,6 +171,7 @@ twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.hppa/MAKEDEV.md b/etc/etc.hppa/MAKEDEV.md index d8f69d6bea6..8b8c7ea4a35 100644 --- a/etc/etc.hppa/MAKEDEV.md +++ b/etc/etc.hppa/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.29 2007/05/27 01:50:35 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.30 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -59,6 +59,7 @@ _DEV(urio, 44) _DEV(ttyU, 45) _DEV(uscan, 46) _TITLE(spec) +_DEV(bio, 37) _DEV(au, 35) _DEV(bpf, 17) _DEV(cry, 36) @@ -89,6 +90,7 @@ dnl dnl *** hppa specific devices dnl target(all, ch, 0)dnl +target(all, bio)dnl target(all, ss, 0, 1)dnl target(all, xfs, 0)dnl twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl diff --git a/etc/etc.hppa64/MAKEDEV.md b/etc/etc.hppa64/MAKEDEV.md index 9f0b7eafc8c..b8e366b2b5a 100644 --- a/etc/etc.hppa64/MAKEDEV.md +++ b/etc/etc.hppa64/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.6 2007/05/27 01:50:35 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.7 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -51,6 +51,7 @@ _TITLE(prn) _DEV(lpt, 26) _TITLE(spec) _DEV(au, 35) +_DEV(bio, 37) _DEV(bpf, 17) _DEV(cry, 36) _DEV(fdesc, 16) @@ -85,6 +86,7 @@ twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.landisk/MAKEDEV.md b/etc/etc.landisk/MAKEDEV.md index 96c2123e2cd..a4fb14eac92 100644 --- a/etc/etc.landisk/MAKEDEV.md +++ b/etc/etc.landisk/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.6 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.7 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -72,6 +72,7 @@ _DEV(uscan, 69) _TITLE(spec) dnl _DEV(apm, 34) _DEV(au, 36) +_DEV(bio, 37) _DEV(hotplug, 37) dnl _DEV(bktr, 75) _DEV(bpf, 22) @@ -110,6 +111,7 @@ twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.luna88k/MAKEDEV.md b/etc/etc.luna88k/MAKEDEV.md index 5eccc4c2cf1..3275bcf2a59 100644 --- a/etc/etc.luna88k/MAKEDEV.md +++ b/etc/etc.luna88k/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.6 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.7 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -39,6 +39,7 @@ target(all, ss, 0)dnl target(all, xfs, 0)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, rd, 0)dnl target(all, cd, 0, 1)dnl @@ -82,6 +83,7 @@ _DEV(wsmux, 16) _TITLE(point) _DEV(wsmouse, 15) _TITLE(spec) +_DEV(bio, 49) _DEV(bpf, 22) _DEV(fdesc, 21) _DEV(lcd, 10) diff --git a/etc/etc.mac68k/MAKEDEV.md b/etc/etc.mac68k/MAKEDEV.md index 1f44532cb25..bbabb32ae88 100644 --- a/etc/etc.mac68k/MAKEDEV.md +++ b/etc/etc.mac68k/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.24 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.25 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -51,6 +51,7 @@ _TITLE(point) _DEV(wsmouse, 40) _TITLE(spec) _DEV(asc, 36) +_DEV(bio, 49) _DEV(bpf, 22) _DEV(fdesc, 21) _DEV(lkm, 25) @@ -95,6 +96,7 @@ asc*) dnl dnl *** mac68k specific targets dnl +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 diff --git a/etc/etc.mvme68k/MAKEDEV.md b/etc/etc.mvme68k/MAKEDEV.md index f32d37341d9..30fb6e161a8 100644 --- a/etc/etc.mvme68k/MAKEDEV.md +++ b/etc/etc.mvme68k/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.18 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.19 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -99,6 +99,7 @@ target(all, ss, 0, 1)dnl target(all, xfs, 0)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, rd, 0)dnl target(all, cd, 0, 1)dnl @@ -143,6 +144,7 @@ _DEV(tty, 4) _TITLE(prn) _DEV(lp, 28) _TITLE(spec) +_DEV(bio, 27) _DEV(bpf, 22) _DEV(fdesc, 21) _DEV(flash, 11) diff --git a/etc/etc.mvme88k/MAKEDEV.md b/etc/etc.mvme88k/MAKEDEV.md index 36716c56b7f..245587552ae 100644 --- a/etc/etc.mvme88k/MAKEDEV.md +++ b/etc/etc.mvme88k/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.18 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.19 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -75,6 +75,7 @@ target(all, ss, 0)dnl target(all, xfs, 0)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, rd, 0)dnl target(all, cd, 0, 1)dnl @@ -115,6 +116,7 @@ _DEV(ptm, 52) _DEV(pty, 5) _DEV(tty, 4) _TITLE(spec) +_DEV(bio, 49) _DEV(bpf, 22) _DEV(fdesc, 21) _DEV(lkm, 24) diff --git a/etc/etc.mvmeppc/MAKEDEV.md b/etc/etc.mvmeppc/MAKEDEV.md index 445cbb598a4..2b56e34d276 100644 --- a/etc/etc.mvmeppc/MAKEDEV.md +++ b/etc/etc.mvmeppc/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.24 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.25 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -47,6 +47,7 @@ _TITLE(point) _DEV(wsmouse, 69) _TITLE(spec) _DEV(au) +_DEV(bio, 53) _DEV(bpf) _DEV(fdesc, 21) _DEV(lkm) @@ -507,6 +508,7 @@ twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.sgi/MAKEDEV.md b/etc/etc.sgi/MAKEDEV.md index 2613d68754d..9bde3ad4cf0 100644 --- a/etc/etc.sgi/MAKEDEV.md +++ b/etc/etc.sgi/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.14 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.15 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -55,6 +55,7 @@ _TITLE(point) _DEV(wsmouse, 27) _TITLE(spec) _DEV(au, 44) +_DEV(bio, 14) _DEV(bpf, 12) _DEV(cry, 47) _DEV(fdesc, 7) @@ -82,6 +83,7 @@ dnl twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0, 1, 2)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.sparc/MAKEDEV.md b/etc/etc.sparc/MAKEDEV.md index e4c56336ecd..344c74eb34a 100644 --- a/etc/etc.sparc/MAKEDEV.md +++ b/etc/etc.sparc/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.33 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.34 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -93,6 +93,7 @@ _DEV(wsmouse, 80) _TITLE(spec) _DEV(apm, 30) _DEV(au, 69) +_DEV(bio, 124) _DEV(bpf, 105) _DEV(fdesc, 24) _DEV(lkm, 112) @@ -121,6 +122,7 @@ dnl *** some sparc-specific targets dnl 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, xfs, 0)dnl diff --git a/etc/etc.sparc64/MAKEDEV.md b/etc/etc.sparc64/MAKEDEV.md index a0a815fac38..ea6e1df630a 100644 --- a/etc/etc.sparc64/MAKEDEV.md +++ b/etc/etc.sparc64/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.43 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.44 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -93,6 +93,7 @@ _DEV(usb, 90) _DEV(uscan, 96) _TITLE(spec) _DEV(au, 69) +_DEV(bio, 120) _DEV(bpf, 105) _DEV(cry, 75) _DEV(fdesc, 24) @@ -138,6 +139,7 @@ twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl +target(all, bio)dnl target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl diff --git a/etc/etc.vax/MAKEDEV.md b/etc/etc.vax/MAKEDEV.md index 0b138e99f78..c9c46d9e8c8 100644 --- a/etc/etc.vax/MAKEDEV.md +++ b/etc/etc.vax/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.30 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.31 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -128,6 +128,7 @@ _DEV(wskbd, 69) _TITLE(point) _DEV(wsmouse, 70) _TITLE(spec) +_DEV(bio, 72) _DEV(bpf, 56) _DEV(fdesc, 53) _DEV(lkm, 28) @@ -206,6 +207,7 @@ target(all, ss, 0)dnl dnl target(all, xfs, 0)dnl target(all, pty, 0)dnl target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7)dnl +target(all, bio)dnl target(all, tun, 0, 1)dnl dnl target(all, xy, 0, 1, 2, 3)dnl dnl target(all, hk, 0, 1, 2, 3)dnl diff --git a/etc/etc.zaurus/MAKEDEV.md b/etc/etc.zaurus/MAKEDEV.md index 7520741d18f..a8ae19692fa 100644 --- a/etc/etc.zaurus/MAKEDEV.md +++ b/etc/etc.zaurus/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.11 2007/05/27 01:50:36 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.12 2007/05/28 22:26:02 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -69,6 +69,7 @@ _TITLE(spec) _DEV(apm, 34) _DEV(au, 36) _DEV(hotplug, 37) +_DEV(bio, 52) _DEV(bktr, 75) _DEV(bpf, 22) _DEV(cry, 47) @@ -99,6 +100,7 @@ dnl target(all, ch, 0)dnl target(all, ss, 0, 1)dnl target(all, xfs, 0)dnl +target(all, bio)dnl twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl target(all, pty, 0)dnl diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 77cce6c4fc8..23c5e155c07 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.53 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.54 2007/05/28 22:26:03 todd Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -104,6 +104,7 @@ cdev_decl(music); #include "spkr.h" cdev_decl(spkr); +#include "bio.h" #include "lpt.h" cdev_decl(lpt); cdev_decl(prom); /* XXX XXX XXX */ @@ -195,7 +196,7 @@ struct cdevsw cdevsw[] = #else cdev_notdef(), #endif - cdev_notdef(), /* 53: ALTQ (deprecated) */ + cdev_bio_init(NBIO,bio), /* 53: ioctl tunnel */ cdev_iop_init(NIOP, iop), /* 54: I2O IOP control interface */ cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */ cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */ diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index d49953aafee..61d74f3be76 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.185 2007/05/27 14:45:23 grange Exp $ +# $OpenBSD: GENERIC,v 1.186 2007/05/28 22:26:03 todd Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -517,7 +517,6 @@ owtemp* at onewire? # Temperature pseudo-device sequencer 1 #pseudo-device raid 4 # RAIDframe disk driver -pseudo-device bio 1 # ioctl multiplexing device pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c index 46100b42ece..47ea6e3f789 100644 --- a/sys/arch/arm/arm/conf.c +++ b/sys/arch/arm/arm/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.16 2007/05/28 22:26:03 todd Exp $ */ /* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */ /* @@ -113,6 +113,7 @@ cdev_decl(pci); #include "ch.h" #include "uk.h" #include "ss.h" +#include "bio.h" /* * Audio devices @@ -342,7 +343,7 @@ struct cdevsw cdevsw[] = { #else cdev_notdef(), /* 51: reserved */ #endif - cdev_notdef(), /* 52: reserved */ + cdev_bio_init(NBIO,bio), /* 52: ioctl tunnel */ cdev_notdef(), /* 53: reserved */ cdev_tty_init(NFCOM,fcom), /* 54: FOOTBRIDGE console */ cdev_lkm_dummy(), /* 55: Reserved for bypass device */ diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c index ac7323e8225..ba0dc2bb36a 100644 --- a/sys/arch/aviion/aviion/conf.c +++ b/sys/arch/aviion/aviion/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.3 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.4 2007/05/28 22:26:03 todd Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -48,6 +48,7 @@ #include "ksyms.h" #include "nvram.h" #include "pf.h" +#include "bio.h" #include "pty.h" #include "rd.h" #include "sd.h" @@ -96,7 +97,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */ cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */ cdev_log_init(1,log), /* 6: /dev/klog */ - cdev_notdef(), /* 7: /dev/sramX */ + cdev_notdef(), /* 7 */ cdev_disk_init(NSD,sd), /* 8: SCSI disk */ cdev_disk_init(NCD,cd), /* 9: SCSI CD-ROM */ cdev_mm_init(NNVRAM,nvram), /* 10: /dev/nvramX */ @@ -138,7 +139,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 46 */ cdev_notdef(), /* 47 */ cdev_notdef(), /* 48 */ - cdev_notdef(), /* 49 */ + cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */ cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c index eb03b4f684c..b3749fc57bc 100644 --- a/sys/arch/hp300/hp300/conf.c +++ b/sys/arch/hp300/hp300/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.40 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.41 2007/05/28 22:26:03 todd Exp $ */ /* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */ /*- @@ -83,6 +83,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \ 0, (dev_type_poll((*))) enodev, (dev_type_mmap((*))) enodev } +#include "bio.h" #define mmread mmrw #define mmwrite mmrw cdev_decl(mm); @@ -125,7 +126,7 @@ struct cdevsw cdevsw[] = cdev_tape_init(NCT,ct), /* 7: cs80 cartridge tape */ cdev_disk_init(NSD,sd), /* 8: SCSI disk */ cdev_disk_init(NHD,hd), /* 9: HPIB disk */ - cdev_notdef(), /* 10: vas frame buffer */ + cdev_notdef(), /* 10 */ cdev_ppi_init(NPPI,ppi), /* 11: printer/plotter interface */ cdev_tty_init(NDCA,dca), /* 12: built-in single-port serial */ cdev_notdef(), /* 13: was console terminal emulator */ @@ -164,7 +165,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 46 */ cdev_notdef(), /* 47 */ cdev_notdef(), /* 48 */ - cdev_notdef(), /* 49 */ + cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */ cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index 1ee10840947..3b55707e607 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.39 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.40 2007/05/28 22:26:03 todd Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -81,6 +81,7 @@ struct bdevsw bdevsw[] = int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); #include "audio.h" +#include "bio.h" #include "pty.h" #include "wsdisplay.h" #include "wskbd.h" @@ -169,7 +170,7 @@ struct cdevsw cdevsw[] = cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */ cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */ cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */ - cdev_notdef(), /* 37: */ + cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */ cdev_ptm_init(NPTY,ptm), /* 38: pseudo-tty ptm device */ cdev_disk_init(NWD,wd), /* 39: ST506 disk */ cdev_usb_init(NUSB,usb), /* 40: USB controller */ diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c index b55c85163a4..8f3f59a612a 100644 --- a/sys/arch/hppa64/hppa64/conf.c +++ b/sys/arch/hppa64/hppa64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2007/05/28 22:26:03 todd Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -82,6 +82,7 @@ struct bdevsw bdevsw[] = int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); #include "audio.h" +#include "bio.h" #include "pty.h" #include "wsdisplay.h" #include "wskbd.h" @@ -161,7 +162,7 @@ struct cdevsw cdevsw[] = cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */ cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */ cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */ - cdev_notdef(), /* 37 */ + cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */ cdev_ptm_init(NPTY,ptm), /* 38: pseudo-tty ptm device */ cdev_disk_init(NWD,wd), /* 39: ST506 disk */ cdev_lkm_dummy(), diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 7361bf5e266..7a7488dc145 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.559 2007/05/28 03:12:38 krw Exp $ +# $OpenBSD: GENERIC,v 1.560 2007/05/28 22:26:02 todd Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -717,7 +717,6 @@ pseudo-device mtrr 1 # Memory range attributes control pseudo-device nvram 1 pseudo-device sequencer 1 #pseudo-device raid 4 # RAIDframe disk driver -pseudo-device bio 1 # ioctl multiplexing device pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index a7cfa2e6ceb..773e6da1746 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2007/05/28 22:26:03 todd Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -70,6 +70,7 @@ */ #include "bpfilter.h" #include "pf.h" +#include "bio.h" #include "pty.h" #include "tun.h" #include "ksyms.h" @@ -317,7 +318,7 @@ struct cdevsw cdevsw[] = { cdev_lkm_init(NLKM,lkm), /* 35: loadable module driver */ cdev_audio_init(NAUDIO,audio), /* 36: generic audio I/O */ cdev_hotplug_init(NHOTPLUG,hotplug), /* 37: devices hot plugging*/ - cdev_notdef(), /* 38: removed cpu device */ + cdev_bio_init(NBIO,bio), /* 38: ioctl tunnel */ cdev_lkm_dummy(), /* 39: reserved */ cdev_random_init(1,random), /* 40: random generator */ cdev_lkm_dummy(), /* 41: reserved */ diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c index eff53fd5112..9101d501f43 100644 --- a/sys/arch/luna88k/luna88k/conf.c +++ b/sys/arch/luna88k/luna88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.6 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.7 2007/05/28 22:26:03 todd Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -40,6 +40,7 @@ #include <machine/conf.h> +#include "bio.h" #include "pty.h" #include "bpfilter.h" #include "tun.h" @@ -103,7 +104,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */ cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */ cdev_log_init(1,log), /* 6: /dev/klog */ - cdev_notdef(), /* 7: */ + cdev_notdef(), /* 7 */ cdev_disk_init(NSD,sd), /* 8: SCSI disk */ cdev_disk_init(NCD,cd), /* 9: SCSI CD-ROM */ cdev_lcd_init(NLCD,lcd), /* 10: /dev/lcd */ @@ -147,7 +148,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 46 */ cdev_notdef(), /* 47 */ cdev_notdef(), /* 48 */ - cdev_notdef(), /* 49 */ + cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */ cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c index 98e563fd249..5b4f75bc933 100644 --- a/sys/arch/mac68k/mac68k/conf.c +++ b/sys/arch/mac68k/mac68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.38 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.39 2007/05/28 22:26:03 todd Exp $ */ /* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */ /* @@ -79,6 +79,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); #define mmread mmrw #define mmwrite mmrw cdev_decl(mm); +#include "bio.h" #include "pty.h" #include "ss.h" #include "uk.h" @@ -156,7 +157,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 46 */ cdev_notdef(), /* 47 */ cdev_notdef(), /* 48 */ - cdev_notdef(), /* 49 */ + cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */ cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c index dd6653564ca..7f00e569bb0 100644 --- a/sys/arch/mvme68k/mvme68k/conf.c +++ b/sys/arch/mvme68k/mvme68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.40 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.41 2007/05/28 22:26:03 todd Exp $ */ /*- * Copyright (c) 1995 Theo de Raadt @@ -111,6 +111,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); #include "nvram.h" #include "flash.h" +#include "bio.h" #include "pty.h" cdev_decl(fd); @@ -184,7 +185,7 @@ struct cdevsw cdevsw[] = #else cdev_notdef(), /* 26 */ #endif - cdev_notdef(), /* 27 */ + cdev_bio_init(NBIO,bio), /* 27: ioctl tunnel */ cdev_lp_init(NLP,lp), /* 28: lp */ cdev_lp_init(NLPTWO,lptwo), /* 29: lptwo */ cdev_tty_init(NWL,wl), /* 30: WG CL-CD2400 serial (ttywX) */ diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c index 4aac6ea9403..398593f6e36 100644 --- a/sys/arch/mvme88k/mvme88k/conf.c +++ b/sys/arch/mvme88k/mvme88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.33 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.34 2007/05/28 22:26:03 todd Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -40,6 +40,7 @@ #include <machine/conf.h> +#include "bio.h" #include "pty.h" #include "bpfilter.h" #include "tun.h" @@ -192,7 +193,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 46 */ cdev_notdef(), /* 47 */ cdev_notdef(), /* 48 */ - cdev_notdef(), /* 49 */ + cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */ cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c index fffec58c04b..3965d05f5c2 100644 --- a/sys/arch/mvmeppc/mvmeppc/conf.c +++ b/sys/arch/mvmeppc/mvmeppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.19 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.20 2007/05/28 22:26:03 todd Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -84,6 +84,7 @@ struct bdevsw bdevsw[] = { }; int nblkdev = sizeof bdevsw / sizeof bdevsw[0]; +#include "bio.h" #include "pty.h" #include "bugtty.h" @@ -133,7 +134,7 @@ struct cdevsw cdevsw[] = { cdev_disk_init(NCD,cd), /* 9: SCSI CD-ROM */ cdev_notdef(), /* 10: SCSI changer */ cdev_disk_init(NWD,wd), /* 11: ST506/ESDI/IDE disk */ - cdev_notdef(), /* 12 */ + cdev_notdef(), /* 12 */ cdev_notdef(), /* 13 */ cdev_tty_init(NBUGTTY,bugtty), /* 14: BUGtty (ttyB) */ cdev_notdef(), /* 15 */ @@ -178,7 +179,7 @@ struct cdevsw cdevsw[] = { cdev_notdef(), /* 51 */ #endif cdev_notdef(), /* 52 */ - cdev_notdef(), /* 53 */ + cdev_bio_init(NBIO,bio), /* 53: ioctl tunnel */ cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */ cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */ }; diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c index 907547ef2c0..55d74772150 100644 --- a/sys/arch/sgi/sgi/conf.c +++ b/sys/arch/sgi/sgi/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.11 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.12 2007/05/28 22:26:03 todd Exp $ */ /* * Copyright (c) 1992, 1993 @@ -93,6 +93,7 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); #define mmwrite mmrw dev_type_read(mmrw); cdev_decl(mm); +#include "bio.h" #include "pty.h" cdev_decl(fd); #include "st.h" @@ -141,7 +142,7 @@ struct cdevsw cdevsw[] = cdev_disk_init(NVND,vnd), /* 11: vnode disk */ cdev_bpftun_init(NBPFILTER,bpf),/* 12: berkeley packet filter */ cdev_bpftun_init(NTUN,tun), /* 13: network tunnel */ - cdev_notdef(), /* 14: */ + cdev_notdef(), /* 14 */ cdev_notdef(), /* 15: */ cdev_lpt_init(NLPT,lpt), /* 16: Parallel printer interface */ cdev_tty_init(NCOM,com), /* 17: 16C450 serial interface */ @@ -180,7 +181,7 @@ cdev_wsdisplay_init(NWSDISPLAY, wsdisplay), /* 25: */ cdev_notdef(), /* 46: */ cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */ cdev_notdef(), /* 48: */ - cdev_notdef(), /* 49: */ + cdev_bio_init(NDEV,bio), /* 49: ioctl tunnel */ cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c index e3aba13edbf..7daac55f50b 100644 --- a/sys/arch/sparc/sparc/conf.c +++ b/sys/arch/sparc/sparc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.45 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.46 2007/05/28 22:26:03 todd Exp $ */ /* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */ /* @@ -51,6 +51,7 @@ #include <machine/conf.h> +#include "bio.h" #include "pty.h" #include "bpfilter.h" #include "tun.h" @@ -263,7 +264,7 @@ struct cdevsw cdevsw[] = cdev_ss_init(NSS,ss), /* 121: SCSI scanner */ cdev_ksyms_init(NKSYMS,ksyms), /* 122: Kernel symbols device */ cdev_disk_init(NRAID,raid), /* 123: RAIDframe disk driver */ - cdev_notdef(), /* 124 */ + cdev_bio_init(NBIO,bio), /* 124: ioctl tunnel */ cdev_ptm_init(NPTY,ptm), /* 125: pseudo-tty ptm device */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c index d07c8a1e267..cb3d860b4f6 100644 --- a/sys/arch/sparc64/sparc64/conf.c +++ b/sys/arch/sparc64/sparc64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.43 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.44 2007/05/28 22:26:03 todd Exp $ */ /* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */ /* @@ -51,6 +51,7 @@ #include <machine/conf.h> +#include "bio.h" #include "pty.h" #include "bpfilter.h" #include "tun.h" @@ -276,7 +277,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 117 */ cdev_lkm_dummy(), /* 118 */ cdev_random_init(1,random), /* 119: random data source */ - cdev_notdef(), /* 120 */ + cdev_bio_init(NBIO,bio), /* 120: ioctl tunnel */ cdev_disk_init(NRAID,raid), /* 121: RAIDframe disk driver */ cdev_tty_init(NPCONS,pcons), /* 122: PROM console */ cdev_ptm_init(NPTY,ptm), /* 123: pseudo-tty ptm device */ diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index b8da36d8e88..aab914b62b5 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.51 2007/05/27 01:50:36 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.52 2007/05/28 22:26:03 todd Exp $ */ /* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ /*- @@ -229,6 +229,7 @@ struct consdev constab[]={ #define mmread mmrw #define mmwrite mmrw cdev_decl(mm); +#include "bio.h" #include "pty.h" cdev_decl(hp); @@ -428,7 +429,7 @@ struct cdevsw cdevsw[] = cdev_mouse_init(NWSKBD, wskbd), /* 69: keyboards */ cdev_mouse_init(NWSMOUSE, wsmouse), /* 70: mice */ cdev_disk_init(NRY,ry), /* 71: VS floppy */ - cdev_notdef(), /* 72: was: SCSI bus */ + cdev_bio_init(NBIO,bio), /* 72: ioctl tunnel */ cdev_disk_init(NRAID,raid), /* 73: RAIDframe disk driver */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 74: xfs communication device */ diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index bfba2e39921..9ff0c24cd95 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.130 2007/05/27 01:50:37 todd Exp $ +# $OpenBSD: GENERIC,v 1.131 2007/05/28 22:26:03 todd Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -103,5 +103,6 @@ pseudo-device trunk # Trunking support #pseudo-device faith 1 # IPv[46] tcp relay translation i/f pseudo-device pppoe 1 # PPP over Ethernet (RFC 2516) +pseudo-device bio 1 # ioctl multiplexing device option BOOT_CONFIG # add support for boot -c |