Sat Mar 12 11:42:57 2011 UTC ()
Remove unnecessary headers.


(nakayama)
diff -r1.6 -r1.7 src/sys/arch/sparc64/dev/mkclock.c
diff -r1.101 -r1.102 src/sys/arch/sparc64/sparc64/clock.c
cvs diff -r1.6 -r1.7 src/sys/arch/sparc64/dev/mkclock.c (expand / switch to unified diff)

--- src/sys/arch/sparc64/dev/mkclock.c 2009/10/24 14:52:19 1.6
+++ src/sys/arch/sparc64/dev/mkclock.c 2011/03/12 11:42:57 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mkclock.c,v 1.6 2009/10/24 14:52:19 nakayama Exp $ */ 1/* $NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1992, 1993 4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * Copyright (c) 1994 Gordon W. Ross 6 * Copyright (c) 1994 Gordon W. Ross
7 * Copyright (c) 1993 Adam Glass 7 * Copyright (c) 1993 Adam Glass
8 * Copyright (c) 1996 Paul Kranenburg 8 * Copyright (c) 1996 Paul Kranenburg
9 * Copyright (c) 1996 9 * Copyright (c) 1996
10 * The President and Fellows of Harvard College. All rights reserved. 10 * The President and Fellows of Harvard College. All rights reserved.
11 * 11 *
12 * This software was developed by the Computer Systems Engineering group 12 * This software was developed by the Computer Systems Engineering group
13 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and 13 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
14 * contributed to Berkeley. 14 * contributed to Berkeley.
@@ -45,53 +45,51 @@ @@ -45,53 +45,51 @@
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE. 51 * SUCH DAMAGE.
52 * 52 *
53 * @(#)clock.c 8.1 (Berkeley) 6/11/93 53 * @(#)clock.c 8.1 (Berkeley) 6/11/93
54 * 54 *
55 */ 55 */
56 56
57#include <sys/cdefs.h> 57#include <sys/cdefs.h>
58__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.6 2009/10/24 14:52:19 nakayama Exp $"); 58__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $");
59 59
60/*  60/*
61 * Clock driver for 'mkclock' - Mostek MK48Txx TOD clock. 61 * Clock driver for 'mkclock' - Mostek MK48Txx TOD clock.
62 */ 62 */
63 63
64#include <sys/param.h> 64#include <sys/param.h>
65#include <sys/kernel.h> 65#include <sys/kernel.h>
66#include <sys/device.h> 66#include <sys/device.h>
67#include <sys/proc.h> 67#include <sys/proc.h>
68#include <sys/resourcevar.h> 68#include <sys/resourcevar.h>
69#include <sys/malloc.h> 69#include <sys/malloc.h>
70#include <sys/systm.h> 70#include <sys/systm.h>
71 71
72#include <uvm/uvm_extern.h> 72#include <uvm/uvm_extern.h>
73 73
74#include <machine/bus.h> 74#include <machine/bus.h>
75#include <machine/autoconf.h> 75#include <machine/autoconf.h>
76#include <machine/eeprom.h> 76#include <machine/eeprom.h>
77#include <machine/cpu.h> 77#include <machine/cpu.h>
78 78
79#include <dev/clock_subr.h> 79#include <dev/clock_subr.h>
80#include <dev/ic/mk48txxreg.h> 80#include <dev/ic/mk48txxreg.h>
81#include <dev/ic/mk48txxvar.h> 81#include <dev/ic/mk48txxvar.h>
82 82
83#include <sparc64/dev/iommureg.h> 
84#include <sparc64/dev/sbusreg.h> 
85#include <dev/sbus/sbusvar.h> 83#include <dev/sbus/sbusvar.h>
86#include <dev/ebus/ebusreg.h> 84#include <dev/ebus/ebusreg.h>
87#include <dev/ebus/ebusvar.h> 85#include <dev/ebus/ebusvar.h>
88 86
89/* 87/*
90 * clock (eeprom) attaches at the sbus or the ebus (PCI) 88 * clock (eeprom) attaches at the sbus or the ebus (PCI)
91 */ 89 */
92static int mkclock_sbus_match(device_t, cfdata_t, void *); 90static int mkclock_sbus_match(device_t, cfdata_t, void *);
93static void mkclock_sbus_attach(device_t, device_t, void *); 91static void mkclock_sbus_attach(device_t, device_t, void *);
94 92
95static int mkclock_ebus_match(device_t, cfdata_t, void *); 93static int mkclock_ebus_match(device_t, cfdata_t, void *);
96static void mkclock_ebus_attach(device_t, device_t, void *); 94static void mkclock_ebus_attach(device_t, device_t, void *);
97 95
cvs diff -r1.101 -r1.102 src/sys/arch/sparc64/sparc64/clock.c (expand / switch to unified diff)

