Fri Jul 1 18:53:48 2011 UTC ()
#include <sys/bus.h> instead of <machine/bus.h>.


(dyoung)
diff -r1.34 -r1.35 src/sys/arch/sgimips/dev/crime.c
diff -r1.34 -r1.35 src/sys/arch/sgimips/dev/crmfb.c
diff -r1.7 -r1.8 src/sys/arch/sgimips/dev/crimevar.h
diff -r1.2 -r1.3 src/sys/arch/sgimips/dev/ctl.c
diff -r1.2 -r1.3 src/sys/arch/sgimips/dev/dpclock.c
diff -r1.4 -r1.5 src/sys/arch/sgimips/dev/dsclock.c
diff -r1.31 -r1.32 src/sys/arch/sgimips/dev/imc.c
diff -r1.23 -r1.24 src/sys/arch/sgimips/dev/int.c
diff -r1.14 -r1.15 src/sys/arch/sgimips/dev/pic.c
diff -r1.6 -r1.7 src/sys/arch/sgimips/eisa/eisa_machdep.c
diff -r1.31 -r1.32 src/sys/arch/sgimips/gio/gio.c
diff -r1.9 -r1.10 src/sys/arch/sgimips/gio/giovar.h
diff -r1.2 -r1.3 src/sys/arch/sgimips/gio/grtwovar.h
diff -r1.2 -r1.3 src/sys/arch/sgimips/gio/newportvar.h
diff -r1.1 -r1.2 src/sys/arch/sgimips/gio/lightvar.h
diff -r1.8 -r1.9 src/sys/arch/sgimips/gio/pci_gio.c
diff -r1.19 -r1.20 src/sys/arch/sgimips/hpc/haltwo.c
diff -r1.65 -r1.66 src/sys/arch/sgimips/hpc/hpc.c
diff -r1.20 -r1.21 src/sys/arch/sgimips/hpc/hpcdma.c
diff -r1.10 -r1.11 src/sys/arch/sgimips/hpc/hpcdma.h
diff -r1.10 -r1.11 src/sys/arch/sgimips/hpc/pi1ppc.c
diff -r1.41 -r1.42 src/sys/arch/sgimips/hpc/if_sq.c
diff -r1.5 -r1.6 src/sys/arch/sgimips/hpc/pi1ppcvar.h
diff -r1.31 -r1.32 src/sys/arch/sgimips/hpc/wdsc.c
diff -r1.8 -r1.9 src/sys/arch/sgimips/ioc/ioc.c
diff -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oioc.c
diff -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oiocsc.c
diff -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oiocvar.h
diff -r1.8 -r1.9 src/sys/arch/sgimips/mace/com_mace.c
diff -r1.8 -r1.9 src/sys/arch/sgimips/mace/lpt_mace.c
diff -r1.45 -r1.46 src/sys/arch/sgimips/mace/if_mec.c
diff -r1.16 -r1.17 src/sys/arch/sgimips/mace/mace.c
diff -r1.5 -r1.6 src/sys/arch/sgimips/mace/macekbc.c
diff -r1.6 -r1.7 src/sys/arch/sgimips/mace/mavb.c
diff -r1.13 -r1.14 src/sys/arch/sgimips/mace/mcclock_mace.c
diff -r1.12 -r1.13 src/sys/arch/sgimips/mace/pci_mace.c
diff -r1.21 -r1.22 src/sys/arch/sgimips/pci/pci_machdep.c
cvs diff -r1.34 -r1.35 src/sys/arch/sgimips/dev/crime.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/crime.c 2011/02/20 07:59:50 1.34
+++ src/sys/arch/sgimips/dev/crime.c 2011/07/01 18:53:45 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: crime.c,v 1.34 2011/02/20 07:59:50 matt Exp $ */ 1/* $NetBSD: crime.c,v 1.35 2011/07/01 18:53:45 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2004 Christopher SEKIYA 4 * Copyright (c) 2004 Christopher SEKIYA
5 * Copyright (c) 2000 Soren S. Jorvang 5 * Copyright (c) 2000 Soren S. Jorvang
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -28,37 +28,37 @@ @@ -28,37 +28,37 @@
28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35 35
36/* 36/*
37 * O2 CRIME 37 * O2 CRIME
38 */ 38 */
39 39
40#include <sys/cdefs.h> 40#include <sys/cdefs.h>
41__KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.34 2011/02/20 07:59:50 matt Exp $"); 41__KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.35 2011/07/01 18:53:45 dyoung Exp $");
42 42
43#include <sys/param.h> 43#include <sys/param.h>
44#include <sys/device.h> 44#include <sys/device.h>
45#include <sys/systm.h> 45#include <sys/systm.h>
46#include <sys/kernel.h> 46#include <sys/kernel.h>
47#include <sys/cpu.h> 47#include <sys/cpu.h>
48 48
49#include <machine/locore.h> 49#include <machine/locore.h>
50#include <machine/autoconf.h> 50#include <machine/autoconf.h>
51#include <machine/bus.h> 51#include <sys/bus.h>
52#include <machine/intr.h> 52#include <machine/intr.h>
53#include <machine/machtype.h> 53#include <machine/machtype.h>
54#include <machine/sysconf.h> 54#include <machine/sysconf.h>
55 55
56#include <sgimips/dev/crimevar.h> 56#include <sgimips/dev/crimevar.h>
57#include <sgimips/dev/crimereg.h> 57#include <sgimips/dev/crimereg.h>
58#include <sgimips/mace/macevar.h> 58#include <sgimips/mace/macevar.h>
59 59
60#include "locators.h" 60#include "locators.h"
61 61
62#define DISABLE_CRIME_WATCHDOG 62#define DISABLE_CRIME_WATCHDOG
63 63
64static int crime_match(struct device *, struct cfdata *, void *); 64static int crime_match(struct device *, struct cfdata *, void *);
cvs diff -r1.34 -r1.35 src/sys/arch/sgimips/dev/crmfb.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/crmfb.c 2011/05/17 22:52:28 1.34
+++ src/sys/arch/sgimips/dev/crmfb.c 2011/07/01 18:53:46 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: crmfb.c,v 1.34 2011/05/17 22:52:28 macallan Exp $ */ 1/* $NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
5 * 2008 Michael Lorenz <macallan@netbsd.org> 5 * 2008 Michael Lorenz <macallan@netbsd.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -22,36 +22,36 @@ @@ -22,36 +22,36 @@
22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 * POSSIBILITY OF SUCH DAMAGE. 27 * POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30/* 30/*
31 * SGI-CRM (O2) Framebuffer driver 31 * SGI-CRM (O2) Framebuffer driver
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.34 2011/05/17 22:52:28 macallan Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $");
36 36
37#include <sys/param.h> 37#include <sys/param.h>
38#include <sys/systm.h> 38#include <sys/systm.h>
39#include <sys/device.h> 39#include <sys/device.h>
40#include <sys/malloc.h> 40#include <sys/malloc.h>
41 41
42#define _SGIMIPS_BUS_DMA_PRIVATE 42#define _SGIMIPS_BUS_DMA_PRIVATE
43#include <machine/autoconf.h> 43#include <machine/autoconf.h>
44#include <machine/bus.h> 44#include <sys/bus.h>
45#include <machine/machtype.h> 45#include <machine/machtype.h>
46#include <machine/vmparam.h> 46#include <machine/vmparam.h>
47 47
48#include <dev/arcbios/arcbios.h> 48#include <dev/arcbios/arcbios.h>
49#include <dev/arcbios/arcbiosvar.h> 49#include <dev/arcbios/arcbiosvar.h>
50 50
51#include <dev/wscons/wsdisplayvar.h> 51#include <dev/wscons/wsdisplayvar.h>
52#include <dev/wscons/wsconsio.h> 52#include <dev/wscons/wsconsio.h>
53#include <dev/wsfont/wsfont.h> 53#include <dev/wsfont/wsfont.h>
54#include <dev/rasops/rasops.h> 54#include <dev/rasops/rasops.h>
55#include <dev/wscons/wsdisplay_vconsvar.h> 55#include <dev/wscons/wsdisplay_vconsvar.h>
56 56
57#include <dev/i2c/i2cvar.h> 57#include <dev/i2c/i2cvar.h>
cvs diff -r1.7 -r1.8 src/sys/arch/sgimips/dev/crimevar.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/crimevar.h 2007/10/17 19:57:03 1.7
+++ src/sys/arch/sgimips/dev/crimevar.h 2011/07/01 18:53:45 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: crimevar.h,v 1.7 2007/10/17 19:57:03 garbled Exp $ */ 1/* $NetBSD: crimevar.h,v 1.8 2011/07/01 18:53:45 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Christopher SEKIYA 4 * Copyright (c) 2003 Christopher SEKIYA
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -22,22 +22,22 @@ @@ -22,22 +22,22 @@
22 * 22 *
23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35#include <machine/bus.h> 35#include <sys/bus.h>
36 36
37struct crime_softc { 37struct crime_softc {
38 struct device sc_dev; 38 struct device sc_dev;
39}; 39};
40 40
41void crime_intr_mask(unsigned int); 41void crime_intr_mask(unsigned int);
42void crime_intr_unmask(unsigned int); 42void crime_intr_unmask(unsigned int);
43void crime_reboot(void); 43void crime_reboot(void);
cvs diff -r1.2 -r1.3 src/sys/arch/sgimips/dev/ctl.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/ctl.c 2011/02/20 07:59:50 1.2
+++ src/sys/arch/sgimips/dev/ctl.c 2011/07/01 18:53:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ctl.c,v 1.2 2011/02/20 07:59:50 matt Exp $ */ 1/* $NetBSD: ctl.c,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Stephen M. Rumble 4 * Copyright (c) 2009 Stephen M. Rumble
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -18,38 +18,38 @@ @@ -18,38 +18,38 @@
18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31__KERNEL_RCSID(0, "$NetBSD: ctl.c,v 1.2 2011/02/20 07:59:50 matt Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: ctl.c,v 1.3 2011/07/01 18:53:46 dyoung Exp $");
32 32
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/kernel.h> 34#include <sys/kernel.h>
35#include <sys/device.h> 35#include <sys/device.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/callout.h> 37#include <sys/callout.h>
38 38
39#include <machine/cpu.h> 39#include <machine/cpu.h>
40#include <machine/locore.h> 40#include <machine/locore.h>
41#include <machine/autoconf.h> 41#include <machine/autoconf.h>
42#include <machine/bus.h> 42#include <sys/bus.h>
43#include <machine/machtype.h> 43#include <machine/machtype.h>
44#include <machine/sysconf.h> 44#include <machine/sysconf.h>
45 45
46#include <sgimips/dev/ctlreg.h> 46#include <sgimips/dev/ctlreg.h>
47 47
48struct ctl_softc { 48struct ctl_softc {
49 device_t sc_dev; 49 device_t sc_dev;
50 50
51 bus_space_tag_t iot; 51 bus_space_tag_t iot;
52 bus_space_handle_t ioh; 52 bus_space_handle_t ioh;
53}; 53};
54 54
55static int ctl_match(device_t, cfdata_t, void *); 55static int ctl_match(device_t, cfdata_t, void *);
cvs diff -r1.2 -r1.3 src/sys/arch/sgimips/dev/dpclock.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/dpclock.c 2009/12/12 14:44:09 1.2
+++ src/sys/arch/sgimips/dev/dpclock.c 2011/07/01 18:53:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: dpclock.c,v 1.2 2009/12/12 14:44:09 tsutsui Exp $ */ 1/* $NetBSD: dpclock.c,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Erik Reid 4 * Copyright (c) 2001 Erik Reid
5 * Copyright (c) 2001 Rafal K. Boni 5 * Copyright (c) 2001 Rafal K. Boni
6 * Copyright (c) 2001 Christopher Sekiya 6 * Copyright (c) 2001 Christopher Sekiya
7 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. 7 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * 9 *
10 * Portions of this code are derived from software contributed to The 10 * Portions of this code are derived from software contributed to The
11 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace 11 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace
12 * Simulation Facility, NASA Ames Research Center. 12 * Simulation Facility, NASA Ames Research Center.
13 * 13 *
14 * Redistribution and use in source and binary forms, with or without 14 * Redistribution and use in source and binary forms, with or without
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 29 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
30 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 30 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
31 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 31 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35 */ 35 */
36 36
37#include <sys/param.h> 37#include <sys/param.h>
38#include <sys/kernel.h> 38#include <sys/kernel.h>
39#include <sys/systm.h> 39#include <sys/systm.h>
40#include <sys/device.h> 40#include <sys/device.h>
41 41
42#include <machine/bus.h> 42#include <sys/bus.h>
43#include <machine/autoconf.h> 43#include <machine/autoconf.h>
44#include <machine/sysconf.h> 44#include <machine/sysconf.h>
45#include <machine/machtype.h> 45#include <machine/machtype.h>
46 46
47#include <dev/clock_subr.h> 47#include <dev/clock_subr.h>
48#include <sgimips/dev/dp8573areg.h> 48#include <sgimips/dev/dp8573areg.h>
49 49
50#include <sgimips/sgimips/clockvar.h> 50#include <sgimips/sgimips/clockvar.h>
51 51
52struct dpclock_softc { 52struct dpclock_softc {
53 struct device sc_dev; 53 struct device sc_dev;
54 54
55 struct todr_chip_handle sc_todrch; 55 struct todr_chip_handle sc_todrch;
cvs diff -r1.4 -r1.5 src/sys/arch/sgimips/dev/dsclock.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/dsclock.c 2010/01/12 15:20:29 1.4
+++ src/sys/arch/sgimips/dev/dsclock.c 2011/07/01 18:53:46 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: dsclock.c,v 1.4 2010/01/12 15:20:29 tsutsui Exp $ */ 1/* $NetBSD: dsclock.c,v 1.5 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Rafal K. Boni 4 * Copyright (c) 2001 Rafal K. Boni
5 * Copyright (c) 2001 Christopher Sekiya 5 * Copyright (c) 2001 Christopher Sekiya
6 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. 6 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Portions of this code are derived from software contributed to The 9 * Portions of this code are derived from software contributed to The
10 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace 10 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace
11 * Simulation Facility, NASA Ames Research Center. 11 * Simulation Facility, NASA Ames Research Center.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -24,34 +24,34 @@ @@ -24,34 +24,34 @@
24 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 24 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 27 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: dsclock.c,v 1.4 2010/01/12 15:20:29 tsutsui Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: dsclock.c,v 1.5 2011/07/01 18:53:46 dyoung Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/kernel.h> 40#include <sys/kernel.h>
41#include <sys/systm.h> 41#include <sys/systm.h>
42#include <sys/device.h> 42#include <sys/device.h>
43 43
44#include <machine/bus.h> 44#include <sys/bus.h>
45#include <machine/autoconf.h> 45#include <machine/autoconf.h>
46#include <machine/sysconf.h> 46#include <machine/sysconf.h>
47#include <machine/machtype.h> 47#include <machine/machtype.h>
48 48
49#include <dev/clock_subr.h> 49#include <dev/clock_subr.h>
50#include <dev/ic/ds1286reg.h> 50#include <dev/ic/ds1286reg.h>
51 51
52#include <sgimips/sgimips/clockvar.h> 52#include <sgimips/sgimips/clockvar.h>
53 53
54struct dsclock_softc { 54struct dsclock_softc {
55 device_t sc_dev; 55 device_t sc_dev;
56 56
57 struct todr_chip_handle sc_todrch; 57 struct todr_chip_handle sc_todrch;
cvs diff -r1.31 -r1.32 src/sys/arch/sgimips/dev/imc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/imc.c 2011/06/30 20:09:35 1.31
+++ src/sys/arch/sgimips/dev/imc.c 2011/07/01 18:53:46 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: imc.c,v 1.31 2011/06/30 20:09:35 wiz Exp $ */ 1/* $NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Rafal K. Boni 4 * Copyright (c) 2001 Rafal K. Boni
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -18,36 +18,36 @@ @@ -18,36 +18,36 @@
18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.31 2011/06/30 20:09:35 wiz Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $");
32 32
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/device.h> 34#include <sys/device.h>
35#include <sys/systm.h> 35#include <sys/systm.h>
36 36
37#include <machine/cpu.h> 37#include <machine/cpu.h>
38#include <machine/locore.h> 38#include <machine/locore.h>
39#include <machine/autoconf.h> 39#include <machine/autoconf.h>
40#include <machine/bus.h> 40#include <sys/bus.h>
41#include <machine/machtype.h> 41#include <machine/machtype.h>
42#include <machine/sysconf.h> 42#include <machine/sysconf.h>
43 43
44#include <sgimips/dev/imcreg.h> 44#include <sgimips/dev/imcreg.h>
45#include <sgimips/dev/imcvar.h> 45#include <sgimips/dev/imcvar.h>
46 46
47#include <sgimips/gio/giovar.h> 47#include <sgimips/gio/giovar.h>
48 48
49#include "locators.h" 49#include "locators.h"
50 50
51struct imc_softc { 51struct imc_softc {
52 struct device sc_dev; 52 struct device sc_dev;
53 53
cvs diff -r1.23 -r1.24 src/sys/arch/sgimips/dev/int.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/int.c 2011/03/10 17:32:46 1.23
+++ src/sys/arch/sgimips/dev/int.c 2011/07/01 18:53:46 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $ */ 1/* $NetBSD: int.c,v 1.24 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Stephen M. Rumble  4 * Copyright (c) 2009 Stephen M. Rumble
5 * Copyright (c) 2004 Christopher SEKIYA 5 * Copyright (c) 2004 Christopher SEKIYA
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -23,43 +23,43 @@ @@ -23,43 +23,43 @@
23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31/* 31/*
32 * INT1/INT2/INT3 interrupt controllers (IP6, IP10, IP12, IP20, IP22, IP24...) 32 * INT1/INT2/INT3 interrupt controllers (IP6, IP10, IP12, IP20, IP22, IP24...)
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.24 2011/07/01 18:53:46 dyoung Exp $");
37 37
38#define __INTR_PRIVATE 38#define __INTR_PRIVATE
39#include "opt_cputype.h" 39#include "opt_cputype.h"
40 40
41#include <sys/param.h> 41#include <sys/param.h>
42#include <sys/proc.h> 42#include <sys/proc.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/timetc.h> 44#include <sys/timetc.h>
45#include <sys/kernel.h> 45#include <sys/kernel.h>
46#include <sys/device.h> 46#include <sys/device.h>
47#include <sys/malloc.h> 47#include <sys/malloc.h>
48 48
49#include <dev/ic/i8253reg.h> 49#include <dev/ic/i8253reg.h>
50#include <machine/sysconf.h> 50#include <machine/sysconf.h>
51#include <machine/machtype.h> 51#include <machine/machtype.h>
52#include <machine/bus.h> 52#include <sys/bus.h>
53#include <mips/locore.h> 53#include <mips/locore.h>
54 54
55#include <mips/cache.h> 55#include <mips/cache.h>
56 56
57#include <sgimips/dev/int1reg.h> 57#include <sgimips/dev/int1reg.h>
58#include <sgimips/dev/int2reg.h> 58#include <sgimips/dev/int2reg.h>
59#include <sgimips/dev/int2var.h> 59#include <sgimips/dev/int2var.h>
60 60
61static bus_space_handle_t ioh; 61static bus_space_handle_t ioh;
62static bus_space_tag_t iot; 62static bus_space_tag_t iot;
63 63
64struct int_softc { 64struct int_softc {
65 struct device sc_dev; 65 struct device sc_dev;
cvs diff -r1.14 -r1.15 src/sys/arch/sgimips/dev/pic.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/pic.c 2011/02/20 07:59:50 1.14
+++ src/sys/arch/sgimips/dev/pic.c 2011/07/01 18:53:46 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pic.c,v 1.14 2011/02/20 07:59:50 matt Exp $ */ 1/* $NetBSD: pic.c,v 1.15 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2002 Steve Rumble 4 * Copyright (c) 2002 Steve Rumble
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -18,36 +18,36 @@ @@ -18,36 +18,36 @@
18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.14 2011/02/20 07:59:50 matt Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.15 2011/07/01 18:53:46 dyoung Exp $");
32 32
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/device.h> 34#include <sys/device.h>
35#include <sys/systm.h> 35#include <sys/systm.h>
36 36
37#include <machine/cpu.h> 37#include <machine/cpu.h>
38#include <machine/locore.h> 38#include <machine/locore.h>
39#include <machine/autoconf.h> 39#include <machine/autoconf.h>
40#include <machine/bus.h> 40#include <sys/bus.h>
41#include <machine/machtype.h> 41#include <machine/machtype.h>
42#include <machine/sysconf.h> 42#include <machine/sysconf.h>
43 43
44#include <sgimips/dev/picreg.h> 44#include <sgimips/dev/picreg.h>
45 45
46#include <sgimips/gio/giovar.h> 46#include <sgimips/gio/giovar.h>
47 47
48#include "locators.h" 48#include "locators.h"
49 49
50struct pic_softc { 50struct pic_softc {
51 struct device sc_dev; 51 struct device sc_dev;
52 52
53 bus_space_tag_t iot; 53 bus_space_tag_t iot;
cvs diff -r1.6 -r1.7 src/sys/arch/sgimips/eisa/eisa_machdep.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/eisa/eisa_machdep.c 2009/03/14 21:04:15 1.6
+++ src/sys/arch/sgimips/eisa/eisa_machdep.c 2011/07/01 18:53:46 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: eisa_machdep.c,v 1.6 2009/03/14 21:04:15 dsl Exp $ */ 1/* $NetBSD: eisa_machdep.c,v 1.7 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. 4 * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center. 9 * NASA Ames Research Center.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -55,37 +55,37 @@ @@ -55,37 +55,37 @@
55 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 55 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
56 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 56 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
57 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 57 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
58 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 58 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
59 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 59 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
60 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 60 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
61 */ 61 */
62 62
63/* 63/*
64 * Machine-specific functions for EISA autoconfiguration. 64 * Machine-specific functions for EISA autoconfiguration.
65 */ 65 */
66 66
67#include <sys/cdefs.h> 67#include <sys/cdefs.h>
68__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.6 2009/03/14 21:04:15 dsl Exp $"); 68__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.7 2011/07/01 18:53:46 dyoung Exp $");
69 69
70#include <sys/types.h> 70#include <sys/types.h>
71#include <sys/param.h> 71#include <sys/param.h>
72#include <sys/time.h> 72#include <sys/time.h>
73#include <sys/systm.h> 73#include <sys/systm.h>
74#include <sys/errno.h> 74#include <sys/errno.h>
75#include <sys/device.h> 75#include <sys/device.h>
76#include <sys/extent.h> 76#include <sys/extent.h>
77 77
78#include <machine/bus.h> 78#include <sys/bus.h>
79#include <dev/eisa/eisavar.h> 79#include <dev/eisa/eisavar.h>
80 80
81void 81void
82eisa_attach_hook(struct device *parent, struct device *self, struct eisabus_attach_args *eba) 82eisa_attach_hook(struct device *parent, struct device *self, struct eisabus_attach_args *eba)
83{ 83{
84} 84}
85 85
86int 86int
87eisa_maxslots(eisa_chipset_tag_t ec) 87eisa_maxslots(eisa_chipset_tag_t ec)
88{ 88{
89 89
90 /* 90 /*
91 * Always try 16 slots. 91 * Always try 16 slots.
cvs diff -r1.31 -r1.32 src/sys/arch/sgimips/gio/gio.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/gio/gio.c 2009/03/18 10:22:35 1.31
+++ src/sys/arch/sgimips/gio/gio.c 2011/07/01 18:53:46 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gio.c,v 1.31 2009/03/18 10:22:35 cegger Exp $ */ 1/* $NetBSD: gio.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Soren S. Jorvang 4 * Copyright (c) 2000 Soren S. Jorvang
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -23,36 +23,36 @@ @@ -23,36 +23,36 @@
23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.31 2009/03/18 10:22:35 cegger Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $");
37 37
38#include "opt_ddb.h" 38#include "opt_ddb.h"
39 39
40#include <sys/param.h> 40#include <sys/param.h>
41#include <sys/systm.h> 41#include <sys/systm.h>
42#include <sys/device.h> 42#include <sys/device.h>
43 43
44#define _SGIMIPS_BUS_DMA_PRIVATE 44#define _SGIMIPS_BUS_DMA_PRIVATE
45#include <machine/bus.h> 45#include <sys/bus.h>
46#include <machine/machtype.h> 46#include <machine/machtype.h>
47#include <machine/sysconf.h> 47#include <machine/sysconf.h>
48 48
49#include <sgimips/gio/gioreg.h> 49#include <sgimips/gio/gioreg.h>
50#include <sgimips/gio/giovar.h> 50#include <sgimips/gio/giovar.h>
51#include <sgimips/gio/giodevs_data.h> 51#include <sgimips/gio/giodevs_data.h>
52 52
53#include "locators.h" 53#include "locators.h"
54#include "newport.h" 54#include "newport.h"
55#include "grtwo.h" 55#include "grtwo.h"
56#include "light.h" 56#include "light.h"
57#include "imc.h" 57#include "imc.h"
58#include "pic.h" 58#include "pic.h"
cvs diff -r1.9 -r1.10 src/sys/arch/sgimips/gio/giovar.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/gio/giovar.h 2007/02/19 20:14:30 1.9
+++ src/sys/arch/sgimips/gio/giovar.h 2011/07/01 18:53:46 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: giovar.h,v 1.9 2007/02/19 20:14:30 rumble Exp $ */ 1/* $NetBSD: giovar.h,v 1.10 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Soren S. Jorvang 4 * Copyright (c) 2000 Soren S. Jorvang
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -26,27 +26,27 @@ @@ -26,27 +26,27 @@
26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35/* 35/*
36 * GIO 32/32-bis/64 bus 36 * GIO 32/32-bis/64 bus
37 */ 37 */
38 38
39#include <machine/bus.h> 39#include <sys/bus.h>
40 40
41struct giobus_attach_args { 41struct giobus_attach_args {
42 bus_space_tag_t gba_iot; 42 bus_space_tag_t gba_iot;
43 bus_space_handle_t gba_ioh; 43 bus_space_handle_t gba_ioh;
44 44
45#define GIOBUS_GIO32 0 45#define GIOBUS_GIO32 0
46#define GIOBUS_GIO32BIS 1 46#define GIOBUS_GIO32BIS 1
47#define GIOBUS_GIO64 2 47#define GIOBUS_GIO64 2
48 int gba_type; 48 int gba_type;
49}; 49};
50 50
51struct gio_attach_args { 51struct gio_attach_args {
52 bus_space_tag_t ga_iot; 52 bus_space_tag_t ga_iot;
cvs diff -r1.2 -r1.3 src/sys/arch/sgimips/gio/grtwovar.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/gio/grtwovar.h 2005/12/11 12:18:53 1.2
+++ src/sys/arch/sgimips/gio/grtwovar.h 2011/07/01 18:53:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: grtwovar.h,v 1.2 2005/12/11 12:18:53 christos Exp $ */ 1/* $NetBSD: grtwovar.h,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2004 Christopher SEKIYA 4 * Copyright (c) 2004 Christopher SEKIYA
5 * All rights reserved. 5 * All rights reserved.
6 *  6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -22,18 +22,18 @@ @@ -22,18 +22,18 @@
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 *  28 *
29 * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>> 29 * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
30 */ 30 */
31 31
32#ifndef _ARCH_SGIMIPS_GIO_GRTWOVAR_H_ 32#ifndef _ARCH_SGIMIPS_GIO_GRTWOVAR_H_
33#define _ARCH_SGIMIPS_GIO_GRTWOVAR_H_ 33#define _ARCH_SGIMIPS_GIO_GRTWOVAR_H_
34 34
35#include <machine/bus.h> 35#include <sys/bus.h>
36 36
37int grtwo_cnattach(struct gio_attach_args *); 37int grtwo_cnattach(struct gio_attach_args *);
38 38
39#endif 39#endif
cvs diff -r1.2 -r1.3 src/sys/arch/sgimips/gio/newportvar.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/gio/newportvar.h 2005/12/11 12:18:53 1.2
+++ src/sys/arch/sgimips/gio/newportvar.h 2011/07/01 18:53:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: newportvar.h,v 1.2 2005/12/11 12:18:53 christos Exp $ */ 1/* $NetBSD: newportvar.h,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Ilpo Ruotsalainen 4 * Copyright (c) 2003 Ilpo Ruotsalainen
5 * All rights reserved. 5 * All rights reserved.
6 *  6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -22,18 +22,18 @@ @@ -22,18 +22,18 @@
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 *  28 *
29 * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>> 29 * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
30 */ 30 */
31 31
32#ifndef _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_ 32#ifndef _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_
33#define _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_ 33#define _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_
34 34
35#include <machine/bus.h> 35#include <sys/bus.h>
36 36
37int newport_cnattach(struct gio_attach_args *); 37int newport_cnattach(struct gio_attach_args *);
38 38
39#endif 39#endif
cvs diff -r1.1 -r1.2 src/sys/arch/sgimips/gio/lightvar.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/gio/lightvar.h 2006/12/26 04:28:16 1.1
+++ src/sys/arch/sgimips/gio/lightvar.h 2011/07/01 18:53:46 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $Id: lightvar.h,v 1.1 2006/12/26 04:28:16 rumble Exp $ */ 1/* $Id: lightvar.h,v 1.2 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2006 Stephen M. Rumble 4 * Copyright (c) 2006 Stephen M. Rumble
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. The name of the author may not be used to endorse or promote products 12 * 2. The name of the author may not be used to endorse or promote products
13 * derived from this software without specific prior written permission. 13 * derived from this software without specific prior written permission.
14 * 14 *
@@ -17,18 +17,18 @@ @@ -17,18 +17,18 @@
17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27#ifndef _ARCH_SGIMIPS_GIO_LIGHTVAR_H_ 27#ifndef _ARCH_SGIMIPS_GIO_LIGHTVAR_H_
28#define _ARCH_SGIMIPS_GIO_LIGHTVAR_H_ 28#define _ARCH_SGIMIPS_GIO_LIGHTVAR_H_
29 29
30#include <machine/bus.h> 30#include <sys/bus.h>
31 31
32int light_cnattach(struct gio_attach_args *); 32int light_cnattach(struct gio_attach_args *);
33 33
34#endif /* !_ARCH_SGIMIPS_GIO_LIGHTVAR_H_ */ 34#endif /* !_ARCH_SGIMIPS_GIO_LIGHTVAR_H_ */
cvs diff -r1.8 -r1.9 src/sys/arch/sgimips/gio/pci_gio.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/gio/pci_gio.c 2011/05/17 17:34:52 1.8
+++ src/sys/arch/sgimips/gio/pci_gio.c 2011/07/01 18:53:46 1.9
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1/* $NetBSD: pci_gio.c,v 1.8 2011/05/17 17:34:52 dyoung Exp $ */ 1/* $NetBSD: pci_gio.c,v 1.9 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2006 Stephen M. Rumble 4 * Copyright (c) 2006 Stephen M. Rumble
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. The name of the author may not be used to endorse or promote products 12 * 2. The name of the author may not be used to endorse or promote products
13 * derived from this software without specific prior written permission. 13 * derived from this software without specific prior written permission.
14 * 14 *
15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27#include <sys/cdefs.h> 27#include <sys/cdefs.h>
28__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.8 2011/05/17 17:34:52 dyoung Exp $"); 28__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.9 2011/07/01 18:53:46 dyoung Exp $");
29 29
30/* 30/*
31 * Glue for PCI devices that are connected to the GIO bus by various little 31 * Glue for PCI devices that are connected to the GIO bus by various little
32 * GIO<->PCI ASICs. 32 * GIO<->PCI ASICs.
33 * 33 *
34 * We presently support the following boards: 34 * We presently support the following boards:
35 * o Phobos G100/G130/G160 (if_tlp, lxtphy) 35 * o Phobos G100/G130/G160 (if_tlp, lxtphy)
36 * o Set Engineering GFE (if_tl, nsphy) 36 * o Set Engineering GFE (if_tl, nsphy)
37 */ 37 */
38 38
39#include "opt_pci.h" 39#include "opt_pci.h"
40#include "pci.h" 40#include "pci.h"
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/device.h> 44#include <sys/device.h>
45#include <sys/malloc.h> 45#include <sys/malloc.h>
46#include <sys/extent.h> 46#include <sys/extent.h>
47 47
48#include <machine/bus.h> 48#include <sys/bus.h>
49#include <machine/machtype.h> 49#include <machine/machtype.h>
50 50
51#include <sgimips/gio/giovar.h> 51#include <sgimips/gio/giovar.h>
52#include <sgimips/gio/gioreg.h> 52#include <sgimips/gio/gioreg.h>
53#include <sgimips/gio/giodevs.h> 53#include <sgimips/gio/giodevs.h>
54 54
55#include <sgimips/dev/imcvar.h> 55#include <sgimips/dev/imcvar.h>
56 56
57#include <mips/cache.h> 57#include <mips/cache.h>
58 58
59#include <dev/pci/pcivar.h> 59#include <dev/pci/pcivar.h>
60#include <dev/pci/pcireg.h> 60#include <dev/pci/pcireg.h>
61#include <dev/pci/pcidevs.h> 61#include <dev/pci/pcidevs.h>
cvs diff -r1.19 -r1.20 src/sys/arch/sgimips/hpc/haltwo.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/haltwo.c 2011/01/25 13:31:41 1.19
+++ src/sys/arch/sgimips/hpc/haltwo.c 2011/07/01 18:53:46 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: haltwo.c,v 1.19 2011/01/25 13:31:41 tsutsui Exp $ */ 1/* $NetBSD: haltwo.c,v 1.20 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Ilpo Ruotsalainen 4 * Copyright (c) 2003 Ilpo Ruotsalainen
5 * All rights reserved. 5 * All rights reserved.
6 *  6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -20,40 +20,40 @@ @@ -20,40 +20,40 @@
20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 *  28 *
29 * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>> 29 * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.19 2011/01/25 13:31:41 tsutsui Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.20 2011/07/01 18:53:46 dyoung Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/device.h> 37#include <sys/device.h>
38#include <sys/audioio.h> 38#include <sys/audioio.h>
39#include <sys/malloc.h> 39#include <sys/malloc.h>
40#include <dev/audio_if.h> 40#include <dev/audio_if.h>
41#include <dev/auconv.h> 41#include <dev/auconv.h>
42#include <dev/mulaw.h> 42#include <dev/mulaw.h>
43 43
44#include <uvm/uvm_extern.h> 44#include <uvm/uvm_extern.h>
45 45
46#include <machine/bus.h> 46#include <sys/bus.h>
47#include <machine/sysconf.h> 47#include <machine/sysconf.h>
48 48
49#include <sgimips/hpc/hpcvar.h> 49#include <sgimips/hpc/hpcvar.h>
50#include <sgimips/hpc/hpcreg.h> 50#include <sgimips/hpc/hpcreg.h>
51 51
52#include <sgimips/hpc/haltworeg.h> 52#include <sgimips/hpc/haltworeg.h>
53#include <sgimips/hpc/haltwovar.h> 53#include <sgimips/hpc/haltwovar.h>
54 54
55#ifdef AUDIO_DEBUG 55#ifdef AUDIO_DEBUG
56#define DPRINTF(x) printf x 56#define DPRINTF(x) printf x
57#else 57#else
58#define DPRINTF(x) 58#define DPRINTF(x)
59#endif 59#endif
cvs diff -r1.65 -r1.66 src/sys/arch/sgimips/hpc/hpc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/hpc.c 2011/01/25 13:22:05 1.65
+++ src/sys/arch/sgimips/hpc/hpc.c 2011/07/01 18:53:46 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hpc.c,v 1.65 2011/01/25 13:22:05 tsutsui Exp $ */ 1/* $NetBSD: hpc.c,v 1.66 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Soren S. Jorvang 4 * Copyright (c) 2000 Soren S. Jorvang
5 * Copyright (c) 2001 Rafal K. Boni 5 * Copyright (c) 2001 Rafal K. Boni
6 * Copyright (c) 2001 Jason R. Thorpe 6 * Copyright (c) 2001 Jason R. Thorpe
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -25,37 +25,37 @@ @@ -25,37 +25,37 @@
25 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 25 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
26 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 26 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
27 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 27 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
28 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 28 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
29 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 29 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
30 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 30 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
31 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 31 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35 */ 35 */
36 36
37#include <sys/cdefs.h> 37#include <sys/cdefs.h>
38__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.65 2011/01/25 13:22:05 tsutsui Exp $"); 38__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.66 2011/07/01 18:53:46 dyoung Exp $");
39 39
40#include <sys/param.h> 40#include <sys/param.h>
41#include <sys/systm.h> 41#include <sys/systm.h>
42#include <sys/kernel.h> 42#include <sys/kernel.h>
43#include <sys/device.h> 43#include <sys/device.h>
44#include <sys/reboot.h> 44#include <sys/reboot.h>
45#include <sys/callout.h> 45#include <sys/callout.h>
46 46
47#define _SGIMIPS_BUS_DMA_PRIVATE 47#define _SGIMIPS_BUS_DMA_PRIVATE
48#include <machine/bus.h> 48#include <sys/bus.h>
49#include <machine/machtype.h> 49#include <machine/machtype.h>
50#include <machine/sysconf.h> 50#include <machine/sysconf.h>
51 51
52#include <sgimips/gio/gioreg.h> 52#include <sgimips/gio/gioreg.h>
53#include <sgimips/gio/giovar.h> 53#include <sgimips/gio/giovar.h>
54 54
55#include <sgimips/hpc/hpcvar.h> 55#include <sgimips/hpc/hpcvar.h>
56#include <sgimips/hpc/hpcreg.h> 56#include <sgimips/hpc/hpcreg.h>
57#include <sgimips/ioc/iocreg.h> 57#include <sgimips/ioc/iocreg.h>
58 58
59#include <dev/ic/smc93cx6var.h> 59#include <dev/ic/smc93cx6var.h>
60 60
61#include "locators.h" 61#include "locators.h"
cvs diff -r1.20 -r1.21 src/sys/arch/sgimips/hpc/hpcdma.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/hpcdma.c 2011/01/25 12:30:32 1.20
+++ src/sys/arch/sgimips/hpc/hpcdma.c 2011/07/01 18:53:46 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hpcdma.c,v 1.20 2011/01/25 12:30:32 tsutsui Exp $ */ 1/* $NetBSD: hpcdma.c,v 1.21 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Wayne Knowles 4 * Copyright (c) 2001 Wayne Knowles
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Wayne Knowles 8 * by Wayne Knowles
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -34,36 +34,36 @@ @@ -34,36 +34,36 @@
34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 * POSSIBILITY OF SUCH DAMAGE. 36 * POSSIBILITY OF SUCH DAMAGE.
37 */ 37 */
38 38
39/* 39/*
40 * Support for SCSI DMA provided by the HPC. 40 * Support for SCSI DMA provided by the HPC.
41 * 41 *
42 * Note: We use SCSI0 offsets, etc. here. Since the layout of SCSI0 42 * Note: We use SCSI0 offsets, etc. here. Since the layout of SCSI0
43 * and SCSI1 are the same, this is no problem. 43 * and SCSI1 are the same, this is no problem.
44 */ 44 */
45 45
46#include <sys/cdefs.h> 46#include <sys/cdefs.h>
47__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.20 2011/01/25 12:30:32 tsutsui Exp $"); 47__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.21 2011/07/01 18:53:46 dyoung Exp $");
48 48
49#include <sys/param.h> 49#include <sys/param.h>
50#include <sys/systm.h> 50#include <sys/systm.h>
51#include <sys/device.h> 51#include <sys/device.h>
52#include <sys/buf.h> 52#include <sys/buf.h>
53 53
54#include <uvm/uvm_extern.h> 54#include <uvm/uvm_extern.h>
55 55
56#include <machine/bus.h> 56#include <sys/bus.h>
57 57
58#include <sgimips/hpc/hpcvar.h> 58#include <sgimips/hpc/hpcvar.h>
59#include <sgimips/hpc/hpcreg.h> 59#include <sgimips/hpc/hpcreg.h>
60#include <sgimips/hpc/hpcdma.h> 60#include <sgimips/hpc/hpcdma.h>
61 61
62/* 62/*
63 * Allocate DMA Chain descriptor list 63 * Allocate DMA Chain descriptor list
64 */ 64 */
65void 65void
66hpcdma_init(struct hpc_attach_args *haa, struct hpc_dma_softc *sc, int ndesc) 66hpcdma_init(struct hpc_attach_args *haa, struct hpc_dma_softc *sc, int ndesc)
67{ 67{
68 bus_dma_segment_t seg; 68 bus_dma_segment_t seg;
69 int rseg, allocsz; 69 int rseg, allocsz;
cvs diff -r1.10 -r1.11 src/sys/arch/sgimips/hpc/hpcdma.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/hpcdma.h 2011/01/25 12:21:04 1.10
+++ src/sys/arch/sgimips/hpc/hpcdma.h 2011/07/01 18:53:46 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hpcdma.h,v 1.10 2011/01/25 12:21:04 tsutsui Exp $ */ 1/* $NetBSD: hpcdma.h,v 1.11 2011/07/01 18:53:46 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Wayne Knowles 4 * Copyright (c) 2001 Wayne Knowles
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Wayne Knowles 8 * by Wayne Knowles
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 * POSSIBILITY OF SUCH DAMAGE. 36 * POSSIBILITY OF SUCH DAMAGE.
37 */ 37 */
38 38
39#ifndef _SGIMIPS_HPC_DMA_H 39#ifndef _SGIMIPS_HPC_DMA_H
40#define _SGIMIPS_HPC_DMA_H 40#define _SGIMIPS_HPC_DMA_H
41 41
42#include <machine/bus.h> 42#include <sys/bus.h>
43 43
44struct hpc_dma_softc { 44struct hpc_dma_softc {
45 bus_space_tag_t sc_bst; 45 bus_space_tag_t sc_bst;
46 bus_space_handle_t sc_bsh; 46 bus_space_handle_t sc_bsh;
47 bus_dma_tag_t sc_dmat; 47 bus_dma_tag_t sc_dmat;
48 48
49 uint32_t sc_flags; 49 uint32_t sc_flags;
50#define HPCDMA_READ 0x20 /* direction of transfer */ 50#define HPCDMA_READ 0x20 /* direction of transfer */
51#define HPCDMA_LOADED 0x40 /* bus_dmamap loaded */ 51#define HPCDMA_LOADED 0x40 /* bus_dmamap loaded */
52#define HPCDMA_ACTIVE 0x80 /* DMA engine is busy */ 52#define HPCDMA_ACTIVE 0x80 /* DMA engine is busy */
53 uint32_t sc_dmacmd; 53 uint32_t sc_dmacmd;
54 int sc_ndesc; 54 int sc_ndesc;
55 bus_dmamap_t sc_dmamap; 55 bus_dmamap_t sc_dmamap;
cvs diff -r1.10 -r1.11 src/sys/arch/sgimips/hpc/pi1ppc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/pi1ppc.c 2011/06/09 02:49:32 1.10
+++ src/sys/arch/sgimips/hpc/pi1ppc.c 2011/07/01 18:53:47 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pi1ppc.c,v 1.10 2011/06/09 02:49:32 rmind Exp $ */ 1/* $NetBSD: pi1ppc.c,v 1.11 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Alcove - Nicolas Souchu 4 * Copyright (c) 2001 Alcove - Nicolas Souchu
5 * Copyright (c) 2003, 2004 Gary Thorpe <gathorpe@users.sourceforge.net> 5 * Copyright (c) 2003, 2004 Gary Thorpe <gathorpe@users.sourceforge.net>
6 * Copyright (c) 2005 Joe Britt <britt@danger.com> - SGI PI1 version 6 * Copyright (c) 2005 Joe Britt <britt@danger.com> - SGI PI1 version
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -23,38 +23,38 @@ @@ -23,38 +23,38 @@
23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 * 30 *
31 * FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp 31 * FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp
32 * 32 *
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.10 2011/06/09 02:49:32 rmind Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.11 2011/07/01 18:53:47 dyoung Exp $");
37 37
38#include "opt_pi1ppc.h" 38#include "opt_pi1ppc.h"
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/param.h> 41#include <sys/param.h>
42#include <sys/kernel.h> 42#include <sys/kernel.h>
43#include <sys/kmem.h> 43#include <sys/kmem.h>
44#include <sys/device.h> 44#include <sys/device.h>
45#include <sys/systm.h> 45#include <sys/systm.h>
46 46
47#include <machine/bus.h> 47#include <sys/bus.h>
48/*#include <machine/intr.h>*/ 48/*#include <machine/intr.h>*/
49 49
50#include <dev/ppbus/ppbus_conf.h> 50#include <dev/ppbus/ppbus_conf.h>
51#include <dev/ppbus/ppbus_msq.h> 51#include <dev/ppbus/ppbus_msq.h>
52#include <dev/ppbus/ppbus_io.h> 52#include <dev/ppbus/ppbus_io.h>
53#include <dev/ppbus/ppbus_var.h> 53#include <dev/ppbus/ppbus_var.h>
54 54
55#include <machine/autoconf.h> 55#include <machine/autoconf.h>
56#include <machine/machtype.h> 56#include <machine/machtype.h>
57 57
58#include <sgimips/ioc/iocreg.h> 58#include <sgimips/ioc/iocreg.h>
59 59
60#include <sgimips/hpc/hpcvar.h> 60#include <sgimips/hpc/hpcvar.h>
cvs diff -r1.41 -r1.42 src/sys/arch/sgimips/hpc/if_sq.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/if_sq.c 2011/02/20 07:59:50 1.41
+++ src/sys/arch/sgimips/hpc/if_sq.c 2011/07/01 18:53:47 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_sq.c,v 1.41 2011/02/20 07:59:50 matt Exp $ */ 1/* $NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Rafal K. Boni 4 * Copyright (c) 2001 Rafal K. Boni
5 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. 5 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Portions of this code are derived from software contributed to The 8 * Portions of this code are derived from software contributed to The
9 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace 9 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace
10 * Simulation Facility, NASA Ames Research Center. 10 * Simulation Facility, NASA Ames Research Center.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -23,53 +23,53 @@ @@ -23,53 +23,53 @@
23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.41 2011/02/20 07:59:50 matt Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $");
37 37
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/systm.h> 40#include <sys/systm.h>
41#include <sys/device.h> 41#include <sys/device.h>
42#include <sys/callout.h> 42#include <sys/callout.h>
43#include <sys/mbuf.h> 43#include <sys/mbuf.h>
44#include <sys/malloc.h> 44#include <sys/malloc.h>
45#include <sys/kernel.h> 45#include <sys/kernel.h>
46#include <sys/socket.h> 46#include <sys/socket.h>
47#include <sys/ioctl.h> 47#include <sys/ioctl.h>
48#include <sys/errno.h> 48#include <sys/errno.h>
49#include <sys/syslog.h> 49#include <sys/syslog.h>
50 50
51#include <uvm/uvm_extern.h> 51#include <uvm/uvm_extern.h>
52 52
53#include <machine/endian.h> 53#include <machine/endian.h>
54 54
55#include <net/if.h> 55#include <net/if.h>
56#include <net/if_dl.h> 56#include <net/if_dl.h>
57#include <net/if_media.h> 57#include <net/if_media.h>
58#include <net/if_ether.h> 58#include <net/if_ether.h>
59 59
60#include <net/bpf.h> 60#include <net/bpf.h>
61 61
62#include <machine/bus.h> 62#include <sys/bus.h>
63#include <machine/intr.h> 63#include <machine/intr.h>
64#include <machine/sysconf.h> 64#include <machine/sysconf.h>
65 65
66#include <dev/ic/seeq8003reg.h> 66#include <dev/ic/seeq8003reg.h>
67 67
68#include <sgimips/hpc/sqvar.h> 68#include <sgimips/hpc/sqvar.h>
69#include <sgimips/hpc/hpcvar.h> 69#include <sgimips/hpc/hpcvar.h>
70#include <sgimips/hpc/hpcreg.h> 70#include <sgimips/hpc/hpcreg.h>
71 71
72#include <dev/arcbios/arcbios.h> 72#include <dev/arcbios/arcbios.h>
73#include <dev/arcbios/arcbiosvar.h> 73#include <dev/arcbios/arcbiosvar.h>
74 74
75#define static 75#define static
cvs diff -r1.5 -r1.6 src/sys/arch/sgimips/hpc/pi1ppcvar.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/pi1ppcvar.h 2011/06/09 02:49:32 1.5
+++ src/sys/arch/sgimips/hpc/pi1ppcvar.h 2011/07/01 18:53:47 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pi1ppcvar.h,v 1.5 2011/06/09 02:49:32 rmind Exp $ */ 1/* $NetBSD: pi1ppcvar.h,v 1.6 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001 Alcove - Nicolas Souchu 4 * Copyright (c) 2001 Alcove - Nicolas Souchu
5 * Copyright (c) 2005 Joe Britt <britt@danger.com> - SGI PI1 version 5 * Copyright (c) 2005 Joe Britt <britt@danger.com> - SGI PI1 version
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -23,27 +23,27 @@ @@ -23,27 +23,27 @@
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 * 28 *
29 * FreeBSD: src/sys/isa/ppcreg.h,v 1.10.2.4 2001/10/02 05:21:45 nsouch Exp 29 * FreeBSD: src/sys/isa/ppcreg.h,v 1.10.2.4 2001/10/02 05:21:45 nsouch Exp
30 * 30 *
31 */ 31 */
32 32
33#ifndef __PI1PPCVAR_H 33#ifndef __PI1PPCVAR_H
34#define __PI1PPCVAR_H 34#define __PI1PPCVAR_H
35 35
36#include <machine/bus.h> 36#include <sys/bus.h>
37#include <machine/types.h> 37#include <machine/types.h>
38#include <sys/device.h> 38#include <sys/device.h>
39#include <sys/callout.h> 39#include <sys/callout.h>
40 40
41#include <dev/ppbus/ppbus_conf.h> 41#include <dev/ppbus/ppbus_conf.h>
42 42
43/* Maximum time to wait for device response */ 43/* Maximum time to wait for device response */
44#define MAXBUSYWAIT (5 * (hz)) 44#define MAXBUSYWAIT (5 * (hz))
45 45
46/* Poll interval when wating for device to become ready */ 46/* Poll interval when wating for device to become ready */
47#define PI1PPC_POLL ((hz)/10) 47#define PI1PPC_POLL ((hz)/10)
48 48
49/* Diagnostic and verbose printing macros */ 49/* Diagnostic and verbose printing macros */
cvs diff -r1.31 -r1.32 src/sys/arch/sgimips/hpc/wdsc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/wdsc.c 2011/01/25 12:30:32 1.31
+++ src/sys/arch/sgimips/hpc/wdsc.c 2011/07/01 18:53:47 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wdsc.c,v 1.31 2011/01/25 12:30:32 tsutsui Exp $ */ 1/* $NetBSD: wdsc.c,v 1.32 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Wayne Knowles 4 * Copyright (c) 2001 Wayne Knowles
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Wayne Knowles 8 * by Wayne Knowles
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -27,40 +27,40 @@ @@ -27,40 +27,40 @@
27 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 27 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
28 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 28 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 * POSSIBILITY OF SUCH DAMAGE. 36 * POSSIBILITY OF SUCH DAMAGE.
37 */ 37 */
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.31 2011/01/25 12:30:32 tsutsui Exp $"); 40__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.32 2011/07/01 18:53:47 dyoung Exp $");
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/kernel.h> 44#include <sys/kernel.h>
45#include <sys/device.h> 45#include <sys/device.h>
46#include <sys/buf.h> 46#include <sys/buf.h>
47 47
48#include <dev/scsipi/scsi_all.h> 48#include <dev/scsipi/scsi_all.h>
49#include <dev/scsipi/scsipi_all.h> 49#include <dev/scsipi/scsipi_all.h>
50#include <dev/scsipi/scsiconf.h> 50#include <dev/scsipi/scsiconf.h>
51 51
52#include <machine/cpu.h> 52#include <machine/cpu.h>
53#include <machine/bus.h> 53#include <sys/bus.h>
54#include <machine/autoconf.h> 54#include <machine/autoconf.h>
55#include <machine/machtype.h> 55#include <machine/machtype.h>
56#include <machine/sysconf.h> 56#include <machine/sysconf.h>
57 57
58#include <sgimips/hpc/hpcvar.h> 58#include <sgimips/hpc/hpcvar.h>
59#include <sgimips/hpc/hpcreg.h> 59#include <sgimips/hpc/hpcreg.h>
60#include <sgimips/hpc/hpcdma.h> 60#include <sgimips/hpc/hpcdma.h>
61 61
62#include <dev/ic/wd33c93reg.h> 62#include <dev/ic/wd33c93reg.h>
63#include <dev/ic/wd33c93var.h> 63#include <dev/ic/wd33c93var.h>
64 64
65#include <opt_kgdb.h> 65#include <opt_kgdb.h>
66#include <sys/kgdb.h> 66#include <sys/kgdb.h>
cvs diff -r1.8 -r1.9 src/sys/arch/sgimips/ioc/ioc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/ioc/ioc.c 2009/03/03 19:45:55 1.8
+++ src/sys/arch/sgimips/ioc/ioc.c 2011/07/01 18:53:47 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ioc.c,v 1.8 2009/03/03 19:45:55 macallan Exp $ */ 1/* $NetBSD: ioc.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Christopher Sekiya 4 * Copyright (c) 2003 Christopher Sekiya
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -27,42 +27,42 @@ @@ -27,42 +27,42 @@
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35/* 35/*
36 * ip20/22/24 I/O Controller (IOC) 36 * ip20/22/24 I/O Controller (IOC)
37 */ 37 */
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.8 2009/03/03 19:45:55 macallan Exp $"); 40__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $");
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/device.h> 44#include <sys/device.h>
45#include <sys/callout.h> 45#include <sys/callout.h>
46#include <sys/malloc.h> 46#include <sys/malloc.h>
47#include <sys/kernel.h> 47#include <sys/kernel.h>
48#include <sys/socket.h> 48#include <sys/socket.h>
49#include <sys/ioctl.h> 49#include <sys/ioctl.h>
50#include <sys/errno.h> 50#include <sys/errno.h>
51#include <sys/syslog.h> 51#include <sys/syslog.h>
52 52
53#include <uvm/uvm_extern.h> 53#include <uvm/uvm_extern.h>
54 54
55#include <machine/bus.h> 55#include <sys/bus.h>
56#include <machine/cpu.h> 56#include <machine/cpu.h>
57#include <machine/locore.h> 57#include <machine/locore.h>
58#include <machine/autoconf.h> 58#include <machine/autoconf.h>
59#include <machine/machtype.h> 59#include <machine/machtype.h>
60 60
61#include <sgimips/ioc/iocreg.h> 61#include <sgimips/ioc/iocreg.h>
62#include <sgimips/ioc/iocvar.h> 62#include <sgimips/ioc/iocvar.h>
63 63
64#include "locators.h" 64#include "locators.h"
65 65
66struct ioc_softc { 66struct ioc_softc {
67 struct device sc_dev; 67 struct device sc_dev;
68 68
cvs diff -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oioc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/ioc/oioc.c 2009/02/10 06:04:56 1.1
+++ src/sys/arch/sgimips/ioc/oioc.c 2011/07/01 18:53:47 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: oioc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $ */ 1/* $NetBSD: oioc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Stephen M. Rumble 4 * Copyright (c) 2009 Stephen M. Rumble
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. The name of the author may not be used to endorse or promote products 12 * 2. The name of the author may not be used to endorse or promote products
13 * derived from this software without specific prior written permission. 13 * derived from this software without specific prior written permission.
14 * 14 *
@@ -27,36 +27,36 @@ @@ -27,36 +27,36 @@
27/* 27/*
28 * IOC1/IOC2 chips on IP4 and IP6/IP10 machines. This interfaces the SCSI 28 * IOC1/IOC2 chips on IP4 and IP6/IP10 machines. This interfaces the SCSI
29 * and Ethernet controllers, performs DMA for the former, and does address 29 * and Ethernet controllers, performs DMA for the former, and does address
30 * space translation for the latter (maps the lance memory space to physical 30 * space translation for the latter (maps the lance memory space to physical
31 * pages). 31 * pages).
32 * 32 *
33 * 'I/O Controller' is a sufficiently generic name that SGI created another 33 * 'I/O Controller' is a sufficiently generic name that SGI created another
34 * one for IP24, which basically stuffed a bunch of miscellany on an ASIC. 34 * one for IP24, which basically stuffed a bunch of miscellany on an ASIC.
35 * So, we'll call ourselves 'Old IOC' and hope that there wasn't an even older 35 * So, we'll call ourselves 'Old IOC' and hope that there wasn't an even older
36 * one. 36 * one.
37 */ 37 */
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $"); 40__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $");
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/device.h> 43#include <sys/device.h>
44 44
45#define _SGIMIPS_BUS_DMA_PRIVATE 45#define _SGIMIPS_BUS_DMA_PRIVATE
46#include <machine/cpu.h> 46#include <machine/cpu.h>
47#include <machine/locore.h> 47#include <machine/locore.h>
48#include <machine/autoconf.h> 48#include <machine/autoconf.h>
49#include <machine/bus.h> 49#include <sys/bus.h>
50#include <machine/machtype.h> 50#include <machine/machtype.h>
51#include <machine/sysconf.h> 51#include <machine/sysconf.h>
52 52
53#include <sgimips/ioc/oiocreg.h> 53#include <sgimips/ioc/oiocreg.h>
54#include <sgimips/ioc/oiocvar.h> 54#include <sgimips/ioc/oiocvar.h>
55 55
56#include "locators.h" 56#include "locators.h"
57 57
58struct oioc_softc { 58struct oioc_softc {
59 struct device sc_dev; 59 struct device sc_dev;
60 60
61 int sc_burst_dma; 61 int sc_burst_dma;
62 62
cvs diff -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oiocsc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/ioc/oiocsc.c 2009/02/10 06:04:56 1.1
+++ src/sys/arch/sgimips/ioc/oiocsc.c 2011/07/01 18:53:47 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: oiocsc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $ */ 1/* $NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Stephen M. Rumble 4 * Copyright (c) 2009 Stephen M. Rumble
5 * Copyright (c) 2001 Wayne Knowles 5 * Copyright (c) 2001 Wayne Knowles
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to The NetBSD Foundation 8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Wayne Knowles 9 * by Wayne Knowles
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -28,40 +28,40 @@ @@ -28,40 +28,40 @@
28 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 28 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
29 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 29 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
30 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 30 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
31 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 31 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 32 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
33 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 33 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
34 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 34 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
35 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 35 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
36 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 36 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
37 * POSSIBILITY OF SUCH DAMAGE. 37 * POSSIBILITY OF SUCH DAMAGE.
38 */ 38 */
39 39
40#include <sys/cdefs.h> 40#include <sys/cdefs.h>
41__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $"); 41__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $");
42 42
43#include <sys/param.h> 43#include <sys/param.h>
44#include <sys/systm.h> 44#include <sys/systm.h>
45#include <sys/kernel.h> 45#include <sys/kernel.h>
46#include <sys/device.h> 46#include <sys/device.h>
47#include <sys/buf.h> 47#include <sys/buf.h>
48 48
49#include <dev/scsipi/scsi_all.h> 49#include <dev/scsipi/scsi_all.h>
50#include <dev/scsipi/scsipi_all.h> 50#include <dev/scsipi/scsipi_all.h>
51#include <dev/scsipi/scsiconf.h> 51#include <dev/scsipi/scsiconf.h>
52 52
53#include <machine/cpu.h> 53#include <machine/cpu.h>
54#include <machine/bus.h> 54#include <sys/bus.h>
55#include <machine/autoconf.h> 55#include <machine/autoconf.h>
56#include <machine/machtype.h> 56#include <machine/machtype.h>
57#include <machine/sysconf.h> 57#include <machine/sysconf.h>
58 58
59#include <sgimips/ioc/oiocreg.h> 59#include <sgimips/ioc/oiocreg.h>
60#include <sgimips/ioc/oiocvar.h> 60#include <sgimips/ioc/oiocvar.h>
61 61
62#include <dev/ic/wd33c93reg.h> 62#include <dev/ic/wd33c93reg.h>
63#include <dev/ic/wd33c93var.h> 63#include <dev/ic/wd33c93var.h>
64 64
65#include <opt_kgdb.h> 65#include <opt_kgdb.h>
66#include <sys/kgdb.h> 66#include <sys/kgdb.h>
67 67
cvs diff -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oiocvar.h (expand / switch to unified diff)

--- src/sys/arch/sgimips/ioc/oiocvar.h 2009/02/10 06:04:56 1.1
+++ src/sys/arch/sgimips/ioc/oiocvar.h 2011/07/01 18:53:47 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: oiocvar.h,v 1.1 2009/02/10 06:04:56 rumble Exp $ */ 1/* $NetBSD: oiocvar.h,v 1.2 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Stephen M. Rumble 4 * Copyright (c) 2009 Stephen M. Rumble
5 * Copyright (c) 2001 Wayne Knowles 5 * Copyright (c) 2001 Wayne Knowles
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to The NetBSD Foundation 8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Wayne Knowles 9 * by Wayne Knowles
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -30,25 +30,25 @@ @@ -30,25 +30,25 @@
30 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 30 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
31 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 31 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 32 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
33 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 33 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
34 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 34 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
35 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 35 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
36 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 36 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
37 * POSSIBILITY OF SUCH DAMAGE. 37 * POSSIBILITY OF SUCH DAMAGE.
38 */ 38 */
39 39
40#ifndef _ARCH_SGIMIPS_DEV_OIOCVAR_H_ 40#ifndef _ARCH_SGIMIPS_DEV_OIOCVAR_H_
41#define _ARCH_SGIMIPS_DEV_OIOCVAR_H_ 41#define _ARCH_SGIMIPS_DEV_OIOCVAR_H_
42 42
43#include <machine/bus.h> 43#include <sys/bus.h>
44 44
45struct oioc_attach_args { 45struct oioc_attach_args {
46 const char *oa_name; /* name of device */ 46 const char *oa_name; /* name of device */
47 int oa_irq; /* interrupt line */ 47 int oa_irq; /* interrupt line */
48 int oa_burst_dma; /* burst dma capable */ 48 int oa_burst_dma; /* burst dma capable */
49 bus_space_tag_t oa_st; /* IOC space tag */ 49 bus_space_tag_t oa_st; /* IOC space tag */
50 bus_space_handle_t oa_sh; /* IOC space handle */ 50 bus_space_handle_t oa_sh; /* IOC space handle */
51 bus_dma_tag_t oa_dmat; /* IOC DMA tag */ 51 bus_dma_tag_t oa_dmat; /* IOC DMA tag */
52}; 52};
53 53
54#endif /* _ARCH_SGIMIPS_DEV_OIOCVAR_H_ */ 54#endif /* _ARCH_SGIMIPS_DEV_OIOCVAR_H_ */
cvs diff -r1.8 -r1.9 src/sys/arch/sgimips/mace/com_mace.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/com_mace.c 2009/11/21 17:40:28 1.8
+++ src/sys/arch/sgimips/mace/com_mace.c 2011/07/01 18:53:47 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: com_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $ */ 1/* $NetBSD: com_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Soren S. Jorvang 4 * Copyright (c) 2000 Soren S. Jorvang
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -23,45 +23,45 @@ @@ -23,45 +23,45 @@
23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: com_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: com_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $");
37 37
38#include <sys/param.h> 38#include <sys/param.h>
39#include <sys/systm.h> 39#include <sys/systm.h>
40#include <sys/ioctl.h> 40#include <sys/ioctl.h>
41#include <sys/select.h> 41#include <sys/select.h>
42#include <sys/tty.h> 42#include <sys/tty.h>
43#include <sys/proc.h> 43#include <sys/proc.h>
44#include <sys/file.h> 44#include <sys/file.h>
45#include <sys/uio.h> 45#include <sys/uio.h>
46#include <sys/kernel.h> 46#include <sys/kernel.h>
47#include <sys/syslog.h> 47#include <sys/syslog.h>
48#include <sys/types.h> 48#include <sys/types.h>
49#include <sys/device.h> 49#include <sys/device.h>
50 50
51#include <machine/cpu.h> 51#include <machine/cpu.h>
52#include <machine/locore.h> 52#include <machine/locore.h>
53#include <machine/autoconf.h> 53#include <machine/autoconf.h>
54#include <machine/bus.h> 54#include <sys/bus.h>
55#include <machine/machtype.h> 55#include <machine/machtype.h>
56 56
57#include <sgimips/mace/macevar.h> 57#include <sgimips/mace/macevar.h>
58 58
59#include <dev/arcbios/arcbios.h> 59#include <dev/arcbios/arcbios.h>
60#include <dev/arcbios/arcbiosvar.h> 60#include <dev/arcbios/arcbiosvar.h>
61 61
62#include <dev/ic/comreg.h> 62#include <dev/ic/comreg.h>
63#include <dev/ic/comvar.h> 63#include <dev/ic/comvar.h>
64 64
65struct com_mace_softc { 65struct com_mace_softc {
66 struct com_softc sc_com; 66 struct com_softc sc_com;
67 67
cvs diff -r1.8 -r1.9 src/sys/arch/sgimips/mace/lpt_mace.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/lpt_mace.c 2009/11/21 17:40:28 1.8
+++ src/sys/arch/sgimips/mace/lpt_mace.c 2011/07/01 18:53:47 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: lpt_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $ */ 1/* $NetBSD: lpt_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Christopher SEKIYA  4 * Copyright (c) 2003 Christopher SEKIYA
5 * Copyright (c) 2000 Soren S. Jorvang 5 * Copyright (c) 2000 Soren S. Jorvang
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -24,45 +24,45 @@ @@ -24,45 +24,45 @@
24 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 24 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 27 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: lpt_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: lpt_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/systm.h> 40#include <sys/systm.h>
41#include <sys/ioctl.h> 41#include <sys/ioctl.h>
42#include <sys/select.h> 42#include <sys/select.h>
43#include <sys/tty.h> 43#include <sys/tty.h>
44#include <sys/proc.h> 44#include <sys/proc.h>
45#include <sys/file.h> 45#include <sys/file.h>
46#include <sys/uio.h> 46#include <sys/uio.h>
47#include <sys/kernel.h> 47#include <sys/kernel.h>
48#include <sys/syslog.h> 48#include <sys/syslog.h>
49#include <sys/types.h> 49#include <sys/types.h>
50#include <sys/device.h> 50#include <sys/device.h>
51 51
52#include <machine/cpu.h> 52#include <machine/cpu.h>
53#include <machine/locore.h> 53#include <machine/locore.h>
54#include <machine/autoconf.h> 54#include <machine/autoconf.h>
55#include <machine/bus.h> 55#include <sys/bus.h>
56#include <machine/machtype.h> 56#include <machine/machtype.h>
57 57
58#include <sgimips/mace/macevar.h> 58#include <sgimips/mace/macevar.h>
59 59
60#include <dev/ic/lptreg.h> 60#include <dev/ic/lptreg.h>
61#include <dev/ic/lptvar.h> 61#include <dev/ic/lptvar.h>
62 62
63struct lpt_mace_softc { 63struct lpt_mace_softc {
64 struct lpt_softc sc_lpt; 64 struct lpt_softc sc_lpt;
65 65
66 /* XXX intr cookie */ 66 /* XXX intr cookie */
67}; 67};
68 68
cvs diff -r1.45 -r1.46 src/sys/arch/sgimips/mace/if_mec.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/if_mec.c 2011/02/20 07:59:51 1.45
+++ src/sys/arch/sgimips/mace/if_mec.c 2011/07/01 18:53:47 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_mec.c,v 1.45 2011/02/20 07:59:51 matt Exp $ */ 1/* $NetBSD: if_mec.c,v 1.46 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2004, 2008 Izumi Tsutsui. All rights reserved. 4 * Copyright (c) 2004, 2008 Izumi Tsutsui. 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 *
@@ -51,27 +51,27 @@ @@ -51,27 +51,27 @@
51 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 51 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
52 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 52 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
53 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 53 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
54 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 54 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
55 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 55 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
56 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 56 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
57 */ 57 */
58 58
59/* 59/*
60 * MACE MAC-110 Ethernet driver 60 * MACE MAC-110 Ethernet driver
61 */ 61 */
62 62
63#include <sys/cdefs.h> 63#include <sys/cdefs.h>
64__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.45 2011/02/20 07:59:51 matt Exp $"); 64__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.46 2011/07/01 18:53:47 dyoung Exp $");
65 65
66#include "opt_ddb.h" 66#include "opt_ddb.h"
67#include "rnd.h" 67#include "rnd.h"
68 68
69#include <sys/param.h> 69#include <sys/param.h>
70#include <sys/systm.h> 70#include <sys/systm.h>
71#include <sys/device.h> 71#include <sys/device.h>
72#include <sys/callout.h> 72#include <sys/callout.h>
73#include <sys/mbuf.h> 73#include <sys/mbuf.h>
74#include <sys/malloc.h> 74#include <sys/malloc.h>
75#include <sys/kernel.h> 75#include <sys/kernel.h>
76#include <sys/socket.h> 76#include <sys/socket.h>
77#include <sys/ioctl.h> 77#include <sys/ioctl.h>
@@ -84,27 +84,27 @@ __KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1 @@ -84,27 +84,27 @@ __KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1
84#include <net/if.h> 84#include <net/if.h>
85#include <net/if_dl.h> 85#include <net/if_dl.h>
86#include <net/if_media.h> 86#include <net/if_media.h>
87#include <net/if_ether.h> 87#include <net/if_ether.h>
88 88
89#include <netinet/in.h> 89#include <netinet/in.h>
90#include <netinet/in_systm.h> 90#include <netinet/in_systm.h>
91#include <netinet/ip.h> 91#include <netinet/ip.h>
92#include <netinet/tcp.h> 92#include <netinet/tcp.h>
93#include <netinet/udp.h> 93#include <netinet/udp.h>
94 94
95#include <net/bpf.h> 95#include <net/bpf.h>
96 96
97#include <machine/bus.h> 97#include <sys/bus.h>
98#include <machine/intr.h> 98#include <machine/intr.h>
99#include <machine/machtype.h> 99#include <machine/machtype.h>
100 100
101#include <dev/mii/mii.h> 101#include <dev/mii/mii.h>
102#include <dev/mii/miivar.h> 102#include <dev/mii/miivar.h>
103 103
104#include <sgimips/mace/macevar.h> 104#include <sgimips/mace/macevar.h>
105#include <sgimips/mace/if_mecreg.h> 105#include <sgimips/mace/if_mecreg.h>
106 106
107#include <dev/arcbios/arcbios.h> 107#include <dev/arcbios/arcbios.h>
108#include <dev/arcbios/arcbiosvar.h> 108#include <dev/arcbios/arcbiosvar.h>
109 109
110/* #define MEC_DEBUG */ 110/* #define MEC_DEBUG */
cvs diff -r1.16 -r1.17 src/sys/arch/sgimips/mace/mace.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/mace.c 2009/12/14 00:46:13 1.16
+++ src/sys/arch/sgimips/mace/mace.c 2011/07/01 18:53:47 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mace.c,v 1.16 2009/12/14 00:46:13 matt Exp $ */ 1/* $NetBSD: mace.c,v 1.17 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Christopher Sekiya 4 * Copyright (c) 2003 Christopher Sekiya
5 * Copyright (c) 2002,2003 Rafal K. Boni 5 * Copyright (c) 2002,2003 Rafal K. Boni
6 * Copyright (c) 2000 Soren S. Jorvang 6 * Copyright (c) 2000 Soren S. Jorvang
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -35,44 +35,44 @@ @@ -35,44 +35,44 @@
35 */ 35 */
36 36
37/* 37/*
38 * O2 MACE 38 * O2 MACE
39 * 39 *
40 * The MACE is weird -- although it is a 32-bit device, writes only seem to 40 * The MACE is weird -- although it is a 32-bit device, writes only seem to
41 * work properly if they are 64-bit-at-once writes (at least, out in ISA 41 * work properly if they are 64-bit-at-once writes (at least, out in ISA
42 * space and probably MEC space -- the PCI stuff seems to be okay with _4). 42 * space and probably MEC space -- the PCI stuff seems to be okay with _4).
43 * Therefore, the _8* routines are used even though the top 32 bits are 43 * Therefore, the _8* routines are used even though the top 32 bits are
44 * thrown away. 44 * thrown away.
45 */ 45 */
46 46
47#include <sys/cdefs.h> 47#include <sys/cdefs.h>
48__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.16 2009/12/14 00:46:13 matt Exp $"); 48__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.17 2011/07/01 18:53:47 dyoung Exp $");
49 49
50#include <sys/param.h> 50#include <sys/param.h>
51#include <sys/systm.h> 51#include <sys/systm.h>
52#include <sys/device.h> 52#include <sys/device.h>
53#include <sys/callout.h> 53#include <sys/callout.h>
54#include <sys/mbuf.h> 54#include <sys/mbuf.h>
55#include <sys/malloc.h> 55#include <sys/malloc.h>
56#include <sys/kernel.h> 56#include <sys/kernel.h>
57#include <sys/socket.h> 57#include <sys/socket.h>
58#include <sys/ioctl.h> 58#include <sys/ioctl.h>
59#include <sys/errno.h> 59#include <sys/errno.h>
60#include <sys/syslog.h> 60#include <sys/syslog.h>
61 61
62#include <uvm/uvm_extern.h> 62#include <uvm/uvm_extern.h>
63 63
64#define _SGIMIPS_BUS_DMA_PRIVATE 64#define _SGIMIPS_BUS_DMA_PRIVATE
65#include <machine/bus.h> 65#include <sys/bus.h>
66#include <machine/cpu.h> 66#include <machine/cpu.h>
67#include <machine/locore.h> 67#include <machine/locore.h>
68#include <machine/autoconf.h> 68#include <machine/autoconf.h>
69#include <machine/machtype.h> 69#include <machine/machtype.h>
70 70
71#include <sgimips/mace/macevar.h> 71#include <sgimips/mace/macevar.h>
72#include <sgimips/mace/macereg.h> 72#include <sgimips/mace/macereg.h>
73#include <sgimips/dev/crimevar.h> 73#include <sgimips/dev/crimevar.h>
74#include <sgimips/dev/crimereg.h> 74#include <sgimips/dev/crimereg.h>
75 75
76#include "locators.h" 76#include "locators.h"
77 77
78#define MACE_NINTR 32 /* actually only 8, but interrupts are shared */ 78#define MACE_NINTR 32 /* actually only 8, but interrupts are shared */
cvs diff -r1.5 -r1.6 src/sys/arch/sgimips/mace/macekbc.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/macekbc.c 2011/02/20 07:59:51 1.5
+++ src/sys/arch/sgimips/mace/macekbc.c 2011/07/01 18:53:47 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: macekbc.c,v 1.5 2011/02/20 07:59:51 matt Exp $ */ 1/* $NetBSD: macekbc.c,v 1.6 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -21,34 +21,34 @@ @@ -21,34 +21,34 @@
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26 * POSSIBILITY OF SUCH DAMAGE. 26 * POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29/* 29/*
30 * SGI MACE PS2 keyboard/mouse controller driver 30 * SGI MACE PS2 keyboard/mouse controller driver
31 */ 31 */
32 32
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: macekbc.c,v 1.5 2011/02/20 07:59:51 matt Exp $"); 34__KERNEL_RCSID(0, "$NetBSD: macekbc.c,v 1.6 2011/07/01 18:53:47 dyoung Exp $");
35 35
36#include <sys/param.h> 36#include <sys/param.h>
37#include <sys/device.h> 37#include <sys/device.h>
38#include <sys/syslog.h> 38#include <sys/syslog.h>
39#include <sys/malloc.h> 39#include <sys/malloc.h>
40 40
41#include <machine/bus.h> 41#include <sys/bus.h>
42#include <machine/intr.h> 42#include <machine/intr.h>
43 43
44#include <sgimips/mace/macevar.h> 44#include <sgimips/mace/macevar.h>
45 45
46#include <dev/arcbios/arcbios.h> 46#include <dev/arcbios/arcbios.h>
47#include <dev/arcbios/arcbiosvar.h> 47#include <dev/arcbios/arcbiosvar.h>
48#include <dev/pckbport/pckbportvar.h> 48#include <dev/pckbport/pckbportvar.h>
49 49
50#define MACEKBC_TX 0x00 50#define MACEKBC_TX 0x00
51#define MACEKBC_RX 0x08 51#define MACEKBC_RX 0x08
52#define MACEKBC_CTRL 0x10 52#define MACEKBC_CTRL 0x10
53#define MACEKBC_CTRL_TXCLKOFF (1 << 0) 53#define MACEKBC_CTRL_TXCLKOFF (1 << 0)
54#define MACEKBC_CTRL_TXON (1 << 1) 54#define MACEKBC_CTRL_TXON (1 << 1)
cvs diff -r1.6 -r1.7 src/sys/arch/sgimips/mace/mavb.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/mavb.c 2008/08/23 17:43:36 1.6
+++ src/sys/arch/sgimips/mace/mavb.c 2011/07/01 18:53:47 1.7
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1/* $NetBSD: mavb.c,v 1.6 2008/08/23 17:43:36 tsutsui Exp $ */ 1/* $NetBSD: mavb.c,v 1.7 2011/07/01 18:53:47 dyoung Exp $ */
2/* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */ 2/* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2005 Mark Kettenis 5 * Copyright (c) 2005 Mark Kettenis
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20#include <sys/param.h> 20#include <sys/param.h>
21#include <sys/systm.h> 21#include <sys/systm.h>
22#include <sys/device.h> 22#include <sys/device.h>
23#include <sys/kernel.h> 23#include <sys/kernel.h>
24#include <sys/malloc.h> 24#include <sys/malloc.h>
25#include <sys/callout.h> 25#include <sys/callout.h>
26 26
27#include <machine/bus.h> 27#include <sys/bus.h>
28#include <machine/intr.h> 28#include <machine/intr.h>
29#include <machine/autoconf.h> 29#include <machine/autoconf.h>
30 30
31#include <sys/audioio.h> 31#include <sys/audioio.h>
32#include <dev/auconv.h> 32#include <dev/auconv.h>
33#include <dev/audio_if.h> 33#include <dev/audio_if.h>
34 34
35#include <arch/sgimips/mace/macevar.h> 35#include <arch/sgimips/mace/macevar.h>
36#include <arch/sgimips/mace/macereg.h> 36#include <arch/sgimips/mace/macereg.h>
37#include <arch/sgimips/mace/mavbreg.h> 37#include <arch/sgimips/mace/mavbreg.h>
38 38
39#include <dev/ic/ad1843reg.h> 39#include <dev/ic/ad1843reg.h>
40 40
cvs diff -r1.13 -r1.14 src/sys/arch/sgimips/mace/mcclock_mace.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/mcclock_mace.c 2009/12/13 11:10:50 1.13
+++ src/sys/arch/sgimips/mace/mcclock_mace.c 2011/07/01 18:53:47 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mcclock_mace.c,v 1.13 2009/12/13 11:10:50 tsutsui Exp $ */ 1/* $NetBSD: mcclock_mace.c,v 1.14 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2001 Antti Kantee. 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 * 3. The name of the company nor the name of the author may be used to 14 * 3. The name of the company nor the name of the author may be used to
@@ -55,35 +55,35 @@ @@ -55,35 +55,35 @@
55 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 55 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
56 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 56 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
57 * DISCLAIMED. IN NO EVENT SHALL CAUSALITY LIMITED OR CONTRIBUTORS BE LIABLE 57 * DISCLAIMED. IN NO EVENT SHALL CAUSALITY LIMITED OR CONTRIBUTORS BE LIABLE
58 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 58 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
59 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 59 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
60 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 60 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
61 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 61 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
62 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 62 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
63 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 63 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
64 * SUCH DAMAGE. 64 * SUCH DAMAGE.
65 */ 65 */
66 66
67#include <sys/cdefs.h> 67#include <sys/cdefs.h>
68__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.13 2009/12/13 11:10:50 tsutsui Exp $"); 68__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.14 2011/07/01 18:53:47 dyoung Exp $");
69 69
70#include <sys/param.h> 70#include <sys/param.h>
71#include <sys/systm.h> 71#include <sys/systm.h>
72#include <sys/device.h> 72#include <sys/device.h>
73 73
74#include <machine/cpu.h> 74#include <machine/cpu.h>
75#include <machine/autoconf.h> 75#include <machine/autoconf.h>
76#include <machine/bus.h> 76#include <sys/bus.h>
77#include <machine/machtype.h> 77#include <machine/machtype.h>
78 78
79#include <dev/clock_subr.h> 79#include <dev/clock_subr.h>
80#include <dev/ic/ds1687reg.h> 80#include <dev/ic/ds1687reg.h>
81 81
82#include <sgimips/mace/macevar.h> 82#include <sgimips/mace/macevar.h>
83 83
84#include <sgimips/sgimips/clockvar.h> 84#include <sgimips/sgimips/clockvar.h>
85 85
86struct mcclock_mace_softc { 86struct mcclock_mace_softc {
87 device_t sc_dev; 87 device_t sc_dev;
88 88
89 struct todr_chip_handle sc_todrch; 89 struct todr_chip_handle sc_todrch;
cvs diff -r1.12 -r1.13 src/sys/arch/sgimips/mace/pci_mace.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/mace/pci_mace.c 2011/05/17 17:34:52 1.12
+++ src/sys/arch/sgimips/mace/pci_mace.c 2011/07/01 18:53:47 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pci_mace.c,v 1.12 2011/05/17 17:34:52 dyoung Exp $ */ 1/* $NetBSD: pci_mace.c,v 1.13 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001,2003 Christopher Sekiya 4 * Copyright (c) 2001,2003 Christopher Sekiya
5 * Copyright (c) 2000 Soren S. Jorvang 5 * Copyright (c) 2000 Soren S. Jorvang
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -24,40 +24,40 @@ @@ -24,40 +24,40 @@
24 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 24 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 27 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 28 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.12 2011/05/17 17:34:52 dyoung Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.13 2011/07/01 18:53:47 dyoung Exp $");
38 38
39#include "opt_pci.h" 39#include "opt_pci.h"
40#include "pci.h" 40#include "pci.h"
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/device.h> 43#include <sys/device.h>
44#include <sys/systm.h> 44#include <sys/systm.h>
45 45
46#include <machine/cpu.h> 46#include <machine/cpu.h>
47#include <machine/locore.h> 47#include <machine/locore.h>
48#include <machine/autoconf.h> 48#include <machine/autoconf.h>
49#include <machine/vmparam.h> 49#include <machine/vmparam.h>
50#include <machine/bus.h> 50#include <sys/bus.h>
51#include <machine/machtype.h> 51#include <machine/machtype.h>
52 52
53#include <mips/cache.h> 53#include <mips/cache.h>
54 54
55#include <dev/pci/pcivar.h> 55#include <dev/pci/pcivar.h>
56#include <dev/pci/pcireg.h> 56#include <dev/pci/pcireg.h>
57#include <dev/pci/pcidevs.h> 57#include <dev/pci/pcidevs.h>
58 58
59#include <sys/extent.h> 59#include <sys/extent.h>
60#include <sys/malloc.h> 60#include <sys/malloc.h>
61#include <dev/pci/pciconf.h> 61#include <dev/pci/pciconf.h>
62 62
63#include <sgimips/mace/macereg.h> 63#include <sgimips/mace/macereg.h>
cvs diff -r1.21 -r1.22 src/sys/arch/sgimips/pci/pci_machdep.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/pci/pci_machdep.c 2011/05/11 17:49:31 1.21
+++ src/sys/arch/sgimips/pci/pci_machdep.c 2011/07/01 18:53:47 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pci_machdep.c,v 1.21 2011/05/11 17:49:31 dyoung Exp $ */ 1/* $NetBSD: pci_machdep.c,v 1.22 2011/07/01 18:53:47 dyoung Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Soren S. Jorvang 4 * Copyright (c) 2000 Soren S. Jorvang
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -23,42 +23,42 @@ @@ -23,42 +23,42 @@
23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.21 2011/05/11 17:49:31 dyoung Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.22 2011/07/01 18:53:47 dyoung Exp $");
37 37
38#include "opt_pci.h" 38#include "opt_pci.h"
39#include "pci.h" 39#include "pci.h"
40 40
41#include <sys/types.h> 41#include <sys/types.h>
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/time.h> 43#include <sys/time.h>
44#include <sys/systm.h> 44#include <sys/systm.h>
45#include <sys/errno.h> 45#include <sys/errno.h>
46#include <sys/device.h> 46#include <sys/device.h>
47 47
48#include <uvm/uvm_extern.h> 48#include <uvm/uvm_extern.h>
49 49
50#define _SGIMIPS_BUS_DMA_PRIVATE 50#define _SGIMIPS_BUS_DMA_PRIVATE
51#include <machine/bus.h> 51#include <sys/bus.h>
52#include <machine/intr.h> 52#include <machine/intr.h>
53#include <machine/sysconf.h> 53#include <machine/sysconf.h>
54 54
55#include <dev/pci/pcivar.h> 55#include <dev/pci/pcivar.h>
56#include <dev/pci/pcireg.h> 56#include <dev/pci/pcireg.h>
57#include <dev/pci/pcidevs.h> 57#include <dev/pci/pcidevs.h>
58#include <dev/pci/pciconf.h> 58#include <dev/pci/pciconf.h>
59 59
60struct sgimips_bus_dma_tag pci_bus_dma_tag; 60struct sgimips_bus_dma_tag pci_bus_dma_tag;
61 61
62void 62void
63pci_attach_hook(struct device *parent, struct device *self, struct pcibus_attach_args *pba) 63pci_attach_hook(struct device *parent, struct device *self, struct pcibus_attach_args *pba)
64{ 64{