Combine octeon_pcibusvar.h into octeon_pcibus.c to reduce scatter.

diff --git a/sys/arch/octeon/dev/octeon_pcibus.c b/sys/arch/octeon/dev/octeon_pcibus.c
index 78f421a..cfad733 100644 (file)
--- a/sys/arch/octeon/dev/octeon_pcibus.c
+++ b/sys/arch/octeon/dev/octeon_pcibus.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: octeon_pcibus.c,v 1.21 2021/02/20 14:42:51 visa Exp $ */
+/*     $OpenBSD: octeon_pcibus.c,v 1.22 2021/03/04 16:34:47 visa Exp $ */
 /*     $NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $       */
 /*     $NetBSD: bonito_pci.c,v 1.5 2008/04/28 20:23:28 martin Exp $    */
 
@@ -64,7 +64,6 @@
 
 #include <octeon/dev/iobusvar.h>
 #include <octeon/dev/octeon_pcibus.h>
-#include <octeon/dev/octeon_pcibusvar.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -77,8 +76,15 @@
 #define REG_READ32(addr)       (*(volatile uint32_t *)(addr))
 #define REG_WRITE32(addr, data)        (*(volatile uint32_t *)(addr) = (uint32_t)(data))
 
+struct octeon_pcibus_softc {
+       struct device sc_dev;
+       struct mips_pci_chipset sc_pc;
+       struct iobus_attach_args *sc_aa;
+};
+
 int    octeon_pcibus_match(struct device *, void *, void *);
 void   octeon_pcibus_attach(struct device *, struct device *, void *);
+int    octeon_pcibus_print(void *, const char *);
 int    octeon_pcibus_intr_map(int dev, int fn, int pin);
 
 const struct cfattach pcibus_ca = {
@@ -106,6 +112,7 @@ const char *octeon_pcibus_pci_intr_string(void *, pci_intr_handle_t);
 void       *octeon_pcibus_pci_intr_establish(void *, pci_intr_handle_t, int,
                                              int (*)(void *), void *, char *);
 void        octeon_pcibus_pci_intr_disestablish(void *, void *);
+struct extent *octeon_pcibus_get_resource_extent(pci_chipset_tag_t, int);
 
 
 struct machine_bus_dma_tag octeon_pcibus_bus_dma_tag = {

diff --git a/sys/arch/octeon/dev/octeon_pcibusvar.h b/sys/arch/octeon/dev/octeon_pcibusvar.h
deleted file mode 100644 (file)
index 5e96db0..0000000
--- a/sys/arch/octeon/dev/octeon_pcibusvar.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*     $OpenBSD: octeon_pcibusvar.h,v 1.3 2011/05/08 13:24:55 syuu Exp $       */
-/*     $NetBSD: octeon_pcibusvar.h,v 1.4 2008/04/28 20:23:28 martin Exp $      */
-
-/*-
- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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.
- */
-
-#ifndef _OCTEON_PCIBUSVAR_H_
-#define        _OCTEON_PCIBUSVAR_H_
-
-struct extent;
-
-struct octeon_pcibus_softc {
-       struct device sc_dev;
-       struct mips_pci_chipset sc_pc;
-       struct iobus_attach_args *sc_aa;
-};
-
-#ifdef _KERNEL
-void    octeon_pcibus_intr_disestablish(void *);
-void   *octeon_pcibus_intr_establish(int, int, int, int (*)(void *), void *,
-           const char *);
-int     octeon_pcibus_print(void *, const char *);
-struct extent
-       *octeon_pcibus_get_resource_extent(pci_chipset_tag_t, int);
-void    octeon_pcibus_setintrmask(int);
-#endif /* _KERNEL */
-
-#endif /* _OCTEON_PCIBUSVAR_H_ */