diff options
| author | julian <julian@FreeBSD.org> | 1995-11-28 09:44:42 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 1995-11-28 09:44:42 +0000 |
| commit | 72067f66c5795c52a5dff6b756ab1436c5de8a04 (patch) | |
| tree | 33e87648ab51f3ec723104be9b729920eaba1450 /sys/i386 | |
| parent | 5578ada6e924091dbf71e4a419c110d876286e00 (diff) | |
| download | FreeBSD-src-72067f66c5795c52a5dff6b756ab1436c5de8a04.zip FreeBSD-src-72067f66c5795c52a5dff6b756ab1436c5de8a04.tar.gz | |
oops forgot one..
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/apm/apm.c | 36 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 36 |
2 files changed, 70 insertions, 2 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 6fa6b87..8543a18 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -13,7 +13,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.14 1995/10/28 15:38:14 phk Exp $ + * $Id: apm.c,v 1.15 1995/11/18 04:37:23 bde Exp $ */ #include "apm.h" @@ -23,6 +23,9 @@ #ifdef __FreeBSD__ #include <sys/param.h> #include "conf.h" +#ifdef JREMOD +#include <sys/conf.h> +#endif /*JREMOD*/ #include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -99,6 +102,10 @@ extern void fix_desc(struct fake_descriptor *, int); #ifdef __FreeBSD__ static timeout_t apm_timeout; +#ifdef JREMOD +#define CDEV_MAJOR 39 +static void apm_devsw_install(); +#endif /* JREMOD */ #endif /* __FreeBSD__ */ #ifdef MACH_KERNEL static void apm_timeout(void *); @@ -683,6 +690,11 @@ int printf("apm%d: 32-bit connection error.\n", unit); return 0; } +#ifdef __FreeBSD__ +#ifdef JREMOD + apm_devsw_install(); +#endif /*JREMOD*/ +#endif /* __FreeBSD__ */ return -1; } @@ -969,6 +981,28 @@ apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p) } return error; } +#ifdef JREMOD +struct cdevsw apm_cdevsw = + { apmopen, apmclose, noread, nowrite, /*39*/ + apmioctl, nostop, nullreset, nodevtotty,/* APM */ + seltrue, nommap, NULL }; + +static apm_devsw_installed = 0; + +static void apm_devsw_install() +{ + dev_t descript; + if( ! apm_devsw_installed ) { + descript = makedev(CDEV_MAJOR,0) + cdevsw_add(&descript,&apm_cdevsw,NULL); +#if defined(BDEV_MAJOR) + descript = makedev(BDEV_MAJOR,0) + bdevsw_add(&descript,&apm_bdevsw,NULL); +#endif /*BDEV_MAJOR*/ + apm_devsw_installed = 1; + } +} +#endif /* JREMOD */ #endif /* __FreeBSD__ */ #ifdef MACH_KERNEL diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 6fa6b87..8543a18 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -13,7 +13,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.14 1995/10/28 15:38:14 phk Exp $ + * $Id: apm.c,v 1.15 1995/11/18 04:37:23 bde Exp $ */ #include "apm.h" @@ -23,6 +23,9 @@ #ifdef __FreeBSD__ #include <sys/param.h> #include "conf.h" +#ifdef JREMOD +#include <sys/conf.h> +#endif /*JREMOD*/ #include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -99,6 +102,10 @@ extern void fix_desc(struct fake_descriptor *, int); #ifdef __FreeBSD__ static timeout_t apm_timeout; +#ifdef JREMOD +#define CDEV_MAJOR 39 +static void apm_devsw_install(); +#endif /* JREMOD */ #endif /* __FreeBSD__ */ #ifdef MACH_KERNEL static void apm_timeout(void *); @@ -683,6 +690,11 @@ int printf("apm%d: 32-bit connection error.\n", unit); return 0; } +#ifdef __FreeBSD__ +#ifdef JREMOD + apm_devsw_install(); +#endif /*JREMOD*/ +#endif /* __FreeBSD__ */ return -1; } @@ -969,6 +981,28 @@ apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p) } return error; } +#ifdef JREMOD +struct cdevsw apm_cdevsw = + { apmopen, apmclose, noread, nowrite, /*39*/ + apmioctl, nostop, nullreset, nodevtotty,/* APM */ + seltrue, nommap, NULL }; + +static apm_devsw_installed = 0; + +static void apm_devsw_install() +{ + dev_t descript; + if( ! apm_devsw_installed ) { + descript = makedev(CDEV_MAJOR,0) + cdevsw_add(&descript,&apm_cdevsw,NULL); +#if defined(BDEV_MAJOR) + descript = makedev(BDEV_MAJOR,0) + bdevsw_add(&descript,&apm_bdevsw,NULL); +#endif /*BDEV_MAJOR*/ + apm_devsw_installed = 1; + } +} +#endif /* JREMOD */ #endif /* __FreeBSD__ */ #ifdef MACH_KERNEL |
