Module Name: src
Committed By: uwe
Date: Fri Apr 3 04:21:51 UTC 2009
Modified Files:
src/sys/dev/hpc: files.hpcapm
Log Message:
Config glue for attaching apm at apmdevif.
Unfortunately dev/apm/files.apm and dev/hpc/apm/files.apm cannot be
included both at the same time (they define same options and config(1)
complains), so you need to comment out old code and uncomment new code
to be able to replace "apmdev0 at hpcapm0" with "apm0 at hpcapm0" in
your kernel config.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hpc/files.hpcapm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hpc/files.hpcapm
diff -u src/sys/dev/hpc/files.hpcapm:1.2 src/sys/dev/hpc/files.hpcapm:1.3
--- src/sys/dev/hpc/files.hpcapm:1.2 Mon Oct 9 10:33:42 2006
+++ src/sys/dev/hpc/files.hpcapm Fri Apr 3 04:21:51 2009
@@ -1,8 +1,33 @@
-# $NetBSD: files.hpcapm,v 1.2 2006/10/09 10:33:42 peter Exp $
+# $NetBSD: files.hpcapm,v 1.3 2009/04/03 04:21:51 uwe Exp $
# H/PC APM device emulator
+# XXX: transitioning from apmdev(4) to apm(4)
+# XXX: cannot include both, unfortunately
+#
+# While drivers are not converted let kernels have either old
+#
+# apmdev0 at hpcapm0 # defined in dev/hpc/apm/files.apm
+#
+# 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
+
+
define hpcapmif { }
device hpcapm: apmdevif
attach hpcapm at hpcapmif
