diff options
| author | asami <asami@FreeBSD.org> | 1996-08-31 15:07:42 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-08-31 15:07:42 +0000 |
| commit | db0af2c4dc8e05c93d178bf31653024d244398bb (patch) | |
| tree | 1d4f9dd9983260d30deb95e70476dcd4ddd4bf3f /sys/pc98/apm | |
| parent | daaa458ad4e4d56643147824f01dc948bdfae9e4 (diff) | |
| download | FreeBSD-src-db0af2c4dc8e05c93d178bf31653024d244398bb.zip FreeBSD-src-db0af2c4dc8e05c93d178bf31653024d244398bb.tar.gz | |
s/pc98/isa/g in struct *_device and *_driver. Resync along the way.
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/pc98/apm')
| -rw-r--r-- | sys/pc98/apm/apm.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sys/pc98/apm/apm.c b/sys/pc98/apm/apm.c index 482eefb..008282d 100644 --- a/sys/pc98/apm/apm.c +++ b/sys/pc98/apm/apm.c @@ -14,7 +14,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.1.1.1 1996/06/14 10:04:36 asami Exp $ + * $Id: apm.c,v 1.2 1996/07/23 07:45:29 asami Exp $ */ #include "apm.h" @@ -36,9 +36,9 @@ #include <sys/proc.h> #include <sys/vnode.h> #ifdef PC98 -#include "pc98/pc98/pc98_device.h" +#include <pc98/pc98/pc98_device.h> #else -#include "i386/isa/isa_device.h" +#include <i386/isa/isa_device.h> #endif #include <machine/apm_bios.h> #include <machine/segments.h> @@ -48,7 +48,7 @@ #include <vm/pmap.h> #include <sys/syslog.h> #include <sys/devconf.h> -#include "apm_setup.h" +#include <i386/apm/apm_setup.h> static int apm_display_off __P((void)); static int apm_int __P((u_long *eax, u_long *ebx, u_long *ecx)); @@ -585,15 +585,9 @@ apm_not_halt_cpu(struct apm_softc *sc) } /* device driver definitions */ -#ifdef PC98 -static int apmprobe (struct pc98_device *); -static int apmattach(struct pc98_device *); -struct pc98_driver apmdriver = { -#else static int apmprobe (struct isa_device *); static int apmattach(struct isa_device *); struct isa_driver apmdriver = { -#endif apmprobe, apmattach, "apm" }; /* @@ -606,11 +600,7 @@ struct isa_driver apmdriver = { */ static int -#ifdef PC98 -apmprobe(struct pc98_device *dvp) -#else apmprobe(struct isa_device *dvp) -#endif { if ( dvp->id_unit > 0 ) { printf("apm: Only one APM driver supported.\n"); @@ -697,11 +687,7 @@ apm_processevent(struct apm_softc *sc) */ static int -#ifdef PC98 -apmattach(struct pc98_device *dvp) -#else apmattach(struct isa_device *dvp) -#endif { #define APM_KERNBASE KERNBASE struct apm_softc *sc = &apm_softc; |
