diff options
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/dev/psycho.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/psychovar.h | 8 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/uperf_psycho.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/uperf_psychovar.h | 37 |
4 files changed, 12 insertions, 44 deletions
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c index 36692e94026..4de00164ffd 100644 --- a/sys/arch/sparc64/dev/psycho.c +++ b/sys/arch/sparc64/dev/psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psycho.c,v 1.12 2002/01/30 23:58:02 jason Exp $ */ +/* $OpenBSD: psycho.c,v 1.13 2002/01/31 18:27:26 jason Exp $ */ /* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -57,9 +57,6 @@ #include <sparc64/dev/iommuvar.h> #include <sparc64/dev/psychoreg.h> #include <sparc64/dev/psychovar.h> -#if NUPERF_PSYCHO > 0 -#include <sparc64/dev/uperf_psychovar.h> -#endif #include <sparc64/sparc64/cache.h> #undef DEBUG diff --git a/sys/arch/sparc64/dev/psychovar.h b/sys/arch/sparc64/dev/psychovar.h index ad4db5c6646..b9af8ec6346 100644 --- a/sys/arch/sparc64/dev/psychovar.h +++ b/sys/arch/sparc64/dev/psychovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psychovar.h,v 1.2 2001/08/29 02:47:58 jason Exp $ */ +/* $OpenBSD: psychovar.h,v 1.3 2002/01/31 18:27:26 jason Exp $ */ /* $NetBSD: psychovar.h,v 1.6 2001/07/20 00:07:13 eeh Exp $ */ /* @@ -117,4 +117,10 @@ bus_space_tag_t psycho_alloc_bus_tag __P((struct psycho_pbm *, int)); #define psycho_alloc_mem_tag(pp) psycho_alloc_bus_tag((pp), PCI_MEMORY_BUS_SPACE) #define psycho_alloc_io_tag(pp) psycho_alloc_bus_tag((pp), PCI_IO_BUS_SPACE) +/* uperf attachment to psycho's */ +struct uperf_psycho_attach_args { + char *upaa_name; + struct perfmon *upaa_regs; +}; + #endif /* _SPARC64_DEV_PSYCHOVAR_H_ */ diff --git a/sys/arch/sparc64/dev/uperf_psycho.c b/sys/arch/sparc64/dev/uperf_psycho.c index 43ef46aa6f3..cdcecd1b450 100644 --- a/sys/arch/sparc64/dev/uperf_psycho.c +++ b/sys/arch/sparc64/dev/uperf_psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uperf_psycho.c,v 1.1 2002/01/30 23:58:02 jason Exp $ */ +/* $OpenBSD: uperf_psycho.c,v 1.2 2002/01/31 18:27:26 jason Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -43,10 +43,12 @@ #include <machine/intr.h> #include <machine/autoconf.h> +#include <dev/pci/pcivar.h> + #include <arch/sparc64/dev/iommureg.h> #include <arch/sparc64/dev/psychoreg.h> +#include <arch/sparc64/dev/psychovar.h> #include <arch/sparc64/dev/uperfvar.h> -#include <arch/sparc64/dev/uperf_psychovar.h> int uperf_psycho_match __P((struct device *, void *, void *)); void uperf_psycho_attach __P((struct device *, struct device *, void *)); diff --git a/sys/arch/sparc64/dev/uperf_psychovar.h b/sys/arch/sparc64/dev/uperf_psychovar.h deleted file mode 100644 index 835ccf0a759..00000000000 --- a/sys/arch/sparc64/dev/uperf_psychovar.h +++ /dev/null @@ -1,37 +0,0 @@ -/* $OpenBSD: uperf_psychovar.h,v 1.1 2002/01/30 23:58:02 jason Exp $ */ - -/* - * Copyright (c) 2002 Jason L. Wright (jason@thought.net) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Jason L. Wright - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -struct uperf_psycho_attach_args { - char *upaa_name; - struct perfmon *upaa_regs; -}; |