diff options
| author | uwe <uwe@NetBSD.org> | 2009-04-03 05:01:09 +0000 |
|---|---|---|
| committer | uwe <uwe@NetBSD.org> | 2009-04-03 05:01:09 +0000 |
| commit | 30f9f983a3fc76768f7ac281d5e514b66753ee6d (patch) | |
| tree | 6b1f7c8f5fe5cd54ae95316a5819d5f7871d6d67 /sys/dev/hpc | |
| parent | 82442fe367d624e90610ebfd3f5a8a97fbf313ba (diff) | |
Use dev/apm/files.apm for APM options in opt_apm.h.
Now both apm and apmdev files.apm can be included so you can switch
from apmdev0 to apm0 at hpcapm0 in your kernel config easily.
Diffstat (limited to 'sys/dev/hpc')
| -rw-r--r-- | sys/dev/hpc/apm/apmdev.c | 6 | ||||
| -rw-r--r-- | sys/dev/hpc/apm/files.apm | 10 | ||||
| -rw-r--r-- | sys/dev/hpc/files.hpcapm | 26 |
3 files changed, 15 insertions, 27 deletions
diff --git a/sys/dev/hpc/apm/apmdev.c b/sys/dev/hpc/apm/apmdev.c index bdaefcbcbed..30667af7153 100644 --- a/sys/dev/hpc/apm/apmdev.c +++ b/sys/dev/hpc/apm/apmdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: apmdev.c,v 1.22 2009/04/03 04:13:17 uwe Exp $ */ +/* $NetBSD: apmdev.c,v 1.23 2009/04/03 05:01:10 uwe Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -33,10 +33,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.22 2009/04/03 04:13:17 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.23 2009/04/03 05:01:10 uwe Exp $"); #ifdef _KERNEL_OPT -#include "opt_apmdev.h" +#include "opt_apm.h" #endif #ifdef APM_NOIDLE diff --git a/sys/dev/hpc/apm/files.apm b/sys/dev/hpc/apm/files.apm index 0625a91031f..3ca747fbc64 100644 --- a/sys/dev/hpc/apm/files.apm +++ b/sys/dev/hpc/apm/files.apm @@ -1,12 +1,12 @@ -# $NetBSD: files.apm,v 1.3 2006/02/24 13:06:12 cube Exp $ +# $NetBSD: files.apm,v 1.4 2009/04/03 05:01:10 uwe Exp $ # # Common APM support files # -defflag opt_apmdev.h APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE - APM_NO_STANDBY APM_V10_ONLY APM_NO_V12 APMDEBUG - APM_POWER_PRINT -defparam opt_apmdev.h APMDEBUG_VALUE APM_DISABLE_INTERRUPTS + + +include "dev/apm/files.apm" + define apmdevif {} device apmdev attach apmdev at apmdevif diff --git a/sys/dev/hpc/files.hpcapm b/sys/dev/hpc/files.hpcapm index 19e6efe3ea7..fe70c33598b 100644 --- a/sys/dev/hpc/files.hpcapm +++ b/sys/dev/hpc/files.hpcapm @@ -1,32 +1,20 @@ -# $NetBSD: files.hpcapm,v 1.3 2009/04/03 04:21:51 uwe Exp $ +# $NetBSD: files.hpcapm,v 1.4 2009/04/03 05:01:09 uwe Exp $ # H/PC APM device emulator -# XXX: transitioning from apmdev(4) to apm(4) -# XXX: cannot include both, unfortunately -# +include "dev/hpc/apm/files.apm" + +# Transitioning from apmdev(4) to apm(4) # While drivers are not converted let kernels have either old # -# apmdev0 at hpcapm0 # defined in dev/hpc/apm/files.apm +# apmdev0 at hpcapm0 # # to maintain status quo, xor new # # apm0 at hpcapm0 # # for those who do driver convertion to pmf(9). - -#-if old apmdev(4) - dopowerhooks(9) - -include "dev/hpc/apm/files.apm" - -#-else new apm(4) - pmf(9) - -#include "dev/apm/files.apm" -#define apmdevif {} -#attach apm at apmdevif with apm_apmdevif -#file dev/hpc/apm_apmdevif.c apm_apmdevif - -#-endif - +attach apm at apmdevif with apm_apmdevif +file dev/hpc/apm_apmdevif.c apm_apmdevif define hpcapmif { } device hpcapm: apmdevif |
