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


(dyoung)
diff -r1.1 -r1.2 src/sys/arch/mips/adm5120/adm5120_cfio.c
diff -r1.4 -r1.5 src/sys/arch/mips/adm5120/adm5120_extio.c
diff -r1.4 -r1.5 src/sys/arch/mips/adm5120/adm5120_intr.c
diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/adm5120_extio_space.c
diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/adm5120_obio.c
diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/adm5120_obio_dma.c
diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_obio_space.c
diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_pciio_space.c
diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_pcimem_space.c
diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/dev/admgpio.c
diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/dev/wdc_extio.c
diff -r1.6 -r1.7 src/sys/arch/mips/adm5120/dev/admpci.c
diff -r1.6 -r1.7 src/sys/arch/mips/adm5120/dev/ahci.c
diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/admwdog.c
diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/if_admswvar.h
diff -r1.8 -r1.9 src/sys/arch/mips/adm5120/dev/if_admsw.c
diff -r1.7 -r1.8 src/sys/arch/mips/adm5120/dev/uart.c
diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/include/adm5120var.h
cvs diff -r1.1 -r1.2 src/sys/arch/mips/adm5120/adm5120_cfio.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_cfio.c 2007/03/20 08:52:04 1.1
+++ src/sys/arch/mips/adm5120/adm5120_cfio.c 2011/07/01 18:38:48 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_cfio.c,v 1.1 2007/03/20 08:52:04 dyoung Exp $ */ 1/* $NetBSD: adm5120_cfio.c,v 1.2 2011/07/01 18:38:48 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 David Young. All rights reserved. 4 * Copyright (c) 2007 David Young. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or 6 * Redistribution and use in source and binary forms, with or
7 * without modification, are permitted provided that the following 7 * without modification, are permitted provided that the following
8 * conditions are met: 8 * conditions 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 11 * 2. Redistributions in binary form must reproduce the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer in the documentation and/or other materials provided 13 * disclaimer in the documentation and/or other materials provided
14 * with the distribution. 14 * with the distribution.
@@ -20,33 +20,33 @@ @@ -20,33 +20,33 @@
20 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 20 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
21 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 21 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
22 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 22 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
24 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 24 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 25 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
26 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
28 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 28 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
29 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 29 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
30 * OF SUCH DAMAGE. 30 * OF SUCH DAMAGE.
31 */ 31 */
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: adm5120_cfio.c,v 1.1 2007/03/20 08:52:04 dyoung Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: adm5120_cfio.c,v 1.2 2011/07/01 18:38:48 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 38
39#include <machine/bus.h> 39#include <sys/bus.h>
40 40
41#include <mips/cache.h> 41#include <mips/cache.h>
42#include <mips/cpuregs.h> 42#include <mips/cpuregs.h>
43 43
44#include <mips/adm5120/include/adm5120reg.h> 44#include <mips/adm5120/include/adm5120reg.h>
45#include <mips/adm5120/include/adm5120var.h> 45#include <mips/adm5120/include/adm5120var.h>
46#include <mips/adm5120/include/adm5120_mainbusvar.h> 46#include <mips/adm5120/include/adm5120_mainbusvar.h>
47#include <mips/adm5120/include/adm5120_extiovar.h> 47#include <mips/adm5120/include/adm5120_extiovar.h>
48 48
49#ifdef CFIO_DEBUG 49#ifdef CFIO_DEBUG
50int cfio_debug = 1; 50int cfio_debug = 1;
51#define CFIO_DPRINTF(__fmt, ...) \ 51#define CFIO_DPRINTF(__fmt, ...) \
52do { \ 52do { \
cvs diff -r1.4 -r1.5 src/sys/arch/mips/adm5120/adm5120_extio.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_extio.c 2011/02/20 07:48:35 1.4
+++ src/sys/arch/mips/adm5120/adm5120_extio.c 2011/07/01 18:38:48 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_extio.c,v 1.4 2011/02/20 07:48:35 matt Exp $ */ 1/* $NetBSD: adm5120_extio.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 David Young. All rights reserved. 4 * Copyright (c) 2007 David Young. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or 6 * Redistribution and use in source and binary forms, with or
7 * without modification, are permitted provided that the following 7 * without modification, are permitted provided that the following
8 * conditions are met: 8 * conditions 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 11 * 2. Redistributions in binary form must reproduce the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer in the documentation and/or other materials provided 13 * disclaimer in the documentation and/or other materials provided
14 * with the distribution. 14 * with the distribution.
@@ -55,33 +55,33 @@ @@ -55,33 +55,33 @@
55 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 55 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
56 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 56 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
57 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC 57 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
58 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 58 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
59 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 59 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
60 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 60 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
61 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 61 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
62 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 62 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
63 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 63 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
64 * POSSIBILITY OF SUCH DAMAGE. 64 * POSSIBILITY OF SUCH DAMAGE.
65 */ 65 */
66 66
67#include <sys/cdefs.h> 67#include <sys/cdefs.h>
68__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.4 2011/02/20 07:48:35 matt Exp $"); 68__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.5 2011/07/01 18:38:48 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/bus.h> 74#include <sys/bus.h>
75 75
76#include <mips/cache.h> 76#include <mips/cache.h>
77#include <mips/cpuregs.h> 77#include <mips/cpuregs.h>
78 78
79#include <mips/adm5120/include/adm5120reg.h> 79#include <mips/adm5120/include/adm5120reg.h>
80#include <mips/adm5120/include/adm5120var.h> 80#include <mips/adm5120/include/adm5120var.h>
81#include <mips/adm5120/include/adm5120_mainbusvar.h> 81#include <mips/adm5120/include/adm5120_mainbusvar.h>
82#include <mips/adm5120/include/adm5120_extiovar.h> 82#include <mips/adm5120/include/adm5120_extiovar.h>
83 83
84#include "locators.h" 84#include "locators.h"
85 85
86#ifdef EXTIO_DEBUG 86#ifdef EXTIO_DEBUG
87int extio_debug = 1; 87int extio_debug = 1;
cvs diff -r1.4 -r1.5 src/sys/arch/mips/adm5120/adm5120_intr.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_intr.c 2011/02/20 07:48:35 1.4
+++ src/sys/arch/mips/adm5120/adm5120_intr.c 2011/07/01 18:38:48 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_intr.c,v 1.4 2011/02/20 07:48:35 matt Exp $ */ 1/* $NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -57,39 +57,39 @@ @@ -57,39 +57,39 @@
57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
59 * POSSIBILITY OF SUCH DAMAGE. 59 * POSSIBILITY OF SUCH DAMAGE.
60 */ 60 */
61 61
62/* 62/*
63 * Platform-specific interrupt support for the Alchemy Semiconductor Pb1000. 63 * Platform-specific interrupt support for the Alchemy Semiconductor Pb1000.
64 * 64 *
65 * The Alchemy Semiconductor Pb1000's interrupts are wired to two internal 65 * The Alchemy Semiconductor Pb1000's interrupts are wired to two internal
66 * interrupt controllers. 66 * interrupt controllers.
67 */ 67 */
68 68
69#include <sys/cdefs.h> 69#include <sys/cdefs.h>
70__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.4 2011/02/20 07:48:35 matt Exp $"); 70__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $");
71 71
72#include "opt_ddb.h" 72#include "opt_ddb.h"
73#define __INTR_PRIVATE 73#define __INTR_PRIVATE
74 74
75#include <sys/param.h> 75#include <sys/param.h>
76#include <sys/queue.h> 76#include <sys/queue.h>
77#include <sys/malloc.h> 77#include <sys/malloc.h>
78#include <sys/systm.h> 78#include <sys/systm.h>
79#include <sys/device.h> 79#include <sys/device.h>
80#include <sys/kernel.h> 80#include <sys/kernel.h>
81 81
82#include <machine/bus.h> 82#include <sys/bus.h>
83#include <machine/intr.h> 83#include <machine/intr.h>
84 84
85#include <mips/locore.h> 85#include <mips/locore.h>
86#include <mips/adm5120/include/adm5120reg.h> 86#include <mips/adm5120/include/adm5120reg.h>
87#include <mips/adm5120/include/adm5120var.h> 87#include <mips/adm5120/include/adm5120var.h>
88 88
89#include <dev/pci/pcireg.h> 89#include <dev/pci/pcireg.h>
90#include <dev/pci/pcivar.h> 90#include <dev/pci/pcivar.h>
91 91
92/* 92/*
93 * This is a mask of bits to clear in the SR when we go to a 93 * This is a mask of bits to clear in the SR when we go to a
94 * given hardware interrupt priority level. 94 * given hardware interrupt priority level.
95 */ 95 */
cvs diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/adm5120_extio_space.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_extio_space.c 2009/10/19 23:19:38 1.3
+++ src/sys/arch/mips/adm5120/adm5120_extio_space.c 2011/07/01 18:38:48 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */ 1/* $NetBSD: adm5120_extio_space.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 David Young. All rights reserved. 4 * Copyright (c) 2007 David Young. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or 6 * Redistribution and use in source and binary forms, with or
7 * without modification, are permitted provided that the following 7 * without modification, are permitted provided that the following
8 * conditions are met: 8 * conditions 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 11 * 2. Redistributions in binary form must reproduce the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer in the documentation and/or other materials provided 13 * disclaimer in the documentation and/or other materials provided
14 * with the distribution. 14 * with the distribution.
@@ -50,31 +50,31 @@ @@ -50,31 +50,31 @@
50 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 50 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
51 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 51 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
52 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 52 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
53 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 53 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 54 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
55 * POSSIBILITY OF SUCH DAMAGE. 55 * POSSIBILITY OF SUCH DAMAGE.
56 */ 56 */
57 57
58/* 58/*
59 * Platform-specific SOC register support for the Infineon ADM5120. 59 * Platform-specific SOC register support for the Infineon ADM5120.
60 */ 60 */
61 61
62#include <sys/cdefs.h> 62#include <sys/cdefs.h>
63__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $"); 63__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $");
64 64
65#include <sys/param.h> 65#include <sys/param.h>
66 66
67#include <machine/bus.h> 67#include <sys/bus.h>
68#include <mips/adm5120/include/adm5120reg.h> 68#include <mips/adm5120/include/adm5120reg.h>
69#include <mips/adm5120/include/adm5120_extiovar.h> 69#include <mips/adm5120/include/adm5120_extiovar.h>
70 70
71#define CHIP extio 71#define CHIP extio
72#define CHIP_MEM /* defined */ 72#define CHIP_MEM /* defined */
73#define CHIP_ACCESS_SIZE 1 73#define CHIP_ACCESS_SIZE 1
74 74
75/* MEM region 1 */ 75/* MEM region 1 */
76#define CHIP_W1_BUS_START(v) ADM5120_BASE_EXTIO0 76#define CHIP_W1_BUS_START(v) ADM5120_BASE_EXTIO0
77#define CHIP_W1_BUS_END(v) ADM5120_BASE_EXTIO1 77#define CHIP_W1_BUS_END(v) ADM5120_BASE_EXTIO1
78#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v) 78#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
79#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v) 79#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
80 80
cvs diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/adm5120_obio.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_obio.c 2011/02/20 07:48:35 1.3
+++ src/sys/arch/mips/adm5120/adm5120_obio.c 2011/07/01 18:38:48 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_obio.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */ 1/* $NetBSD: adm5120_obio.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -56,33 +56,33 @@ @@ -56,33 +56,33 @@
56 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 56 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
57 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 57 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
58 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC 58 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
59 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 59 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
60 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 60 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
61 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 61 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
62 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 62 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
63 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 63 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
64 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 64 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
65 * POSSIBILITY OF SUCH DAMAGE. 65 * POSSIBILITY OF SUCH DAMAGE.
66 */ 66 */
67 67
68#include <sys/cdefs.h> 68#include <sys/cdefs.h>
69__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.3 2011/02/20 07:48:35 matt Exp $"); 69__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $");
70 70
71#include <sys/param.h> 71#include <sys/param.h>
72#include <sys/systm.h> 72#include <sys/systm.h>
73#include <sys/device.h> 73#include <sys/device.h>
74 74
75#include <machine/bus.h> 75#include <sys/bus.h>
76 76
77#include <mips/cache.h> 77#include <mips/cache.h>
78#include <mips/cpuregs.h> 78#include <mips/cpuregs.h>
79 79
80#include <mips/adm5120/include/adm5120reg.h> 80#include <mips/adm5120/include/adm5120reg.h>
81#include <mips/adm5120/include/adm5120var.h> 81#include <mips/adm5120/include/adm5120var.h>
82#include <mips/adm5120/include/adm5120_mainbusvar.h> 82#include <mips/adm5120/include/adm5120_mainbusvar.h>
83#include <mips/adm5120/include/adm5120_obiovar.h> 83#include <mips/adm5120/include/adm5120_obiovar.h>
84 84
85#include "locators.h" 85#include "locators.h"
86 86
87#ifdef OBIO_DEBUG 87#ifdef OBIO_DEBUG
88int obio_debug = 1; 88int obio_debug = 1;
cvs diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/adm5120_obio_dma.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_obio_dma.c 2011/02/20 07:48:35 1.3
+++ src/sys/arch/mips/adm5120/adm5120_obio_dma.c 2011/07/01 18:38:49 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_obio_dma.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */ 1/* $NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -54,32 +54,32 @@ @@ -54,32 +54,32 @@
54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
59 * POSSIBILITY OF SUCH DAMAGE. 59 * POSSIBILITY OF SUCH DAMAGE.
60 */ 60 */
61 61
62/* 62/*
63 * Platform-specific DMA support for the Infineon ADM5120. 63 * Platform-specific DMA support for the Infineon ADM5120.
64 */ 64 */
65 65
66#include <sys/cdefs.h> 66#include <sys/cdefs.h>
67__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.3 2011/02/20 07:48:35 matt Exp $"); 67__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
68 68
69#include <sys/param.h> 69#include <sys/param.h>
70 70
71#define _MIPS_BUS_DMA_PRIVATE 71#define _MIPS_BUS_DMA_PRIVATE
72#include <machine/bus.h> 72#include <sys/bus.h>
73 73
74#include <mips/adm5120/include/adm5120_obiovar.h> 74#include <mips/adm5120/include/adm5120_obiovar.h>
75 75
76void 76void
77obio_dma_init(bus_dma_tag_t t) 77obio_dma_init(bus_dma_tag_t t)
78{ 78{
79 t->_cookie = t; 79 t->_cookie = t;
80 t->_wbase = 0; 80 t->_wbase = 0;
81 t->_bounce_alloc_lo = 0; 81 t->_bounce_alloc_lo = 0;
82 t->_bounce_alloc_hi = MIPS_KSEG1_START - MIPS_KSEG0_START; 82 t->_bounce_alloc_hi = MIPS_KSEG1_START - MIPS_KSEG0_START;
83 t->_dmamap_ops = mips_bus_dmamap_ops; 83 t->_dmamap_ops = mips_bus_dmamap_ops;
84 t->_dmamem_ops = mips_bus_dmamem_ops; 84 t->_dmamem_ops = mips_bus_dmamem_ops;
85 t->_dmatag_ops = mips_bus_dmatag_ops; 85 t->_dmatag_ops = mips_bus_dmatag_ops;
cvs diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_obio_space.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_obio_space.c 2008/04/28 20:23:27 1.2
+++ src/sys/arch/mips/adm5120/adm5120_obio_space.c 2011/07/01 18:38:49 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_obio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */ 1/* $NetBSD: adm5120_obio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -54,31 +54,31 @@ @@ -54,31 +54,31 @@
54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
59 * POSSIBILITY OF SUCH DAMAGE. 59 * POSSIBILITY OF SUCH DAMAGE.
60 */ 60 */
61 61
62/* 62/*
63 * Platform-specific SOC register support for the Infineon ADM5120. 63 * Platform-specific SOC register support for the Infineon ADM5120.
64 */ 64 */
65 65
66#include <sys/cdefs.h> 66#include <sys/cdefs.h>
67__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $"); 67__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
68 68
69#include <sys/param.h> 69#include <sys/param.h>
70 70
71#include <machine/bus.h> 71#include <sys/bus.h>
72#include <mips/adm5120/include/adm5120_obiovar.h> 72#include <mips/adm5120/include/adm5120_obiovar.h>
73 73
74#define CHIP obio 74#define CHIP obio
75#define CHIP_MEM /* defined */ 75#define CHIP_MEM /* defined */
76#define CHIP_ACCESS_SIZE 4 76#define CHIP_ACCESS_SIZE 4
77 77
78/* MEM region 1 */ 78/* MEM region 1 */
79#define CHIP_W1_BUS_START(v) 0x00000000UL 79#define CHIP_W1_BUS_START(v) 0x00000000UL
80#define CHIP_W1_BUS_END(v) 0x1fffffffUL 80#define CHIP_W1_BUS_END(v) 0x1fffffffUL
81#define CHIP_W1_SYS_START(v) 0UL 81#define CHIP_W1_SYS_START(v) 0UL
82#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v) 82#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
83 83
84#include <mips/mips/bus_space_alignstride_chipdep.c> 84#include <mips/mips/bus_space_alignstride_chipdep.c>
cvs diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_pciio_space.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_pciio_space.c 2008/04/28 20:23:27 1.2
+++ src/sys/arch/mips/adm5120/adm5120_pciio_space.c 2011/07/01 18:38:49 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_pciio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */ 1/* $NetBSD: adm5120_pciio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 2001 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. 8 * by Jason R. Thorpe.
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.
@@ -24,31 +24,31 @@ @@ -24,31 +24,31 @@
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32/* 32/*
33 * Platform-specific SOC register support for the Infineon ADM5120. 33 * Platform-specific SOC register support for the Infineon ADM5120.
34 */ 34 */
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: adm5120_pciio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: adm5120_pciio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40 40
41#include <machine/bus.h> 41#include <sys/bus.h>
42#include <mips/adm5120/include/adm5120reg.h> 42#include <mips/adm5120/include/adm5120reg.h>
43#include <mips/adm5120/include/adm5120_pcivar.h> 43#include <mips/adm5120/include/adm5120_pcivar.h>
44 44
45#define CHIP pciio 45#define CHIP pciio
46#define CHIP_MEM /* defined */ 46#define CHIP_MEM /* defined */
47#define CHIP_ACCESS_SIZE 1 47#define CHIP_ACCESS_SIZE 1
48 48
49#define CHIP_W1_BUS_START(v) ADM5120_BASE_PCI_IO 49#define CHIP_W1_BUS_START(v) ADM5120_BASE_PCI_IO
50#define CHIP_W1_BUS_END(v) ADM5120_BASE_PCI_CONFADDR 50#define CHIP_W1_BUS_END(v) ADM5120_BASE_PCI_CONFADDR
51#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v) 51#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
52#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v) 52#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
53 53
54#include <mips/mips/bus_space_alignstride_chipdep.c> 54#include <mips/mips/bus_space_alignstride_chipdep.c>
cvs diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_pcimem_space.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/adm5120_pcimem_space.c 2008/04/28 20:23:27 1.2
+++ src/sys/arch/mips/adm5120/adm5120_pcimem_space.c 2011/07/01 18:38:49 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120_pcimem_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */ 1/* $NetBSD: adm5120_pcimem_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 2001 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. 8 * by Jason R. Thorpe.
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.
@@ -24,31 +24,31 @@ @@ -24,31 +24,31 @@
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32/* 32/*
33 * Platform-specific SOC register support for the Infineon ADM5120. 33 * Platform-specific SOC register support for the Infineon ADM5120.
34 */ 34 */
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: adm5120_pcimem_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: adm5120_pcimem_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40 40
41#include <machine/bus.h> 41#include <sys/bus.h>
42#include <mips/adm5120/include/adm5120reg.h> 42#include <mips/adm5120/include/adm5120reg.h>
43#include <mips/adm5120/include/adm5120_pcivar.h> 43#include <mips/adm5120/include/adm5120_pcivar.h>
44 44
45#define CHIP pcimem 45#define CHIP pcimem
46#define CHIP_MEM /* defined */ 46#define CHIP_MEM /* defined */
47#define CHIP_ACCESS_SIZE 1 47#define CHIP_ACCESS_SIZE 1
48 48
49#define CHIP_W1_BUS_START(v) ADM5120_BASE_PCI_MEM 49#define CHIP_W1_BUS_START(v) ADM5120_BASE_PCI_MEM
50#define CHIP_W1_BUS_END(v) ADM5120_BASE_PCI_IO 50#define CHIP_W1_BUS_END(v) ADM5120_BASE_PCI_IO
51#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v) 51#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
52#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v) 52#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
53 53
54#include <mips/mips/bus_space_alignstride_chipdep.c> 54#include <mips/mips/bus_space_alignstride_chipdep.c>
cvs diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/dev/admgpio.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/admgpio.c 2011/02/20 07:48:35 1.3
+++ src/sys/arch/mips/adm5120/dev/admgpio.c 2011/07/01 18:38:49 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: admgpio.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */ 1/* $NetBSD: admgpio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 David Young. All rights reserved. 4 * Copyright (c) 2007 David Young. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or 6 * Redistribution and use in source and binary forms, with or
7 * without modification, are permitted provided that the following 7 * without modification, are permitted provided that the following
8 * conditions are met: 8 * conditions 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 11 * 2. Redistributions in binary form must reproduce the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer in the documentation and/or other materials provided 13 * disclaimer in the documentation and/or other materials provided
14 * with the distribution. 14 * with the distribution.
@@ -18,35 +18,35 @@ @@ -18,35 +18,35 @@
18 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
19 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 19 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
21 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
23 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
26 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 26 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
27 * OF SUCH DAMAGE. 27 * OF SUCH DAMAGE.
28 */ 28 */
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30 30
31__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.3 2011/02/20 07:48:35 matt Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
32 32
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/systm.h> 34#include <sys/systm.h>
35#include <sys/device.h> 35#include <sys/device.h>
36#include <sys/gpio.h> 36#include <sys/gpio.h>
37#include <sys/kernel.h> /* for hz */ 37#include <sys/kernel.h> /* for hz */
38 38
39#include <machine/bus.h> 39#include <sys/bus.h>
40 40
41#include <dev/gpio/gpiovar.h> 41#include <dev/gpio/gpiovar.h>
42 42
43#include <mips/adm5120/include/adm5120reg.h> 43#include <mips/adm5120/include/adm5120reg.h>
44#include <mips/adm5120/include/adm5120var.h> 44#include <mips/adm5120/include/adm5120var.h>
45#include <mips/adm5120/include/adm5120_mainbusvar.h> 45#include <mips/adm5120/include/adm5120_mainbusvar.h>
46 46
47static inline uint32_t 47static inline uint32_t
48admgpio_read(struct mainbus_softc *sc) 48admgpio_read(struct mainbus_softc *sc)
49{ 49{
50 return bus_space_read_4(sc->sc_obiot, sc->sc_gpioh, ADM5120_GPIO0); 50 return bus_space_read_4(sc->sc_obiot, sc->sc_gpioh, ADM5120_GPIO0);
51} 51}
52 52
cvs diff -r1.3 -r1.4 src/sys/arch/mips/adm5120/dev/wdc_extio.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/wdc_extio.c 2009/10/19 23:19:38 1.3
+++ src/sys/arch/mips/adm5120/dev/wdc_extio.c 2011/07/01 18:38:49 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */ 1/* $NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 David Young. All rights reserved. 4 * Copyright (c) 2007 David Young. All rights reserved.
5 * 5 *
6 * CompactFlash attachment for RouterBoard 153. Derived from 6 * CompactFlash attachment for RouterBoard 153. Derived from
7 * the NetBSD/mac68k OBIO-IDE attachment. 7 * the NetBSD/mac68k OBIO-IDE attachment.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or 9 * Redistribution and use in source and binary forms, with or
10 * without modification, are permitted provided that the following 10 * without modification, are permitted provided that the following
11 * conditions are met: 11 * conditions 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 14 * 2. Redistributions in binary form must reproduce the above
@@ -51,37 +51,37 @@ @@ -51,37 +51,37 @@
51 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 51 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
52 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 52 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
53 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 53 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
54 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 54 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
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#include <sys/cdefs.h> 63#include <sys/cdefs.h>
64__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $"); 64__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
65 65
66#include <sys/types.h> 66#include <sys/types.h>
67#include <sys/param.h> 67#include <sys/param.h>
68#include <sys/systm.h> 68#include <sys/systm.h>
69#include <sys/device.h> 69#include <sys/device.h>
70#include <sys/malloc.h> 70#include <sys/malloc.h>
71#include <sys/kernel.h> 71#include <sys/kernel.h>
72#include <sys/callout.h> 72#include <sys/callout.h>
73 73
74#include <machine/bus.h> 74#include <sys/bus.h>
75#include <machine/intr.h> 75#include <machine/intr.h>
76#include <machine/cpu.h> 76#include <machine/cpu.h>
77 77
78#include <mips/adm5120/include/adm5120_extiovar.h> 78#include <mips/adm5120/include/adm5120_extiovar.h>
79 79
80#include <dev/ata/atareg.h> 80#include <dev/ata/atareg.h>
81#include <dev/ata/atavar.h> 81#include <dev/ata/atavar.h>
82#include <dev/ic/wdcvar.h> 82#include <dev/ic/wdcvar.h>
83 83
84#ifdef WDC_EXTIO_DEBUG 84#ifdef WDC_EXTIO_DEBUG
85int wdc_extio_debug = 1; 85int wdc_extio_debug = 1;
86#define WDC_EXTIO_DPRINTF(__fmt, ...) \ 86#define WDC_EXTIO_DPRINTF(__fmt, ...) \
87do { \ 87do { \
cvs diff -r1.6 -r1.7 src/sys/arch/mips/adm5120/dev/admpci.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/admpci.c 2011/05/17 17:34:50 1.6
+++ src/sys/arch/mips/adm5120/dev/admpci.c 2011/07/01 18:38:49 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: admpci.c,v 1.6 2011/05/17 17:34:50 dyoung Exp $ */ 1/* $NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 David Young. All rights reserved. 4 * Copyright (c) 2007 David Young. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or 6 * Redistribution and use in source and binary forms, with or
7 * without modification, are permitted provided that the following 7 * without modification, are permitted provided that the following
8 * conditions are met: 8 * conditions 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 11 * 2. Redistributions in binary form must reproduce the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer in the documentation and/or other materials provided 13 * disclaimer in the documentation and/or other materials provided
14 * with the distribution. 14 * with the distribution.
@@ -51,40 +51,40 @@ @@ -51,40 +51,40 @@
51 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 51 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
52 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 52 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
53 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 53 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
54 * ON ANY THEORY OF LIABILITY, WHETHER IN 54 * ON ANY THEORY OF LIABILITY, WHETHER IN
55 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 55 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
56 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 56 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
57 * POSSIBILITY OF SUCH DAMAGE. 57 * POSSIBILITY OF SUCH DAMAGE.
58 */  58 */
59 59
60#include "opt_pci.h" 60#include "opt_pci.h"
61#include "pci.h" 61#include "pci.h"
62 62
63#include <sys/cdefs.h> 63#include <sys/cdefs.h>
64__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.6 2011/05/17 17:34:50 dyoung Exp $"); 64__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
65 65
66#include <sys/types.h> 66#include <sys/types.h>
67#include <sys/param.h> 67#include <sys/param.h>
68#include <sys/time.h> 68#include <sys/time.h>
69#include <sys/systm.h> 69#include <sys/systm.h>
70#include <sys/errno.h> 70#include <sys/errno.h>
71#include <sys/device.h> 71#include <sys/device.h>
72#include <sys/malloc.h> 72#include <sys/malloc.h>
73#include <sys/extent.h> 73#include <sys/extent.h>
74 74
75#include <uvm/uvm_extern.h> 75#include <uvm/uvm_extern.h>
76 76
77#include <machine/bus.h> 77#include <sys/bus.h>
78#include <machine/cpu.h> 78#include <machine/cpu.h>
79#include <machine/pte.h> 79#include <machine/pte.h>
80 80
81#include <dev/pci/pcivar.h> 81#include <dev/pci/pcivar.h>
82#include <dev/pci/pcireg.h> 82#include <dev/pci/pcireg.h>
83#include <dev/pci/pciconf.h> 83#include <dev/pci/pciconf.h>
84 84
85#ifdef PCI_NETBSD_CONFIGURE 85#ifdef PCI_NETBSD_CONFIGURE
86#include <mips/cache.h> 86#include <mips/cache.h>
87#endif 87#endif
88 88
89#include <mips/adm5120/include/adm5120_mainbusvar.h> 89#include <mips/adm5120/include/adm5120_mainbusvar.h>
90#include <mips/adm5120/include/adm5120reg.h> 90#include <mips/adm5120/include/adm5120reg.h>
cvs diff -r1.6 -r1.7 src/sys/arch/mips/adm5120/dev/ahci.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/ahci.c 2011/04/04 19:58:56 1.6
+++ src/sys/arch/mips/adm5120/dev/ahci.c 2011/07/01 18:38:49 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $ */ 1/* $NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -54,36 +54,36 @@ @@ -54,36 +54,36 @@
54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
59 * POSSIBILITY OF SUCH DAMAGE. 59 * POSSIBILITY OF SUCH DAMAGE.
60 */ 60 */
61 61
62/* 62/*
63 * !! HIGHLY EXPERIMENTAL CODE !! 63 * !! HIGHLY EXPERIMENTAL CODE !!
64 */ 64 */
65 65
66#include <sys/cdefs.h> 66#include <sys/cdefs.h>
67__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $"); 67__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
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/kernel.h> 71#include <sys/kernel.h>
72#include <sys/proc.h> 72#include <sys/proc.h>
73#include <sys/device.h> 73#include <sys/device.h>
74#include <sys/malloc.h> 74#include <sys/malloc.h>
75 75
76#include <machine/bus.h> 76#include <sys/bus.h>
77#include <machine/cpu.h> 77#include <machine/cpu.h>
78 78
79#include <dev/usb/usb.h> 79#include <dev/usb/usb.h>
80#include <dev/usb/usbdi.h> 80#include <dev/usb/usbdi.h>
81#include <dev/usb/usbdivar.h> 81#include <dev/usb/usbdivar.h>
82#include <dev/usb/usb_mem.h> 82#include <dev/usb/usb_mem.h>
83#include <dev/usb/usbdevs.h> 83#include <dev/usb/usbdevs.h>
84 84
85#include <mips/adm5120/include/adm5120reg.h> 85#include <mips/adm5120/include/adm5120reg.h>
86#include <mips/adm5120/include/adm5120var.h> 86#include <mips/adm5120/include/adm5120var.h>
87#include <mips/adm5120/include/adm5120_obiovar.h> 87#include <mips/adm5120/include/adm5120_obiovar.h>
88 88
89#include <mips/adm5120/dev/ahcireg.h> 89#include <mips/adm5120/dev/ahcireg.h>
cvs diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/admwdog.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/admwdog.c 2009/10/19 23:19:38 1.2
+++ src/sys/arch/mips/adm5120/dev/admwdog.c 2011/07/01 18:38:49 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $ */ 1/* $NetBSD: admwdog.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 David Young. All rights reserved. 4 * Copyright (c) 2007 David Young. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or 6 * Redistribution and use in source and binary forms, with or
7 * without modification, are permitted provided that the following 7 * without modification, are permitted provided that the following
8 * conditions are met: 8 * conditions 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 11 * 2. Redistributions in binary form must reproduce the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer in the documentation and/or other materials provided 13 * disclaimer in the documentation and/or other materials provided
14 * with the distribution. 14 * with the distribution.
@@ -19,35 +19,35 @@ @@ -19,35 +19,35 @@
19 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 19 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
21 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
23 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
26 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 26 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
27 * OF SUCH DAMAGE. 27 * OF SUCH DAMAGE.
28 */ 28 */
29 29
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31 31
32__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $"); 32__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
33 33
34#include <sys/param.h> 34#include <sys/param.h>
35#include <sys/systm.h> 35#include <sys/systm.h>
36#include <sys/device.h> 36#include <sys/device.h>
37#include <sys/wdog.h> 37#include <sys/wdog.h>
38#include <sys/kernel.h> /* for hz */ 38#include <sys/kernel.h> /* for hz */
39 39
40#include <machine/bus.h> 40#include <sys/bus.h>
41 41
42#include <dev/sysmon/sysmonvar.h> 42#include <dev/sysmon/sysmonvar.h>
43 43
44#include <mips/adm5120/include/adm5120reg.h> 44#include <mips/adm5120/include/adm5120reg.h>
45#include <mips/adm5120/include/adm5120var.h> 45#include <mips/adm5120/include/adm5120var.h>
46#include <mips/adm5120/include/adm5120_obiovar.h> 46#include <mips/adm5120/include/adm5120_obiovar.h>
47#include <mips/adm5120/dev/if_admswvar.h> 47#include <mips/adm5120/dev/if_admswvar.h>
48 48
49/* maximum watchdog period, seconds */ 49/* maximum watchdog period, seconds */
50#define ADMWDOG_MAX_PERIOD (__SHIFTOUT_MASK(ADM5120_WDOG_WTS_MASK) / 100) 50#define ADMWDOG_MAX_PERIOD (__SHIFTOUT_MASK(ADM5120_WDOG_WTS_MASK) / 100)
51 51
52static int admwdog_setmode(struct sysmon_wdog *smw); 52static int admwdog_setmode(struct sysmon_wdog *smw);
53static int admwdog_tickle(struct sysmon_wdog *smw); 53static int admwdog_tickle(struct sysmon_wdog *smw);
cvs diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/if_admswvar.h (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/if_admswvar.h 2010/01/19 22:06:21 1.2
+++ src/sys/arch/mips/adm5120/dev/if_admswvar.h 2011/07/01 18:38:49 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_admswvar.h,v 1.2 2010/01/19 22:06:21 pooka Exp $ */ 1/* $NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -24,49 +24,49 @@ @@ -24,49 +24,49 @@
24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
25 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 25 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 26 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
27 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 27 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
29 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 29 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
30 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 30 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
31 * OF SUCH DAMAGE. 31 * OF SUCH DAMAGE.
32 */ 32 */
33#ifndef _IF_ADMSWVAR_H_ 33#ifndef _IF_ADMSWVAR_H_
34#define _IF_ADMSWVAR_H_ 34#define _IF_ADMSWVAR_H_
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.2 2010/01/19 22:06:21 pooka Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 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/callout.h> 41#include <sys/callout.h>
42#include <sys/mbuf.h> 42#include <sys/mbuf.h>
43#include <sys/malloc.h> 43#include <sys/malloc.h>
44#include <sys/kernel.h> 44#include <sys/kernel.h>
45#include <sys/socket.h> 45#include <sys/socket.h>
46#include <sys/ioctl.h> 46#include <sys/ioctl.h>
47#include <sys/errno.h> 47#include <sys/errno.h>
48#include <sys/device.h> 48#include <sys/device.h>
49#include <sys/queue.h> 49#include <sys/queue.h>
50#include <sys/wdog.h> 50#include <sys/wdog.h>
51 51
52#include <uvm/uvm_extern.h> /* for PAGE_SIZE */ 52#include <uvm/uvm_extern.h> /* for PAGE_SIZE */
53 53
54#include <net/if.h> 54#include <net/if.h>
55#include <net/if_dl.h> 55#include <net/if_dl.h>
56#include <net/if_media.h> 56#include <net/if_media.h>
57#include <net/if_ether.h> 57#include <net/if_ether.h>
58 58
59#include <machine/bus.h> 59#include <sys/bus.h>
60#include <machine/intr.h> 60#include <machine/intr.h>
61#include <machine/endian.h> 61#include <machine/endian.h>
62 62
63#include <dev/mii/mii.h> 63#include <dev/mii/mii.h>
64#include <dev/mii/miivar.h> 64#include <dev/mii/miivar.h>
65 65
66#include <dev/sysmon/sysmonvar.h> 66#include <dev/sysmon/sysmonvar.h>
67 67
68#include <mips/adm5120/include/adm5120reg.h> 68#include <mips/adm5120/include/adm5120reg.h>
69#include <mips/adm5120/include/adm5120var.h> 69#include <mips/adm5120/include/adm5120var.h>
70#include <mips/adm5120/include/adm5120_obiovar.h> 70#include <mips/adm5120/include/adm5120_obiovar.h>
71 71
72#include <mips/adm5120/dev/if_admswreg.h> 72#include <mips/adm5120/dev/if_admswreg.h>
cvs diff -r1.8 -r1.9 src/sys/arch/mips/adm5120/dev/if_admsw.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/if_admsw.c 2010/04/05 07:19:30 1.8
+++ src/sys/arch/mips/adm5120/dev/if_admsw.c 2011/07/01 18:38:49 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_admsw.c,v 1.8 2010/04/05 07:19:30 joerg Exp $ */ 1/* $NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -66,53 +66,53 @@ @@ -66,53 +66,53 @@
66 */ 66 */
67 67
68/* 68/*
69 * Device driver for Alchemy Semiconductor Au1x00 Ethernet Media 69 * Device driver for Alchemy Semiconductor Au1x00 Ethernet Media
70 * Access Controller. 70 * Access Controller.
71 * 71 *
72 * TODO: 72 * TODO:
73 * 73 *
74 * Better Rx buffer management; we want to get new Rx buffers 74 * Better Rx buffer management; we want to get new Rx buffers
75 * to the chip more quickly than we currently do. 75 * to the chip more quickly than we currently do.
76 */ 76 */
77 77
78#include <sys/cdefs.h> 78#include <sys/cdefs.h>
79__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.8 2010/04/05 07:19:30 joerg Exp $"); 79__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $");
80 80
81 81
82#include <sys/param.h> 82#include <sys/param.h>
83#include <sys/systm.h> 83#include <sys/systm.h>
84#include <sys/callout.h> 84#include <sys/callout.h>
85#include <sys/mbuf.h> 85#include <sys/mbuf.h>
86#include <sys/malloc.h> 86#include <sys/malloc.h>
87#include <sys/kernel.h> 87#include <sys/kernel.h>
88#include <sys/socket.h> 88#include <sys/socket.h>
89#include <sys/ioctl.h> 89#include <sys/ioctl.h>
90#include <sys/errno.h> 90#include <sys/errno.h>
91#include <sys/device.h> 91#include <sys/device.h>
92#include <sys/queue.h> 92#include <sys/queue.h>
93 93
94#include <prop/proplib.h> 94#include <prop/proplib.h>
95 95
96#include <uvm/uvm_extern.h> /* for PAGE_SIZE */ 96#include <uvm/uvm_extern.h> /* for PAGE_SIZE */
97 97
98#include <net/if.h> 98#include <net/if.h>
99#include <net/if_dl.h> 99#include <net/if_dl.h>
100#include <net/if_media.h> 100#include <net/if_media.h>
101#include <net/if_ether.h> 101#include <net/if_ether.h>
102 102
103#include <net/bpf.h> 103#include <net/bpf.h>
104 104
105#include <machine/bus.h> 105#include <sys/bus.h>
106#include <machine/intr.h> 106#include <machine/intr.h>
107#include <machine/endian.h> 107#include <machine/endian.h>
108 108
109#include <dev/mii/mii.h> 109#include <dev/mii/mii.h>
110#include <dev/mii/miivar.h> 110#include <dev/mii/miivar.h>
111 111
112#include <sys/gpio.h> 112#include <sys/gpio.h>
113#include <dev/gpio/gpiovar.h> 113#include <dev/gpio/gpiovar.h>
114 114
115#include <mips/adm5120/include/adm5120reg.h> 115#include <mips/adm5120/include/adm5120reg.h>
116#include <mips/adm5120/include/adm5120var.h> 116#include <mips/adm5120/include/adm5120var.h>
117#include <mips/adm5120/include/adm5120_obiovar.h> 117#include <mips/adm5120/include/adm5120_obiovar.h>
118#include <mips/adm5120/dev/if_admswreg.h> 118#include <mips/adm5120/dev/if_admswreg.h>
cvs diff -r1.7 -r1.8 src/sys/arch/mips/adm5120/dev/uart.c (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/dev/uart.c 2011/04/24 16:26:56 1.7
+++ src/sys/arch/mips/adm5120/dev/uart.c 2011/07/01 18:38:49 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: uart.c,v 1.7 2011/04/24 16:26:56 rmind Exp $ */ 1/* $NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -22,46 +22,46 @@ @@ -22,46 +22,46 @@
22 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 22 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
23 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS 23 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS
24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
25 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 25 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 26 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
27 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 27 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
29 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 29 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
30 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 30 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
31 * OF SUCH DAMAGE. 31 * OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.7 2011/04/24 16:26:56 rmind Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $");
36 36
37#include <sys/types.h> 37#include <sys/types.h>
38#include <sys/param.h> 38#include <sys/param.h>
39#include <sys/systm.h> 39#include <sys/systm.h>
40#include <sys/kernel.h> 40#include <sys/kernel.h>
41#include <sys/time.h> 41#include <sys/time.h>
42#include <sys/device.h> 42#include <sys/device.h>
43 43
44#include <sys/proc.h> 44#include <sys/proc.h>
45#include <sys/buf.h> 45#include <sys/buf.h>
46#include <sys/ioctl.h> 46#include <sys/ioctl.h>
47#include <sys/kauth.h> 47#include <sys/kauth.h>
48#include <sys/tty.h> 48#include <sys/tty.h>
49#include <sys/file.h> 49#include <sys/file.h>
50#include <sys/conf.h> 50#include <sys/conf.h>
51#include <sys/vnode.h> 51#include <sys/vnode.h>
52 52
53#include <machine/intr.h> 53#include <machine/intr.h>
54#include <machine/bus.h> 54#include <sys/bus.h>
55 55
56#include <mips/adm5120/include/adm5120var.h> 56#include <mips/adm5120/include/adm5120var.h>
57#include <mips/adm5120/include/adm5120_obiovar.h> 57#include <mips/adm5120/include/adm5120_obiovar.h>
58#include <dev/cons.h> 58#include <dev/cons.h>
59#include <mips/adm5120/dev/uart.h> 59#include <mips/adm5120/dev/uart.h>
60 60
61#define REG_READ(o) bus_space_read_4(sc->sc_st, sc->sc_ioh, (o)) 61#define REG_READ(o) bus_space_read_4(sc->sc_st, sc->sc_ioh, (o))
62#define REG_WRITE(o,v) bus_space_write_4(sc->sc_st, sc->sc_ioh, (o),(v)) 62#define REG_WRITE(o,v) bus_space_write_4(sc->sc_st, sc->sc_ioh, (o),(v))
63 63
64cons_decl(uart_); 64cons_decl(uart_);
65 65
66extern struct consdev *cn_tab; /* physical console device info */ 66extern struct consdev *cn_tab; /* physical console device info */
67 67
cvs diff -r1.2 -r1.3 src/sys/arch/mips/adm5120/include/adm5120var.h (expand / switch to unified diff)

--- src/sys/arch/mips/adm5120/include/adm5120var.h 2008/04/28 20:23:27 1.2
+++ src/sys/arch/mips/adm5120/include/adm5120var.h 2011/07/01 18:38:49 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adm5120var.h,v 1.2 2008/04/28 20:23:27 martin Exp $ */ 1/* $NetBSD: adm5120var.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. 4 * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or 7 * Redistribution and use in source and binary forms, with or
8 * without modification, are permitted provided that the following 8 * without modification, are permitted provided that the following
9 * conditions are met: 9 * conditions 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 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -52,27 +52,27 @@ @@ -52,27 +52,27 @@
52 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 52 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
53 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 53 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 54 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 55 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 56 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 57 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 58 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
59 * POSSIBILITY OF SUCH DAMAGE. 59 * POSSIBILITY OF SUCH DAMAGE.
60 */ 60 */
61 61
62#ifndef _ADM5120VAR_H_ 62#ifndef _ADM5120VAR_H_
63#define _ADM5120VAR_H_ 63#define _ADM5120VAR_H_
64 64
65#include <machine/bus.h> 65#include <sys/bus.h>
66 66
67#if 0 67#if 0
68#include <sys/socket.h> 68#include <sys/socket.h>
69#include <net/if.h> 69#include <net/if.h>
70#include <net/if_ether.h> 70#include <net/if_ether.h>
71#endif 71#endif
72 72
73#include <prop/proplib.h> 73#include <prop/proplib.h>
74 74
75struct adm5120_config { 75struct adm5120_config {
76 struct mips_bus_space obio_space; 76 struct mips_bus_space obio_space;
77 struct mips_bus_space extio_space; 77 struct mips_bus_space extio_space;
78 struct mips_bus_space pciio_space; 78 struct mips_bus_space pciio_space;