diff options
| author | Jordan Hargrave <jordan@cvs.openbsd.org> | 2005-11-21 17:24:27 +0000 |
|---|---|---|
| committer | Jordan Hargrave <jordan@cvs.openbsd.org> | 2005-11-21 17:24:27 +0000 |
| commit | eb01b2b7fa7f0eff236c6683e0369227aef6c5ae (patch) | |
| tree | 274dc2ba31a82f043aaffb4f89fbd24e57172043 | |
| parent | 6716439710b044e2cec4df518884e986deb002e2 (diff) | |
Add ESM support glue but keep it disabled for now.
ok dlg@ marco@
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/mainbus.c | 20 |
3 files changed, 26 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 9c8911745a5..480042c2263 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.439 2005/11/15 01:12:48 brad Exp $ +# $OpenBSD: GENERIC,v 1.440 2005/11/21 17:24:26 jordan Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -49,6 +49,7 @@ bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose ipmi0 at mainbus? # IPMI +#esm0 at mainbus? # Dell Embedded Server Management isa0 at mainbus0 isa0 at pcib? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 4b4164f2374..ab69807f0b5 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.140 2005/11/04 06:55:35 tedu Exp $ +# $OpenBSD: files.i386,v 1.141 2005/11/21 17:24:26 jordan Exp $ # # new style config file for i386 architecture # @@ -407,3 +407,7 @@ device ipmi attach ipmi at mainbus file dev/ipmi.c ipmi needs-flag +# Dell Embedded Systems Management +device esm +attach esm at mainbus +file arch/i386/i386/esm.c esm needs-flag diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c index 0afc46b6c29..7bd55b73496 100644 --- a/sys/arch/i386/i386/mainbus.c +++ b/sys/arch/i386/i386/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.19 2005/10/18 23:08:24 marco Exp $ */ +/* $OpenBSD: mainbus.c,v 1.20 2005/11/21 17:24:26 jordan Exp $ */ /* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */ /* @@ -52,6 +52,7 @@ #include "mpbios.h" #include "acpi.h" #include "ipmi.h" +#include "esm.h" #include <machine/cpuvar.h> #include <machine/i82093var.h> @@ -70,6 +71,10 @@ #include <dev/ipmivar.h> #endif +#if NESM > 0 +#include <arch/i386/i386/esmvar.h> +#endif + #if 0 #ifdef SMP /* XXX MULTIPROCESSOR */ #include <machine/mp.h> @@ -105,6 +110,9 @@ union mainbus_attach_args { #if NIPMI > 0 struct ipmi_attach_args mba_iaa; #endif +#if NESM > 0 + struct esm_attach_args mba_eaa; +#endif }; /* @@ -201,6 +209,16 @@ mainbus_attach(parent, self, aux) #endif #endif +#if NESM > 0 + { + memset(&mba.mba_eaa, 0, sizeof(mba.mba_eaa)); + mba.mba_eaa.eaa_name = "esm"; + mba.mba_eaa.eaa_iot = I386_BUS_SPACE_IO; + mba.mba_eaa.eaa_memt = I386_BUS_SPACE_MEM; + config_found(self, &mba.mba_eaa, mainbus_print); + } +#endif + /* * XXX Note also that the presence of a PCI bus should * XXX _always_ be checked, and if present the bus should be |