--- src/sys/arch/sparc64/sparc64/clock.c 2010/03/11 03:54:56 1.101
+++ src/sys/arch/sparc64/sparc64/clock.c 2011/03/12 11:42:57 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: clock.c,v 1.101 2010/03/11 03:54:56 mrg Exp $ */ 1/* $NetBSD: clock.c,v 1.102 2011/03/12 11:42:57 nakayama Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1992, 1993 4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * Copyright (c) 1994 Gordon W. Ross 6 * Copyright (c) 1994 Gordon W. Ross
7 * Copyright (c) 1993 Adam Glass 7 * Copyright (c) 1993 Adam Glass
8 * Copyright (c) 1996 Paul Kranenburg 8 * Copyright (c) 1996 Paul Kranenburg
9 * Copyright (c) 1996 9 * Copyright (c) 1996
10 * The President and Fellows of Harvard College. All rights reserved. 10 * The President and Fellows of Harvard College. All rights reserved.
11 * 11 *
12 * This software was developed by the Computer Systems Engineering group 12 * This software was developed by the Computer Systems Engineering group
13 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and 13 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
14 * contributed to Berkeley. 14 * contributed to Berkeley.
@@ -45,27 +45,27 @@ @@ -45,27 +45,27 @@
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE. 51 * SUCH DAMAGE.
52 * 52 *
53 * @(#)clock.c 8.1 (Berkeley) 6/11/93 53 * @(#)clock.c 8.1 (Berkeley) 6/11/93
54 * 54 *
55 */ 55 */
56 56
57#include <sys/cdefs.h> 57#include <sys/cdefs.h>
58__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.101 2010/03/11 03:54:56 mrg Exp $"); 58__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.102 2011/03/12 11:42:57 nakayama Exp $");
59 59
60#include "opt_multiprocessor.h" 60#include "opt_multiprocessor.h"
61 61
62/* 62/*
63 * Clock driver. This is the id prom and eeprom driver as well 63 * Clock driver. This is the id prom and eeprom driver as well
64 * and includes the timer register functions too. 64 * and includes the timer register functions too.
65 */ 65 */
66 66
67/* Define this for a 1/4s clock to ease debugging */ 67/* Define this for a 1/4s clock to ease debugging */
68/* #define INTR_DEBUG */ 68/* #define INTR_DEBUG */
69 69
70#include <sys/param.h> 70#include <sys/param.h>
71#include <sys/kernel.h> 71#include <sys/kernel.h>
@@ -80,30 +80,26 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1. @@ -80,30 +80,26 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
80#endif 80#endif
81 81
82#include <uvm/uvm_extern.h> 82#include <uvm/uvm_extern.h>
83 83
84#include <machine/bus.h> 84#include <machine/bus.h>
85#include <machine/autoconf.h> 85#include <machine/autoconf.h>
86#include <machine/eeprom.h> 86#include <machine/eeprom.h>
87#include <machine/cpu.h> 87#include <machine/cpu.h>
88#include <machine/cpu_counter.h> 88#include <machine/cpu_counter.h>
89 89
90#include <sparc64/sparc64/intreg.h> 90#include <sparc64/sparc64/intreg.h>
91#include <sparc64/sparc64/timerreg.h> 91#include <sparc64/sparc64/timerreg.h>
92#include <sparc64/dev/iommureg.h> 92#include <sparc64/dev/iommureg.h>
93#include <sparc64/dev/sbusreg.h> 
94#include <dev/sbus/sbusvar.h> 
95#include <dev/ebus/ebusreg.h> 
96#include <dev/ebus/ebusvar.h> 
97 93
98 94
99/* 95/*
100 * Clock assignments: 96 * Clock assignments:
101 * 97 *
102 * machine hardclock statclock timecounter 98 * machine hardclock statclock timecounter
103 * counter-timer timer#0 timer#1 %tick 99 * counter-timer timer#0 timer#1 %tick
104 * counter-timer + SMP timer#0/%tick - timer#1 or %tick 100 * counter-timer + SMP timer#0/%tick - timer#1 or %tick
105 * no counter-timer %tick - %tick 101 * no counter-timer %tick - %tick
106 */ 102 */
107 103
108/* 104/*
109 * Statistics clock interval and variance, in usec. Variance must be a 105 * Statistics clock interval and variance, in usec. Variance must be a