Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amiga/conf Add empm(4) driver to config files.



details:   https://anonhg.NetBSD.org/src/rev/3d3f2fce238a
branches:  trunk
changeset: 784433:3d3f2fce238a
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Mon Jan 28 14:54:51 2013 +0000

description:
Add empm(4) driver to config files.

diffstat:

 sys/arch/amiga/conf/GENERIC.in  |   5 +++--
 sys/arch/amiga/conf/files.amiga |  11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r 439e3fbd88a8 -r 3d3f2fce238a sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Mon Jan 28 14:53:33 2013 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Mon Jan 28 14:54:51 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.107 2012/11/25 23:37:10 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.108 2013/01/28 14:54:51 rkujawa Exp $
 #
 ##
 # GENERIC machine description file
@@ -52,7 +52,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.107 $"
+#ident                 "GENERIC-$Revision: 1.108 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions    COPTS="-Os"
@@ -585,6 +585,7 @@
 
 empb0          at zbus0                # ELBOX Mediator PCI 1200
 emmem0         at zbus0                # ELBOX Mediator PCI memory space
+empm0          at empb0                # ELBOX Mediator PCI Power Management
 pci*           at empb0
 
 #cv3dpb*       at zbus0                # CyberVision 64/3D PCI bridge
diff -r 439e3fbd88a8 -r 3d3f2fce238a sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga   Mon Jan 28 14:53:33 2013 +0000
+++ b/sys/arch/amiga/conf/files.amiga   Mon Jan 28 14:54:51 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.amiga,v 1.167 2013/01/11 11:00:33 he Exp $
+#      $NetBSD: files.amiga,v 1.168 2013/01/28 14:54:51 rkujawa Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16                       # NOTE THAT AMIGA IS SPECIAL!
@@ -543,9 +543,14 @@
 attach cv3dpb at zbus
 file   arch/amiga/pci/cv3dpb.c         cv3dpb & pci
 
-device empb: pcibus, amibus_empb
+define empmdev { }
+device empm
+attach empm at empmdev
+file   arch/amiga/pci/empm.c           empm needs-flag
+
+device empb: pcibus, amibus_empb, empmdev
 attach empb at zbus
-file   arch/amiga/pci/empb.c           empb & pci
+file   arch/amiga/pci/empb.c           empb & pci & empm
 
 device emmem {}
 attach emmem at zbus



Home | Main Index | Thread Index | Old Index