diff options
| author | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2000-03-16 12:06:29 +0000 |
|---|---|---|
| committer | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2000-03-16 12:06:29 +0000 |
| commit | a97d495cb954e7bdba317d0de3b69fd72abf183e (patch) | |
| tree | 68cc2d043e31188f4ca12a0012e5da0c6e4d62f4 /sys/pc98 | |
| parent | 13b6f8f604503d9f8e71593728abd262b17fb38b (diff) | |
Notes
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/olpt.c | 10 | ||||
| -rw-r--r-- | sys/pc98/pc98/olpt.c | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c index 43ce7183ab6d..542b7335635b 100644 --- a/sys/pc98/cbus/olpt.c +++ b/sys/pc98/cbus/olpt.c @@ -105,6 +105,7 @@ #include "opt_inet.h" #ifdef PC98 #undef INET /* PLIP is not supported for old PC-98 */ +#define LPT_DRVINIT_AT_ATTACH /* avoid conflicting with lpt on ppbus */ #endif #include <sys/param.h> @@ -255,6 +256,7 @@ static timeout_t lptout; static int lptprobe (struct isa_device *dvp); static int lptattach (struct isa_device *isdp); static ointhand2_t lptintr; +static void lpt_drvinit(void *unused); #ifdef INET @@ -487,6 +489,10 @@ lptattach(struct isa_device *isdp) make_dev(&lpt_cdevsw, unit, UID_ROOT, GID_WHEEL, 0600, "lpt%d", unit); make_dev(&lpt_cdevsw, unit | LP_BYPASS, UID_ROOT, GID_WHEEL, 0600, "lpctl%d", unit); + +#ifdef LPT_DRVINIT_AT_ATTACH + lpt_drvinit(NULL); +#endif return (1); } @@ -1433,6 +1439,6 @@ static void lpt_drvinit(void *unused) lpt_devsw_installed = 1; } } - +#ifndef LPT_DRVINIT_AT_ATTACH SYSINIT(lptdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,lpt_drvinit,NULL) - +#endif diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c index 43ce7183ab6d..542b7335635b 100644 --- a/sys/pc98/pc98/olpt.c +++ b/sys/pc98/pc98/olpt.c @@ -105,6 +105,7 @@ #include "opt_inet.h" #ifdef PC98 #undef INET /* PLIP is not supported for old PC-98 */ +#define LPT_DRVINIT_AT_ATTACH /* avoid conflicting with lpt on ppbus */ #endif #include <sys/param.h> @@ -255,6 +256,7 @@ static timeout_t lptout; static int lptprobe (struct isa_device *dvp); static int lptattach (struct isa_device *isdp); static ointhand2_t lptintr; +static void lpt_drvinit(void *unused); #ifdef INET @@ -487,6 +489,10 @@ lptattach(struct isa_device *isdp) make_dev(&lpt_cdevsw, unit, UID_ROOT, GID_WHEEL, 0600, "lpt%d", unit); make_dev(&lpt_cdevsw, unit | LP_BYPASS, UID_ROOT, GID_WHEEL, 0600, "lpctl%d", unit); + +#ifdef LPT_DRVINIT_AT_ATTACH + lpt_drvinit(NULL); +#endif return (1); } @@ -1433,6 +1439,6 @@ static void lpt_drvinit(void *unused) lpt_devsw_installed = 1; } } - +#ifndef LPT_DRVINIT_AT_ATTACH SYSINIT(lptdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,lpt_drvinit,NULL) - +#endif |