From b6ee7c1b3f3185be3c4e0f5feb5ae993c070d9c8 Mon Sep 17 00:00:00 2001 From: gibbs Date: Tue, 22 Dec 1998 18:14:15 +0000 Subject: Staticize the overrun buffer so that they are not shared between cards of different bus types as each bus type may have a different bus mapping. Submitted by: Eivind Eklund --- sys/dev/advansys/adv_eisa.c | 8 ++++---- sys/dev/advansys/adv_isa.c | 8 ++++---- sys/dev/advansys/adv_pci.c | 8 ++++---- sys/i386/eisa/adv_eisa.c | 8 ++++---- sys/i386/isa/adv_isa.c | 8 ++++---- sys/pci/adv_pci.c | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c index 77b2a92..87ff8dd 100644 --- a/sys/dev/advansys/adv_eisa.c +++ b/sys/dev/advansys/adv_eisa.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: adv_eisa.c,v 1.1 1998/09/15 07:05:39 gibbs Exp $ */ #include "eisa.h" @@ -76,9 +76,9 @@ static int adveisaattach(struct eisa_device *e_dev); * The overrun buffer shared amongst all EISA adapters. */ static u_int8_t* overrun_buf; -bus_dma_tag_t overrun_dmat; -bus_dmamap_t overrun_dmamap; -bus_addr_t overrun_physbase; +static bus_dma_tag_t overrun_dmat; +static bus_dmamap_t overrun_dmamap; +static bus_addr_t overrun_physbase; static struct eisa_driver adv_eisa_driver = { diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c index d0c2d4a..7e9b84d 100644 --- a/sys/dev/advansys/adv_isa.c +++ b/sys/dev/advansys/adv_isa.c @@ -44,7 +44,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_isa.c,v 1.6 1998/10/12 18:53:33 imp Exp $ + * $Id: adv_isa.c,v 1.7 1998/11/10 06:44:54 gibbs Exp $ */ #include @@ -71,9 +71,9 @@ * The overrun buffer shared amongst all ISA/VL adapters. */ static u_int8_t* overrun_buf; -bus_dma_tag_t overrun_dmat; -bus_dmamap_t overrun_dmamap; -bus_addr_t overrun_physbase; +static bus_dma_tag_t overrun_dmat; +static bus_dmamap_t overrun_dmamap; +static bus_addr_t overrun_physbase; /* Possible port addresses an ISA or VL adapter can live at */ u_int16_t adv_isa_ioports[] = diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c index f05c164..dd81e88 100644 --- a/sys/dev/advansys/adv_pci.c +++ b/sys/dev/advansys/adv_pci.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $ + * $Id: adv_pci.c,v 1.3 1998/12/14 06:32:54 dillon Exp $ */ #include @@ -83,9 +83,9 @@ static void advpciattach(pcici_t config_id, int unit); * The overrun buffer shared amongst all PCI adapters. */ static u_int8_t* overrun_buf; -bus_dma_tag_t overrun_dmat; -bus_dmamap_t overrun_dmamap; -bus_addr_t overrun_physbase; +static bus_dma_tag_t overrun_dmat; +static bus_dmamap_t overrun_dmamap; +static bus_addr_t overrun_physbase; static struct pci_device adv_pci_driver = { "adv", diff --git a/sys/i386/eisa/adv_eisa.c b/sys/i386/eisa/adv_eisa.c index 77b2a92..87ff8dd 100644 --- a/sys/i386/eisa/adv_eisa.c +++ b/sys/i386/eisa/adv_eisa.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: adv_eisa.c,v 1.1 1998/09/15 07:05:39 gibbs Exp $ */ #include "eisa.h" @@ -76,9 +76,9 @@ static int adveisaattach(struct eisa_device *e_dev); * The overrun buffer shared amongst all EISA adapters. */ static u_int8_t* overrun_buf; -bus_dma_tag_t overrun_dmat; -bus_dmamap_t overrun_dmamap; -bus_addr_t overrun_physbase; +static bus_dma_tag_t overrun_dmat; +static bus_dmamap_t overrun_dmamap; +static bus_addr_t overrun_physbase; static struct eisa_driver adv_eisa_driver = { diff --git a/sys/i386/isa/adv_isa.c b/sys/i386/isa/adv_isa.c index d0c2d4a..7e9b84d 100644 --- a/sys/i386/isa/adv_isa.c +++ b/sys/i386/isa/adv_isa.c @@ -44,7 +44,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_isa.c,v 1.6 1998/10/12 18:53:33 imp Exp $ + * $Id: adv_isa.c,v 1.7 1998/11/10 06:44:54 gibbs Exp $ */ #include @@ -71,9 +71,9 @@ * The overrun buffer shared amongst all ISA/VL adapters. */ static u_int8_t* overrun_buf; -bus_dma_tag_t overrun_dmat; -bus_dmamap_t overrun_dmamap; -bus_addr_t overrun_physbase; +static bus_dma_tag_t overrun_dmat; +static bus_dmamap_t overrun_dmamap; +static bus_addr_t overrun_physbase; /* Possible port addresses an ISA or VL adapter can live at */ u_int16_t adv_isa_ioports[] = diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c index f05c164..dd81e88 100644 --- a/sys/pci/adv_pci.c +++ b/sys/pci/adv_pci.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $ + * $Id: adv_pci.c,v 1.3 1998/12/14 06:32:54 dillon Exp $ */ #include @@ -83,9 +83,9 @@ static void advpciattach(pcici_t config_id, int unit); * The overrun buffer shared amongst all PCI adapters. */ static u_int8_t* overrun_buf; -bus_dma_tag_t overrun_dmat; -bus_dmamap_t overrun_dmamap; -bus_addr_t overrun_physbase; +static bus_dma_tag_t overrun_dmat; +static bus_dmamap_t overrun_dmamap; +static bus_addr_t overrun_physbase; static struct pci_device adv_pci_driver = { "adv", -- cgit v1.1