diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2006-01-11 21:57:54 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2006-01-11 21:57:54 +0000 |
| commit | 7b43941da7357f0b79c69b29b553427b8212177c (patch) | |
| tree | 5b0376a3a5366c2c2c64a456d267c657e056f4ed | |
| parent | a87cc8468fb69df03f02b00e4ec4ff35361c9fd9 (diff) | |
hotplug(4) and hotplugd(8) here
| -rw-r--r-- | etc/etc.hppa/MAKEDEV.md | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | usr.sbin/hotplugd/Makefile | 9 |
5 files changed, 14 insertions, 9 deletions
diff --git a/etc/etc.hppa/MAKEDEV.md b/etc/etc.hppa/MAKEDEV.md index ddaed3659d2..bfc4b68c98f 100644 --- a/etc/etc.hppa/MAKEDEV.md +++ b/etc/etc.hppa/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.25 2005/08/01 22:22:13 deraadt Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.26 2006/01/11 21:57:53 martin Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -63,6 +63,7 @@ _DEV(au, 35) _DEV(bpf, 17) _DEV(cry, 36) _DEV(fdesc, 16) +_DEV(hotplug, 47) _DEV(lkm, 19) _DEV(pci, 31) _DEV(pdc, 22) diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index 27fa85cb5df..d234a698905 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.81 2006/01/09 21:29:38 jsg Exp $ +# $OpenBSD: GENERIC,v 1.82 2006/01/11 21:57:53 martin Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -304,4 +304,5 @@ safte* at scsibus? ses* at scsibus? uk* at scsibus? +pseudo-device hotplug 1 # devices hot plugging pseudo-device wsmux 2 # mouse and keyboard multiplexor diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index a405f2c8972..66774ba8449 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.35 2005/12/31 22:41:36 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.36 2006/01/11 21:57:53 martin Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -107,6 +107,7 @@ cdev_decl(com); #include "pf.h" #include "systrace.h" +#include "hotplug.h" #ifdef USER_PCICONF #include "pci.h" @@ -179,6 +180,7 @@ struct cdevsw cdevsw[] = cdev_urio_init(NURIO,urio), /* 44: USB Diamond Rio 500 */ cdev_tty_init(NUCOM,ucom), /* 45: USB tty */ cdev_usbdev_init(NUSCANNER,uscanner), /* 46: USB scanners */ + cdev_hotplug_init(NHOTPLUG,hotplug), /* 47: devices hot plugging */ cdev_lkm_dummy(), cdev_lkm_dummy(), cdev_lkm_dummy(), diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index d442e8bf7d7..e9bc4ef58e0 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.138 2005/12/27 23:19:01 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.139 2006/01/11 21:57:53 martin Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -371,7 +371,7 @@ fdc* at sbus? #fdc* at ebus? fd* at fdc? -#pseudo-device hotplug 1 # devices hot plugging +pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices #pseudo-device wsmux 2 diff --git a/usr.sbin/hotplugd/Makefile b/usr.sbin/hotplugd/Makefile index 402e1b5fe89..fbd722840da 100644 --- a/usr.sbin/hotplugd/Makefile +++ b/usr.sbin/hotplugd/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2005/01/18 16:31:24 drahn Exp $ +# $OpenBSD: Makefile,v 1.4 2006/01/11 21:57:53 martin Exp $ .if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \ - ${MACHINE} == "i386" || ${MACHINE} == "macppc" || \ - ${MACHINE} == "sparc64" || ${MACHINE} == "zaurus" + ${MACHINE} == "i386" || ${MACHINE} == "hppa" || \ + ${MACHINE} == "macppc" || ${MACHINE} == "sparc64" || \ + ${MACHINE} == "zaurus" PROG= hotplugd SRCS= hotplugd.c @@ -19,6 +20,6 @@ NOPROG= yes .endif MAN= hotplugd.8 -MANSUBDIR=alpha amd64 i386 macppc sparc64 zaurus +MANSUBDIR=alpha amd64 i386 hppa macppc sparc64 zaurus .include <bsd.prog.mk> |