Fri Apr 15 21:03:31 2011 UTC ()
Don't set pba.pba_flags twice.  No functional change intended.


(dyoung)
diff -r1.23 -r1.24 src/sys/arch/cobalt/dev/gt.c
cvs diff -r1.23 -r1.24 src/sys/arch/cobalt/dev/gt.c (expand / switch to unified diff)

--- src/sys/arch/cobalt/dev/gt.c 2011/02/20 07:54:11 1.23
+++ src/sys/arch/cobalt/dev/gt.c 2011/04/15 21:03:31 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gt.c,v 1.23 2011/02/20 07:54:11 matt Exp $ */ 1/* $NetBSD: gt.c,v 1.24 2011/04/15 21:03:31 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. 4 * Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions, and the following disclaimer. 10 * notice, this list of conditions, and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -16,27 +16,27 @@ @@ -16,27 +16,27 @@
16 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28#include <sys/cdefs.h> 28#include <sys/cdefs.h>
29__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.23 2011/02/20 07:54:11 matt Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.24 2011/04/15 21:03:31 dyoung Exp $");
30 30
31#include "opt_pci.h" 31#include "opt_pci.h"
32#include "pci.h" 32#include "pci.h"
33 33
34#include <sys/param.h> 34#include <sys/param.h>
35#include <sys/systm.h> 35#include <sys/systm.h>
36#include <sys/ioctl.h> 36#include <sys/ioctl.h>
37#include <sys/select.h> 37#include <sys/select.h>
38#include <sys/tty.h> 38#include <sys/tty.h>
39#include <sys/proc.h> 39#include <sys/proc.h>
40#include <sys/conf.h> 40#include <sys/conf.h>
41#include <sys/file.h> 41#include <sys/file.h>
42#include <sys/uio.h> 42#include <sys/uio.h>
@@ -125,27 +125,26 @@ gt_attach(device_t parent, device_t self @@ -125,27 +125,26 @@ gt_attach(device_t parent, device_t self
125 pc->pc_bst = sc->sc_bst; 125 pc->pc_bst = sc->sc_bst;
126 pc->pc_bsh = sc->sc_bsh; 126 pc->pc_bsh = sc->sc_bsh;
127 127
128#ifdef PCI_NETBSD_CONFIGURE 128#ifdef PCI_NETBSD_CONFIGURE
129 pc->pc_ioext = extent_create("pciio", 0x10001000, 0x11ffffff, 129 pc->pc_ioext = extent_create("pciio", 0x10001000, 0x11ffffff,
130 M_DEVBUF, NULL, 0, EX_NOWAIT); 130 M_DEVBUF, NULL, 0, EX_NOWAIT);
131 pc->pc_memext = extent_create("pcimem", 0x12000000, 0x13ffffff, 131 pc->pc_memext = extent_create("pcimem", 0x12000000, 0x13ffffff,
132 M_DEVBUF, NULL, 0, EX_NOWAIT); 132 M_DEVBUF, NULL, 0, EX_NOWAIT);
133 pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0, 133 pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0,
134 mips_cache_info.mci_dcache_align); 134 mips_cache_info.mci_dcache_align);
135#endif 135#endif
136 pba.pba_dmat = &pci_bus_dma_tag; 136 pba.pba_dmat = &pci_bus_dma_tag;
137 pba.pba_dmat64 = NULL; 137 pba.pba_dmat64 = NULL;
138 pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED; 
139 pba.pba_bus = 0; 138 pba.pba_bus = 0;
140 pba.pba_bridgetag = NULL; 139 pba.pba_bridgetag = NULL;
141 pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED | 140 pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
142 PCI_FLAGS_MRL_OKAY | /*PCI_FLAGS_MRM_OKAY|*/ PCI_FLAGS_MWI_OKAY; 141 PCI_FLAGS_MRL_OKAY | /*PCI_FLAGS_MRM_OKAY|*/ PCI_FLAGS_MWI_OKAY;
143 pba.pba_pc = pc; 142 pba.pba_pc = pc;
144 config_found_ia(self, "pcibus", &pba, gt_print); 143 config_found_ia(self, "pcibus", &pba, gt_print);
145#endif 144#endif
146} 145}
147 146
148static int 147static int
149gt_print(void *aux, const char *pnp) 148gt_print(void *aux, const char *pnp)
150{ 149{
151 150