CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Fri Jul 1 06:00:20 UTC 2011 Modified Files: src/sys/arch/mips/include: asm.h Log Message: xxx_SUB macros should use a variant of subu, not add To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mips/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/asm.h diff -u src/sys/arch/mips/include/asm.h:1.44 src/sys/arch/mips/include/asm.h:1.45 --- src/sys/arch/mips/include/asm.h:1.44 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/include/asm.h Fri Jul 1 06:00:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.44 2011/02/20 07:45:47 matt Exp $ */ +/* $NetBSD: asm.h,v 1.45 2011/07/01 06:00:20 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -338,7 +338,7 @@ #define PTR_ADDI addi #define PTR_ADDU addu #define PTR_ADDIU addiu -#define PTR_SUB add +#define PTR_SUB subu #define PTR_SUBI subi #define PTR_SUBU subu #define PTR_SUBIU subu @@ -360,7 +360,7 @@ #define PTR_ADDI daddi #define PTR_ADDU daddu #define PTR_ADDIU daddiu -#define PTR_SUB dadd +#define PTR_SUB dsubu #define PTR_SUBI dsubi #define PTR_SUBU dsubu #define PTR_SUBIU dsubu @@ -384,7 +384,7 @@ #define INT_ADDI addi #define INT_ADDU addu #define INT_ADDIU addiu -#define INT_SUB add +#define INT_SUB subu #define INT_SUBI subi #define INT_SUBU subu #define INT_SUBIU subu @@ -406,7 +406,7 @@ #define INT_ADDI daddi #define INT_ADDU daddu #define INT_ADDIU daddiu -#define INT_SUB dadd +#define INT_SUB dsubu #define INT_SUBI dsubi #define INT_SUBU dsubu #define INT_SUBIU dsubu @@ -430,7 +430,7 @@ #define LONG_ADDI addi #define LONG_ADDU addu #define LONG_ADDIU addiu -#define LONG_SUB add +#define LONG_SUB subu #define LONG_SUBI subi #define LONG_SUBU subu #define LONG_SUBIU subu @@ -452,7 +452,7 @@ #define LONG_ADDI daddi #define LONG_ADDU daddu #define LONG_ADDIU daddiu -#define LONG_SUB dadd +#define LONG_SUB dsubu #define LONG_SUBI dsubi #define LONG_SUBU dsubu #define LONG_SUBIU dsubu
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src
Committed By: matt
Date: Fri Jul 1 07:44:34 UTC 2011
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
Log Message:
Fix some array bounds errors found by gcc 4.5
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/mpc85xx/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.15 src/sys/arch/evbppc/mpc85xx/machdep.c:1.16
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.15 Thu Jun 30 00:52:56 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Fri Jul 1 07:44:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.15 2011/06/30 00:52:56 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.16 2011/07/01 07:44:33 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -480,14 +480,16 @@
}
}
mr = physmemr;
- for (u_int i = 0; i cnt; i++, mr++) {
+ for (u_int i = 0; i + 1 cnt; i++, mr++) {
if (mr-start + mr-size == mr[1].start) {
mr-size += mr[1].size;
-for (u_int j = 1; j cnt - i; j++)
+for (u_int j = 1; i + j + 1 cnt; j++)
mr[j] = mr[j+1];
cnt--;
}
}
+ } else {
+ panic(%s: no memory found, __func__);
}
/*
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: matt
Date: Fri Jul 1 07:45:39 UTC 2011
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix uninitialized data warning found by gcc 4.5
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.222 src/sys/dev/pci/if_wm.c:1.223
--- src/sys/dev/pci/if_wm.c:1.222 Tue May 24 22:46:42 2011
+++ src/sys/dev/pci/if_wm.c Fri Jul 1 07:45:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.222 2011/05/24 22:46:42 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.223 2011/07/01 07:45:39 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.222 2011/05/24 22:46:42 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.223 2011/07/01 07:45:39 matt Exp $);
#include rnd.h
@@ -6690,13 +6690,13 @@
wm_valid_nvm_bank_detect_ich8lan(struct wm_softc *sc, unsigned int *bank)
{
uint32_t act_offset = ICH_NVM_SIG_WORD * 2 + 1;
- uint8_t bank_high_byte;
uint32_t bank1_offset = sc-sc_ich8_flash_bank_size * sizeof(uint16_t);
if ((sc-sc_type != WM_T_ICH10) (sc-sc_type != WM_T_PCH)) {
/* Value of bit 22 corresponds to the flash bank we're on. */
*bank = (CSR_READ(sc, WMREG_EECD) EECD_SEC1VAL) ? 1 : 0;
} else {
+ uint8_t bank_high_byte;
wm_read_ich8_byte(sc, act_offset, bank_high_byte);
if ((bank_high_byte 0xc0) == 0x80)
*bank = 0;
@@ -6975,6 +6975,8 @@
status = wm_read_ich8_data(sc, index, 1, word);
if (status == 0)
*data = (uint8_t)word;
+ else
+ *data = 0;
return status;
}
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Fri Jul 1 08:37:29 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
use the right variables for the fp and pc, and avoid array bounds
violations.
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/arch/sparc64/sparc64/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.258 src/sys/arch/sparc64/sparc64/machdep.c:1.259
--- src/sys/arch/sparc64/sparc64/machdep.c:1.258 Sun Jun 12 03:35:47 2011
+++ src/sys/arch/sparc64/sparc64/machdep.c Fri Jul 1 08:37:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.258 2011/06/12 03:35:47 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.258 2011/06/12 03:35:47 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -937,8 +937,8 @@
(unsigned long long)fp64-fr_arg[3],
(unsigned long long)fp64-fr_arg[4],
(unsigned long long)fp64-fr_arg[5],
- (unsigned long long)fp64-fr_arg[6],
- (unsigned long long)fp64-fr_fp);
+ (unsigned long long)fp64-fr_fp,
+ (unsigned long long)fp64-fr_pc);
fp = (struct frame32 *)(u_long)fp64-fr_fp;
} else {
/* 32-bit frame */
@@ -952,8 +952,8 @@
fp-fr_arg[3],
fp-fr_arg[4],
fp-fr_arg[5],
- fp-fr_arg[6],
- fp-fr_fp);
+ fp-fr_fp,
+ fp-fr_pc);
fp = (struct frame32*)(u_long)fp-fr_fp;
}
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mrg Date: Fri Jul 1 08:38:11 UTC 2011 Modified Files: src/sys/dev/ic: dpt.c Log Message: apply some (uintptr_t) between pointer and int casting. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/dev/ic/dpt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/dpt.c diff -u src/sys/dev/ic/dpt.c:1.64 src/sys/dev/ic/dpt.c:1.65 --- src/sys/dev/ic/dpt.c:1.64 Sat Nov 13 13:52:01 2010 +++ src/sys/dev/ic/dpt.c Fri Jul 1 08:38:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dpt.c,v 1.64 2010/11/13 13:52:01 uebayasi Exp $ */ +/* $NetBSD: dpt.c,v 1.65 2011/07/01 08:38:10 mrg Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dpt.c,v 1.64 2010/11/13 13:52:01 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: dpt.c,v 1.65 2011/07/01 08:38:10 mrg Exp $); #include sys/param.h #include sys/systm.h @@ -535,7 +535,7 @@ */ dpt_outb(sc, HA_COMMAND, CP_PIO_GETCFG); memset(ec, 0, sizeof(*ec)); - i = ((int)((struct eata_cfg *)0)-ec_cfglen + + i = ((int)(uintptr_t)((struct eata_cfg *)0)-ec_cfglen + sizeof(ec-ec_cfglen)) 1; p = (u_int16_t *)ec; @@ -550,13 +550,13 @@ *p++ = bus_space_read_stream_2(sc-sc_iot, sc-sc_ioh, HA_DATA); if ((i = ec-ec_cfglen) (sizeof(struct eata_cfg) - - (int)struct eata_cfg *)0L)-ec_cfglen)) + - (int)(uintptr_t)struct eata_cfg *)0L)-ec_cfglen)) - sizeof(ec-ec_cfglen))) i = sizeof(struct eata_cfg) - - (int)struct eata_cfg *)0L)-ec_cfglen)) + - (int)(uintptr_t)struct eata_cfg *)0L)-ec_cfglen)) - sizeof(ec-ec_cfglen); - j = i + (int)struct eata_cfg *)0L)-ec_cfglen)) + + j = i + (int)(uintptr_t)struct eata_cfg *)0L)-ec_cfglen)) + sizeof(ec-ec_cfglen); i = 1;
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Fri Jul 1 10:03:17 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.inc
Log Message:
fix version.c defines. now the version says:
gcc version 4.5.3 (NetBSD nb1 20110620)
instead of:
gcc version 4.5.320110428
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.7 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.8
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.7 Wed Jun 29 02:15:13 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Fri Jul 1 10:03:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/06/29 02:15:13 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/07/01 10:03:17 mrg Exp $
.include bsd.own.mk
@@ -31,7 +31,11 @@
# XXX
#DEVPHASE!= cat ${GNUHOSTDIST}/gcc/DEV-PHASE
DEVPHASE=
+.if ${DEVPHASE} == release || ${DEVPHASE} ==
+DATESTAMP=
+.else
DATESTAMP!= cat ${GNUHOSTDIST}/gcc/DATESTAMP
+.endif
BASEVERSTR= \$(BASEVER)\
.if !empty(DEVPHASE)
@@ -39,7 +43,7 @@
.else
DEVPHASESTR= \\
.endif
-.if !empty(DEVPHASE)
+.if !empty(DATESTAMP)
DATESTAMPSTR= \ $(DATESTAMP)\
.else
DATESTAMPSTR= \\
@@ -48,13 +52,13 @@
# XXX pull this out of our configs
G_BUGURL=http://www.NetBSD.org/Misc/send-pr.html
G_BUGURL_s=\${G_BUG_URL}\
-G_PKGVERSION_s=(NetBSD nb1 20110620)
+G_PKGVERSION=(NetBSD nb1 20110620)
G_PKGVERSION_s=\${G_PKGVERSION} \
VER_CPPFLAGS= -DBUGURL=${G_BUGURL_s} \
-DPKGVERSION=${G_PKGVERSION_s} \
-DBASEVER=\${BASEVER}\ \
--DDATESTAMP=\${DATESTAMP}\ \
+-DDATESTAMP=${DATESTAMPSTR} \
-DDEVPHASE=${DEVPHASE} \
-DREVISION=${REVISION}
CPPFLAGS.version.c= ${VER_CPPFLAGS}
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 10:04:13 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
Log Message:
everyone needs the options* stuff here.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.7 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.8
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.7 Fri Jul 1 05:07:06 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Jul 1 10:04:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/07/01 05:07:06 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/07/01 10:04:13 mrg Exp $
.if ${MKGCC} != no
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -157,8 +157,6 @@
.include ../../Makefile.hacks
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45 \
-(${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == armeb)
${SRCS}: options.h
optionlist: ${G_ALL_OPT_FILES} ${GCCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
@@ -171,4 +169,3 @@
optionlist ${.TARGET}
CLEANFILES+= options.h optionlist
-.endif
CVS commit: src/external/gpl3/gcc/lib/libobjc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 10:04:36 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
don't set EXTRA_FAKE_HEADERS here.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libobjc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.5 src/external/gpl3/gcc/lib/libobjc/Makefile:1.6
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.5 Fri Jul 1 05:07:59 2011
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Fri Jul 1 10:04:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/01 05:07:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/01 10:04:36 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -22,7 +22,7 @@
.else
# Machine-independent definitions (include file names).
.include ${.CURDIR}/defs.mk
-EXTRA_FAKEHEADERS= options.h
+EXTRA_FAKEHEADERS=
.endif
LIBGCCOBJ!=cd ${.CURDIR}/../libgcc/libgcc ${PRINTOBJDIR}
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm
Module Name:src Committed By: mrg Date: Fri Jul 1 10:06:01 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: c++config.h config.h Log Message: mknative-gcc regeneration. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h:1.2 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h:1.1 Fri Jul 1 01:57:07 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h Fri Jul 1 10:06:01 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.57 2011/07/01 02:11:14 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ // Predefined symbols and macros -*- C++ -*- @@ -421,7 +421,7 @@ /* #undef _GLIBCXX_HAVE_CEILL */ /* Define to 1 if you have the complex.h header file. */ -/* #undef _GLIBCXX_HAVE_COMPLEX_H */ +#define _GLIBCXX_HAVE_COMPLEX_H 1 /* Define to 1 if you have the `cosf' function. */ /* #undef _GLIBCXX_HAVE_COSF */ @@ -499,7 +499,7 @@ /* #undef _GLIBCXX_HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -/* #undef _GLIBCXX_HAVE_FENV_H */ +#define _GLIBCXX_HAVE_FENV_H 1 /* Define to 1 if you have the `finite' function. */ #define _GLIBCXX_HAVE_FINITE 1 @@ -788,7 +788,7 @@ /* #undef _GLIBCXX_HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -/* #undef _GLIBCXX_HAVE_TGMATH_H */ +#define _GLIBCXX_HAVE_TGMATH_H 1 /* Define to 1 if the target supports thread-local storage. */ /* #undef _GLIBCXX_HAVE_TLS */ Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h:1.2 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h:1.1 Fri Jul 1 01:57:07 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h Fri Jul 1 10:06:01 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.57 2011/07/01 02:11:14 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ /* config.h. Generated from config.h.in by configure. */ @@ -42,7 +42,7 @@ /* #undef HAVE_CEILL */ /* Define to 1 if you have the complex.h header file. */ -/* #undef HAVE_COMPLEX_H */ +#define HAVE_COMPLEX_H 1 /* Define to 1 if you have the `cosf' function. */ /* #undef HAVE_COSF */ @@ -120,7 +120,7 @@ /* #undef HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -/* #undef HAVE_FENV_H */ +#define HAVE_FENV_H 1 /* Define to 1 if you have the `finite' function. */ #define HAVE_FINITE 1 @@ -409,7 +409,7 @@ /* #undef HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -/* #undef HAVE_TGMATH_H */ +#define HAVE_TGMATH_H 1 /* Define to 1 if the target supports thread-local storage. */ /* #undef HAVE_TLS */
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: njoly Date: Fri Jul 1 12:09:35 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Small typo (g++debug - g++.debug). To generate a diff of this commit: cvs rdiff -u -r1.1636 -r1.1637 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1636 src/distrib/sets/lists/comp/mi:1.1637 --- src/distrib/sets/lists/comp/mi:1.1636 Fri Jul 1 02:10:10 2011 +++ src/distrib/sets/lists/comp/mi Fri Jul 1 12:09:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1636 2011/07/01 02:10:10 mrg Exp $ +# $NetBSD: mi,v 1.1637 2011/07/01 12:09:34 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3521,7 +3521,7 @@ ./usr/libdata/debug/usr/bin/fsplit.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/fstat.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/ftp.debug comp-netutil-debug debug -./usr/libdata/debug/usr/bin/g++debug comp-cxx-debug gcccmds,debug +./usr/libdata/debug/usr/bin/g++.debug comp-cxx-debug gcccmds,debug ./usr/libdata/debug/usr/bin/g77.debug comp-fortran-debug gcc=3,gcccmds,debug ./usr/libdata/debug/usr/bin/gcc.debug comp-c-debug gcccmds,debug ./usr/libdata/debug/usr/bin/gcore.debug comp-debug-debug debug
CVS commit: src/sys/arch/amiga/conf
Module Name:src
Committed By: rkujawa
Date: Fri Jul 1 13:30:19 UTC 2011
Modified Files:
src/sys/arch/amiga/conf: GENERIC GENERIC.in files.amiga
Log Message:
Add Bluetooth stack to Amiga. Tested with 3Com 3CRWB6096B on an A1200. Change
approved by phx.
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/amiga/conf/files.amiga
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.267 src/sys/arch/amiga/conf/GENERIC:1.268
--- src/sys/arch/amiga/conf/GENERIC:1.267 Thu Jun 30 20:09:18 2011
+++ src/sys/arch/amiga/conf/GENERIC Fri Jul 1 13:30:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.267 2011/06/30 20:09:18 wiz Exp $
+# $NetBSD: GENERIC,v 1.268 2011/07/01 13:30:18 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.267 $
+#ident GENERIC-$Revision: 1.268 $
maxusers 8
@@ -462,6 +462,37 @@
ss* at scsibus? target ? lun ? # scsi scanner
uk* at scsibus? target ? lun ? # scsi unknown
+# Bluetooth Controller and Device support
+# tested only with btuart on an A1200
+
+# Bluetooth PCMCIA Controllers
+bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A
+btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139
+
+# Bluetooth Device Hub
+bthub* at bcsp?
+bthub* at bt3c?
+bthub* at btbc?
+bthub* at btuart?
+
+# Bluetooth HID support
+bthidev* at bthub?
+
+# Bluetooth Mouse
+btms* at bthidev? reportid ?
+wsmouse* at btms? mux 0
+
+# Bluetooth Keyboard
+#btkbd* at bthidev? reportid ?
+#wskbd* at btkbd? console ? mux 1
+
+# Bluetooth Apple Magic Mouse
+btmagic* at bthub?
+wsmouse* at btmagic? mux 0
+
+# Bluetooth Audio support
+#btsco* at bthub?
+
#
# accept filters
pseudo-device accf_data # dataready accept filter
@@ -516,6 +547,9 @@
pseudo-device ksyms # /dev/ksyms (kernel symbols)
pseudo-device nsmb # experimental - SMB requester
+pseudo-device bcsp# BlueCore Serial Protocol
+pseudo-device btuart # Bluetooth HCI UART (H4)
+
# Veriexec
#
# a pseudo device needed for veriexec
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.79 src/sys/arch/amiga/conf/GENERIC.in:1.80
--- src/sys/arch/amiga/conf/GENERIC.in:1.79 Thu Jun 30 20:09:18 2011
+++ src/sys/arch/amiga/conf/GENERIC.in Fri Jul 1 13:30:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.79 2011/06/30 20:09:18 wiz Exp $
+# $NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $
#
# GENERIC machine description file
#
@@ -56,7 +56,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.79 $
+#ident GENERIC-$Revision: 1.80 $
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS=-Os
@@ -566,6 +566,37 @@
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
ss* at scsibus? target ? lun ? # scsi scanner
uk* at scsibus? target ? lun ? # scsi unknown
+
+# Bluetooth Controller and Device support
+# tested only with btuart on an A1200
+
+# Bluetooth PCMCIA Controllers
+bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A
+btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139
+
+# Bluetooth Device Hub
+bthub* at bcsp?
+bthub* at bt3c?
+bthub* at btbc?
+bthub* at btuart?
+
+# Bluetooth HID support
+bthidev* at bthub?
+
+# Bluetooth Mouse
+btms* at bthidev? reportid ?
+wsmouse* at btms? mux 0
+
+# Bluetooth Keyboard
+#btkbd* at bthidev? reportid ?
+#wskbd* at btkbd? console ? mux 1
+
+# Bluetooth Apple Magic Mouse
+btmagic* at bthub?
+wsmouse* at btmagic? mux 0
+
+# Bluetooth Audio support
+#btsco* at bthub?
')m4_dnl
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
@@ -637,6 +668,9 @@
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
pseudo-device ksyms # /dev/ksyms (kernel symbols)
pseudo-device nsmb # experimental - SMB requester
+
+pseudo-device bcsp# BlueCore Serial Protocol
+pseudo-device btuart # Bluetooth HCI UART (H4)
')m4_dnl
# Veriexec
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.144 src/sys/arch/amiga/conf/files.amiga:1.145
--- src/sys/arch/amiga/conf/files.amiga:1.144 Sun Jun 12 03:35:38 2011
+++ src/sys/arch/amiga/conf/files.amiga Fri Jul 1 13:30:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.144 2011/06/12 03:35:38 rmind Exp $
+# $NetBSD: files.amiga,v 1.145 2011/07/01 13:30:18 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -489,4 +489,7 @@
# OSS
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: hannken
Date: Fri Jul 1 14:28:22 UTC 2011
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
ffs_copyonwrite(): If the write is to the in-file-system journal
there is no need to lock and check the snapshots.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/ufs/ffs/ffs_snapshot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.116 src/sys/ufs/ffs/ffs_snapshot.c:1.117
--- src/sys/ufs/ffs/ffs_snapshot.c:1.116 Sun Jun 12 03:36:00 2011
+++ src/sys/ufs/ffs/ffs_snapshot.c Fri Jul 1 14:28:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.116 2011/06/12 03:36:00 rmind Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.117 2011/07/01 14:28:21 hannken Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.116 2011/06/12 03:36:00 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.117 2011/07/01 14:28:21 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -1896,9 +1896,9 @@
return 0;
}
/*
- * First check to see if it is after the file system or
- * in the preallocated list.
- * By doing this check we avoid several potential deadlocks.
+ * First check to see if it is after the file system,
+ * in the journal or in the preallocated list.
+ * By doing these checks we avoid several potential deadlocks.
*/
fs = ip-i_fs;
lbn = fragstoblks(fs, dbtofsb(fs, bp-b_blkno));
@@ -1906,6 +1906,20 @@
mutex_exit(si-si_lock);
return 0;
}
+ if ((fs-fs_flags FS_DOWAPBL)
+ fs-fs_journal_location == UFS_WAPBL_JOURNALLOC_IN_FILESYSTEM) {
+ off_t blk_off, log_start, log_end;
+
+ log_start = (off_t)fs-fs_journallocs[UFS_WAPBL_INFS_ADDR] *
+ fs-fs_journallocs[UFS_WAPBL_INFS_BLKSZ];
+ log_end = log_start + fs-fs_journallocs[UFS_WAPBL_INFS_COUNT] *
+ fs-fs_journallocs[UFS_WAPBL_INFS_BLKSZ];
+ blk_off = dbtob(bp-b_blkno);
+ if (blk_off = log_start blk_off log_end) {
+ mutex_exit(si-si_lock);
+ return 0;
+ }
+ }
snapblklist = si-si_snapblklist;
upper = (snapblklist != NULL ? snapblklist[0] - 1 : 0);
lower = 1;
CVS commit: src/lib/libtelnet
Module Name:src
Committed By: christos
Date: Fri Jul 1 15:09:28 UTC 2011
Modified Files:
src/lib/libtelnet: sra.c
Log Message:
- use defines for lengths
- strlcpy/snprintf
- KNK
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libtelnet/sra.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libtelnet/sra.c
diff -u src/lib/libtelnet/sra.c:1.9 src/lib/libtelnet/sra.c:1.10
--- src/lib/libtelnet/sra.c:1.9 Thu Jun 30 21:15:27 2011
+++ src/lib/libtelnet/sra.c Fri Jul 1 11:09:28 2011
@@ -32,7 +32,7 @@
#ifdef notdef
__FBSDID($FreeBSD: src/contrib/telnet/libtelnet/sra.c,v 1.16 2002/05/06 09:48:02 markm Exp $);
#else
-__RCSID($NetBSD: sra.c,v 1.9 2011/07/01 01:15:27 joerg Exp $);
+__RCSID($NetBSD: sra.c,v 1.10 2011/07/01 15:09:28 christos Exp $);
#endif
#ifdef SRA
@@ -65,7 +65,7 @@
IdeaData ik;
extern int auth_debug_mode;
-extern char *line; /* see sys_term.c */
+extern char *line; /* see sys_term.c */
static int sra_valid = 0;
static int passwd_sent = 0;
@@ -73,6 +73,8 @@
static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
AUTHTYPE_SRA, };
+#define SMALL_LEN 256
+#define XSMALL_LEN 513
#define SRA_KEY 0
#define SRA_USER 1
#define SRA_CONTINUE 2
@@ -87,16 +89,15 @@
Data(Authenticator *ap, int type, void *d, int c)
{
unsigned char *p = str_data + 4;
- unsigned char *cd = (unsigned char *)d;
+ unsigned char *cd = d;
if (c == -1)
- c = strlen((char *)cd);
+ c = strlen(d);
if (auth_debug_mode) {
printf(%s:%d: [%d] (%d),
-str_data[3] == TELQUAL_IS ? IS : REPLY,
-str_data[3],
-type, c);
+ str_data[3] == TELQUAL_IS ? IS : REPLY,
+ str_data[3], type, c);
printd(d, c);
printf(\r\n);
}
@@ -111,7 +112,7 @@
*p++ = SE;
if (str_data[3] == TELQUAL_IS)
printsub('', str_data[2], p - (str_data[2]));
-return(telnet_net_write(str_data, p - str_data));
+return telnet_net_write(str_data, p - str_data);
}
int
@@ -122,21 +123,21 @@
else
str_data[3] = TELQUAL_IS;
- user = (char *)malloc(256);
- xuser = (char *)malloc(513);
- pass = (char *)malloc(256);
- xpass = (char *)malloc(513);
- passprompt = (char *)malloc(256);
- xpassprompt = (char *)malloc(513);
+ user = malloc(SMALL_LEN);
+ xuser = malloc(XSMALL_LEN);
+ pass = malloc(SMALL_LEN);
+ xpass = malloc(XSMALL_LEN);
+ passprompt = malloc(SMALL_LEN);
+ xpassprompt = malloc(XSMALL_LEN);
if (user == NULL || xuser == NULL || pass == NULL || xpass ==
- NULL || passprompt == NULL || xpassprompt == NULL)
+ NULL || passprompt == NULL || xpassprompt == NULL)
return 0; /* malloc failed */
passwd_sent = 0;
- genkeys(pka,ska);
- return(1);
+ genkeys(pka, ska);
+ return 1;
}
/* client received a go-ahead for sra */
@@ -151,10 +152,10 @@
if (!Data(ap, SRA_KEY, (void *)pka, HEXKEYBYTES)) {
if (auth_debug_mode)
printf(Not enough room for authentication data\r\n);
- return(0);
+ return 0;
}
- return(1);
+ return 1;
}
/* server received an IS -- could be SRA KEY, USER, or PASS */
@@ -184,40 +185,40 @@
printf(Not enough room\r\n);
return;
}
- memcpy(pkb,data,HEXKEYBYTES);
+ memcpy(pkb, data, HEXKEYBYTES);
pkb[HEXKEYBYTES] = '\0';
- common_key(ska,pkb,ik,ck);
+ common_key(ska, pkb, ik, ck);
return;
case SRA_USER:
/* decode KAB(u) */
- if (cnt 512) /* Attempted buffer overflow */
+ if (cnt XSMALL_LEN - 1) /* Attempted buffer overflow */
break;
- memcpy(xuser,data,cnt);
+ memcpy(xuser, data, cnt);
xuser[cnt] = '\0';
- pk_decode(xuser,user,ck);
+ pk_decode(xuser, user, ck);
auth_encrypt_user(user);
#ifndef NOPAM
(void)check_user(user, *);
#endif
- pk_encode(passprompt,xpassprompt,ck);
- Data(ap, SRA_CONTINUE, (void *)xpassprompt, 512);
+ pk_encode(passprompt, xpassprompt, ck);
+ Data(ap, SRA_CONTINUE, xpassprompt, XSMALL_LEN - 1);
return;
case SRA_PASS:
- if (cnt 512) /* Attempted buffer overflow */
+ if (cnt XSMALL_LEN - 1) /* Attempted buffer overflow */
break;
/* decode KAB(P) */
- memcpy(xpass,data,cnt);
+ memcpy(xpass, data, cnt);
xpass[cnt] = '\0';
- pk_decode(xpass,pass,ck);
+ pk_decode(xpass, pass, ck);
/* check user's password */
- valid = check_user(user,pass);
+ valid = check_user(user, pass);
if(valid) {
- /* PAM (via check_user()) may have changed 'user' */
+ /* PAM (via check_user()) may have changed 'user' */
auth_encrypt_user(user);
Data(ap, SRA_ACCEPT, (void *)0, 0);
skey.data = ck;
@@ -232,13 +233,9 @@
}
}
else {
- pk_encode(passprompt,xpassprompt,ck);
- Data(ap, SRA_CONTINUE, (void *)xpassprompt, 512);
-/*
- Data(ap, SRA_REJECT, (void *)0, 0);
- sra_valid = 0;
- auth_finished(ap, AUTH_REJECT);
-*/
+
CVS commit: src/sys/arch/amiga/conf
Module Name:src Committed By: rkujawa Date: Fri Jul 1 15:46:30 UTC 2011 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL Log Message: Fix DRACO kernel breakage introduced by my previous commit. To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.268 -r1.269 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.80 -r1.81 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amiga/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.138 src/sys/arch/amiga/conf/DRACO:1.139 --- src/sys/arch/amiga/conf/DRACO:1.138 Thu Jun 30 20:09:18 2011 +++ src/sys/arch/amiga/conf/DRACO Fri Jul 1 15:46:30 2011 @@ -1,10 +1,11 @@ -# $NetBSD: DRACO,v 1.138 2011/06/30 20:09:18 wiz Exp $ +# $NetBSD: DRACO,v 1.139 2011/07/01 15:46:30 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.77 2011/01/14 10:01:12 phx Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $ # +## # GENERIC machine description file # # This machine description file is used to generate the default NetBSD @@ -28,7 +29,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.138 $ +#ident GENERIC-$Revision: 1.139 $ maxusers 8 @@ -320,7 +321,6 @@ ch* at scsibus? target ? lun ? # scsi autochangers ss* at scsibus? target ? lun ? # scsi scanner uk* at scsibus? target ? lun ? # scsi unknown - # # accept filters pseudo-device accf_data # dataready accept filter Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.268 src/sys/arch/amiga/conf/GENERIC:1.269 --- src/sys/arch/amiga/conf/GENERIC:1.268 Fri Jul 1 13:30:18 2011 +++ src/sys/arch/amiga/conf/GENERIC Fri Jul 1 15:46:30 2011 @@ -1,10 +1,11 @@ -# $NetBSD: GENERIC,v 1.268 2011/07/01 13:30:18 rkujawa Exp $ +# $NetBSD: GENERIC,v 1.269 2011/07/01 15:46:30 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.77 2011/01/14 10:01:12 phx Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $ # +## # GENERIC machine description file # # This machine description file is used to generate the default NetBSD @@ -28,7 +29,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.268 $ +#ident GENERIC-$Revision: 1.269 $ maxusers 8 @@ -546,7 +547,6 @@ pseudo-device ksyms # /dev/ksyms (kernel symbols) pseudo-device nsmb # experimental - SMB requester - pseudo-device bcsp# BlueCore Serial Protocol pseudo-device btuart # Bluetooth HCI UART (H4) Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.80 src/sys/arch/amiga/conf/GENERIC.in:1.81 --- src/sys/arch/amiga/conf/GENERIC.in:1.80 Fri Jul 1 13:30:18 2011 +++ src/sys/arch/amiga/conf/GENERIC.in Fri Jul 1 15:46:30 2011 @@ -1,5 +1,6 @@ -# $NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.81 2011/07/01 15:46:30 rkujawa Exp $ # +## # GENERIC machine description file # # This machine description file is used to generate the default NetBSD @@ -56,7 +57,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.80 $ +#ident GENERIC-$Revision: 1.81 $ m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS=-Os @@ -566,6 +567,8 @@ m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl ss* at scsibus? target ? lun ? # scsi scanner uk* at scsibus? target ? lun ? # scsi unknown +')m4_dnl +m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl # Bluetooth Controller and Device support # tested only with btuart on an A1200 @@ -597,8 +600,8 @@ # Bluetooth Audio support #btsco* at bthub? -')m4_dnl +')m4_dnl m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl # # accept filters @@ -668,7 +671,8 @@ m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl pseudo-device ksyms # /dev/ksyms (kernel symbols) pseudo-device nsmb # experimental - SMB requester - +')m4_dnl +m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl pseudo-device bcsp# BlueCore Serial Protocol pseudo-device btuart # Bluetooth HCI UART (H4) ')m4_dnl Index: src/sys/arch/amiga/conf/INSTALL diff -u src/sys/arch/amiga/conf/INSTALL:1.90 src/sys/arch/amiga/conf/INSTALL:1.91 --- src/sys/arch/amiga/conf/INSTALL:1.90 Thu Jun 30 20:09:18 2011 +++ src/sys/arch/amiga/conf/INSTALL Fri Jul 1 15:46:30 2011 @@ -1,10 +1,11 @@ -# $NetBSD: INSTALL,v 1.90 2011/06/30 20:09:18 wiz Exp $ +# $NetBSD: INSTALL,v 1.91 2011/07/01 15:46:30
CVS commit: src/sys/dev/nand
Module Name:src
Committed By: ahoka
Date: Fri Jul 1 16:46:13 UTC 2011
Modified Files:
src/sys/dev/nand: nand.c nand.h
Log Message:
Make this actually compile by adding a wrapper function which calls
flash_io_submit.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/nand/nand.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/nand/nand.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nand/nand.c
diff -u src/sys/dev/nand/nand.c:1.13 src/sys/dev/nand/nand.c:1.14
--- src/sys/dev/nand/nand.c:1.13 Tue Jun 28 18:14:11 2011
+++ src/sys/dev/nand/nand.c Fri Jul 1 16:46:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nand.c,v 1.13 2011/06/28 18:14:11 ahoka Exp $ */
+/* $NetBSD: nand.c,v 1.14 2011/07/01 16:46:13 ahoka Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,7 @@
/* Common driver for NAND chips implementing the ONFI 2.2 specification */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nand.c,v 1.13 2011/06/28 18:14:11 ahoka Exp $);
+__KERNEL_RCSID(0, $NetBSD: nand.c,v 1.14 2011/07/01 16:46:13 ahoka Exp $);
#include locators.h
@@ -84,7 +84,7 @@
.block_isbad = nand_flash_isbad,
.block_markbad = nand_flash_markbad,
- .submit = nand_io_submit
+ .submit = nand_flash_submit
};
#ifdef NAND_VERBOSE
@@ -228,7 +228,7 @@
return error;
}
- nand_sync_thread_stop(self);
+ flash_sync_thread_destroy(sc-sc_flash_io);
#ifdef NAND_BBT
nand_bbt_detach(self);
#endif
@@ -1036,6 +1036,14 @@
/* implementation of the block device API */
+int
+nand_flash_submit(device_t self, struct buf *bp)
+{
+ struct nand_softc *sc = device_private(self);
+
+ return flash_io_submit(sc-sc_flash_io, bp);
+}
+
/*
* handle (page) unaligned write to nand
*/
Index: src/sys/dev/nand/nand.h
diff -u src/sys/dev/nand/nand.h:1.11 src/sys/dev/nand/nand.h:1.12
--- src/sys/dev/nand/nand.h:1.11 Tue Jun 28 18:14:11 2011
+++ src/sys/dev/nand/nand.h Fri Jul 1 16:46:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nand.h,v 1.11 2011/06/28 18:14:11 ahoka Exp $ */
+/* $NetBSD: nand.h,v 1.12 2011/07/01 16:46:13 ahoka Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -452,15 +452,11 @@
int nand_flash_write(device_t, flash_off_t, size_t, size_t *, const u_char *);
int nand_flash_read(device_t, flash_off_t, size_t, size_t *, uint8_t *);
int nand_flash_erase(device_t, struct flash_erase_instruction *);
+int nand_flash_submit(device_t, struct buf *);
/* nand specific functions */
int nand_erase_block(device_t, size_t);
-int nand_io_submit(device_t, struct buf *);
-void nand_sync_thread(void *);
-int nand_sync_thread_start(device_t);
-void nand_sync_thread_stop(device_t);
-
bool nand_isfactorybad(device_t, flash_off_t);
bool nand_iswornoutbad(device_t, flash_off_t);
bool nand_isbad(device_t, flash_off_t);
CVS commit: src/sys/arch/prep/pnpbus
Module Name:src
Committed By: dyoung
Date: Fri Jul 1 16:55:42 UTC 2011
Modified Files:
src/sys/arch/prep/pnpbus: fdc_pnpbus.c if_we_pnpbus.c mcclock_pnpbus.c
mkclock_pnpbus.c pnpbus.c pnpbusvar.h wdc_pnpbus.c
Log Message:
#include sys/bus.h instead of machine/bus.h.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/prep/pnpbus/fdc_pnpbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/prep/pnpbus/if_we_pnpbus.c \
src/sys/arch/prep/pnpbus/pnpbusvar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c \
src/sys/arch/prep/pnpbus/wdc_pnpbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/pnpbus/mkclock_pnpbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/pnpbus/pnpbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/prep/pnpbus/fdc_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.2 src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.3
--- src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.2 Tue Apr 29 06:53:02 2008
+++ src/sys/arch/prep/pnpbus/fdc_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pnpbus.c,v 1.2 2008/04/29 06:53:02 martin Exp $ */
+/* $NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fdc_pnpbus.c,v 1.2 2008/04/29 06:53:02 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $);
#include rnd.h
@@ -48,7 +48,7 @@
#include sys/rnd.h
#endif
-#include machine/bus.h
+#include sys/bus.h
#include machine/intr.h
#include machine/isa_machdep.h
Index: src/sys/arch/prep/pnpbus/if_we_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/if_we_pnpbus.c:1.7 src/sys/arch/prep/pnpbus/if_we_pnpbus.c:1.8
--- src/sys/arch/prep/pnpbus/if_we_pnpbus.c:1.7 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/prep/pnpbus/if_we_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_pnpbus.c,v 1.7 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: if_we_pnpbus.c,v 1.8 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_we_pnpbus.c,v 1.7 2011/06/18 08:08:29 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_we_pnpbus.c,v 1.8 2011/07/01 16:55:42 dyoung Exp $);
#include sys/types.h
#include sys/param.h
@@ -67,7 +67,7 @@
#include net/if_ether.h
-#include machine/bus.h
+#include sys/bus.h
#include machine/intr.h
#include machine/isa_machdep.h
#include machine/residual.h
Index: src/sys/arch/prep/pnpbus/pnpbusvar.h
diff -u src/sys/arch/prep/pnpbus/pnpbusvar.h:1.7 src/sys/arch/prep/pnpbus/pnpbusvar.h:1.8
--- src/sys/arch/prep/pnpbus/pnpbusvar.h:1.7 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/prep/pnpbus/pnpbusvar.h Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbusvar.h,v 1.7 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: pnpbusvar.h,v 1.8 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _PREP_PNPBUSVAR_H_
#include sys/queue.h
-#include machine/bus.h
+#include sys/bus.h
#include machine/residual.h
struct pnpbus_mem {
Index: src/sys/arch/prep/pnpbus/mcclock_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.9 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.10
--- src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.9 Mon Apr 28 20:23:33 2008
+++ src/sys/arch/prep/pnpbus/mcclock_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mcclock_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $);
#include sys/types.h
#include sys/param.h
@@ -47,7 +47,7 @@
#include sys/device.h
#include sys/malloc.h
-#include machine/bus.h
+#include sys/bus.h
#include machine/intr.h
#include machine/isa_machdep.h
#include machine/residual.h
Index: src/sys/arch/prep/pnpbus/wdc_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.9 src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.10
--- src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.9 Mon Apr 28 20:23:33 2008
+++ src/sys/arch/prep/pnpbus/wdc_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: wdc_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wdc_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: wdc_pnpbus.c,v
CVS commit: src/sys/arch/prep/pci
Module Name:src Committed By: dyoung Date: Fri Jul 1 16:56:52 UTC 2011 Modified Files: src/sys/arch/prep/pci: gten.c pceb.c pci_machdep.c prep_pciconf_direct.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/prep/pci/gten.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/pci/pceb.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/prep/pci/pci_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/prep/pci/prep_pciconf_direct.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/prep/pci/gten.c diff -u src/sys/arch/prep/pci/gten.c:1.19 src/sys/arch/prep/pci/gten.c:1.20 --- src/sys/arch/prep/pci/gten.c:1.19 Sat Jun 18 08:08:29 2011 +++ src/sys/arch/prep/pci/gten.c Fri Jul 1 16:56:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gten.c,v 1.19 2011/06/18 08:08:29 matt Exp $ */ +/* $NetBSD: gten.c,v 1.20 2011/07/01 16:56:52 dyoung Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gten.c,v 1.19 2011/06/18 08:08:29 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: gten.c,v 1.20 2011/07/01 16:56:52 dyoung Exp $); #include sys/param.h #include sys/buf.h @@ -51,7 +51,7 @@ #include dev/wscons/wsdisplayvar.h #include dev/rasops/rasops.h -#include machine/bus.h +#include sys/bus.h #include machine/gtenvar.h static int gten_match(device_t, cfdata_t, void *); Index: src/sys/arch/prep/pci/pceb.c diff -u src/sys/arch/prep/pci/pceb.c:1.5 src/sys/arch/prep/pci/pceb.c:1.6 --- src/sys/arch/prep/pci/pceb.c:1.5 Sat Jun 18 08:08:29 2011 +++ src/sys/arch/prep/pci/pceb.c Fri Jul 1 16:56:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pceb.c,v 1.5 2011/06/18 08:08:29 matt Exp $ */ +/* $NetBSD: pceb.c,v 1.6 2011/07/01 16:56:52 dyoung Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pceb.c,v 1.5 2011/06/18 08:08:29 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pceb.c,v 1.6 2011/07/01 16:56:52 dyoung Exp $); #include sys/types.h #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include dev/isa/isavar.h #include dev/eisa/eisavar.h Index: src/sys/arch/prep/pci/pci_machdep.c diff -u src/sys/arch/prep/pci/pci_machdep.c:1.36 src/sys/arch/prep/pci/pci_machdep.c:1.37 --- src/sys/arch/prep/pci/pci_machdep.c:1.36 Thu Jun 30 00:53:00 2011 +++ src/sys/arch/prep/pci/pci_machdep.c Fri Jul 1 16:56:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.36 2011/06/30 00:53:00 matt Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.37 2011/07/01 16:56:52 dyoung Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.36 2011/06/30 00:53:00 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.37 2011/07/01 16:56:52 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -53,7 +53,7 @@ #include uvm/uvm_extern.h #define _POWERPC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/platform.h #include machine/pnp.h Index: src/sys/arch/prep/pci/prep_pciconf_direct.c diff -u src/sys/arch/prep/pci/prep_pciconf_direct.c:1.7 src/sys/arch/prep/pci/prep_pciconf_direct.c:1.8 --- src/sys/arch/prep/pci/prep_pciconf_direct.c:1.7 Sat Jun 18 08:08:29 2011 +++ src/sys/arch/prep/pci/prep_pciconf_direct.c Fri Jul 1 16:56:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: prep_pciconf_direct.c,v 1.7 2011/06/18 08:08:29 matt Exp $ */ +/* $NetBSD: prep_pciconf_direct.c,v 1.8 2011/07/01 16:56:52 dyoung Exp $ */ /* * Copyright (c) 2002 Klaus J. Klein. All rights reserved. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: prep_pciconf_direct.c,v 1.7 2011/06/18 08:08:29 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: prep_pciconf_direct.c,v 1.8 2011/07/01 16:56:52 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -51,7 +51,7 @@ #include uvm/uvm_extern.h #define _POWERPC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/platform.h
CVS commit: src/sys/arch/prep/isa
Module Name:src Committed By: dyoung Date: Fri Jul 1 16:57:29 UTC 2011 Modified Files: src/sys/arch/prep/isa: paud_isa.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/prep/isa/paud_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/prep/isa/paud_isa.c diff -u src/sys/arch/prep/isa/paud_isa.c:1.13 src/sys/arch/prep/isa/paud_isa.c:1.14 --- src/sys/arch/prep/isa/paud_isa.c:1.13 Thu Jun 2 14:12:25 2011 +++ src/sys/arch/prep/isa/paud_isa.c Fri Jul 1 16:57:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: paud_isa.c,v 1.13 2011/06/02 14:12:25 tsutsui Exp $ */ +/* $NetBSD: paud_isa.c,v 1.14 2011/07/01 16:57:29 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: paud_isa.c,v 1.13 2011/06/02 14:12:25 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: paud_isa.c,v 1.14 2011/07/01 16:57:29 dyoung Exp $); #include audio.h #if NAUDIO 0 @@ -41,7 +41,7 @@ #include sys/device.h #include sys/malloc.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include sys/audioio.h
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: dyoung Date: Fri Jul 1 17:28:55 UTC 2011 Added Files: src/sys/arch/mips/include: bus_dma_defs.h bus_dma_funcs.h bus_space_defs.h bus_space_funcs.h Log Message: Add new files involved in the bus.h-bus_defs.h/bus_funcs.h split. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/include/bus_dma_defs.h \ src/sys/arch/mips/include/bus_dma_funcs.h \ src/sys/arch/mips/include/bus_space_defs.h \ src/sys/arch/mips/include/bus_space_funcs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/mips/include/bus_dma_defs.h diff -u /dev/null src/sys/arch/mips/include/bus_dma_defs.h:1.1 --- /dev/null Fri Jul 1 17:28:55 2011 +++ src/sys/arch/mips/include/bus_dma_defs.h Fri Jul 1 17:28:55 2011 @@ -0,0 +1,295 @@ +/* $NetBSD: bus_dma_defs.h,v 1.1 2011/07/01 17:28:55 dyoung Exp $ */ + +/*- + * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS AS IS + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or software.distribut...@cs.cmu.edu + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#ifndef _MIPS_BUS_DMA_DEFS_H_ +#define _MIPS_BUS_DMA_DEFS_H_ + +#include sys/types.h + +#ifdef _KERNEL +/* + * Bus DMA methods. + */ + +/* + * Flags used in various bus DMA methods. + */ +#define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */ +#define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */ +#define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */ +#define BUS_DMA_COHERENT 0x004 /* hint: map memory DMA coherent */ +#define BUS_DMA_STREAMING 0x008 /* hint: sequential, unidirectional */ +#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */ +#define BUS_DMA_BUS2 0x020 +#define BUS_DMA_BUS3 0x040 +#define BUS_DMA_BUS4 0x080 +#define BUS_DMA_READ 0x100 /* mapping is device - memory only */ +#define BUS_DMA_WRITE 0x200 /* mapping is memory - device only */ +#define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */ + +/* + * Private flags stored in the DMA map. + */ +#define _BUS_DMAMAP_COHERENT 0x1 /* no cache flush necessary on sync */ + +/* Forwards needed by prototypes below. */ +struct mbuf; +struct uio; + +/* + * Operations performed by bus_dmamap_sync(). + */ +#define BUS_DMASYNC_PREREAD 0x01 /* pre-read synchronization */ +#define BUS_DMASYNC_POSTREAD 0x02 /* post-read synchronization */ +#define BUS_DMASYNC_PREWRITE 0x04 /* pre-write synchronization */ +#define
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: dyoung Date: Fri Jul 1 17:29:40 UTC 2011 Added Files: src/sys/arch/powerpc/include: ofw_bus_defs.h ofw_bus_funcs.h prep_bus_defs.h prep_bus_funcs.h Log Message: Add new files involved in the bus.h-bus_defs.h/bus_funcs.h split. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/ofw_bus_defs.h \ src/sys/arch/powerpc/include/ofw_bus_funcs.h \ src/sys/arch/powerpc/include/prep_bus_defs.h \ src/sys/arch/powerpc/include/prep_bus_funcs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/powerpc/include/ofw_bus_defs.h diff -u /dev/null src/sys/arch/powerpc/include/ofw_bus_defs.h:1.1 --- /dev/null Fri Jul 1 17:29:40 2011 +++ src/sys/arch/powerpc/include/ofw_bus_defs.h Fri Jul 1 17:29:39 2011 @@ -0,0 +1,46 @@ +/* $NetBSD: ofw_bus_defs.h,v 1.1 2011/07/01 17:29:39 dyoung Exp $ */ + +/*- + * Copyright (c) 2007 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Tim Rightnour + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _POWERPC_OFW_BUS_DEFS_H_ +#define _POWERPC_OFW_BUS_DEFS_H_ + +#define RANGE_TYPE_PCI 1 +#define RANGE_TYPE_ISA 2 +#define RANGE_TYPE_MACIO 3 +#define RANGE_TYPE_FIRSTPCI 4 +#define RANGE_IO 1 +#define RANGE_MEM 2 + +#ifndef EXSTORAGE_MAX +#define EXSTORAGE_MAX 12 +#endif + +#endif /* _POWERPC_OFW_BUS_DEFS_H_ */ Index: src/sys/arch/powerpc/include/ofw_bus_funcs.h diff -u /dev/null src/sys/arch/powerpc/include/ofw_bus_funcs.h:1.1 --- /dev/null Fri Jul 1 17:29:40 2011 +++ src/sys/arch/powerpc/include/ofw_bus_funcs.h Fri Jul 1 17:29:39 2011 @@ -0,0 +1,47 @@ +/* $NetBSD: ofw_bus_funcs.h,v 1.1 2011/07/01 17:29:39 dyoung Exp $ */ + +/*- + * Copyright (c) 2007 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Tim Rightnour + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _POWERPC_OFW_BUS_FUNCS_H_ +#define _POWERPC_OFW_BUS_FUNCS_H_ + +#ifdef _KERNEL +extern struct powerpc_bus_space genppc_isa_io_space_tag; +extern struct powerpc_bus_space genppc_isa_mem_space_tag; + +#include machine/powerpc.h + +void ofwoea_bus_space_init(void); +void ofwoea_initppc(u_int, u_int, char
CVS commit: src/share/man/man9
Module Name:src Committed By: dyoung Date: Fri Jul 1 17:34:44 UTC 2011 Modified Files: src/share/man/man9: ioasic.9 tc.9 vme.9 Log Message: Reference sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/ioasic.9 \ src/share/man/man9/tc.9 cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/vme.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/ioasic.9 diff -u src/share/man/man9/ioasic.9:1.11 src/share/man/man9/ioasic.9:1.12 --- src/share/man/man9/ioasic.9:1.11 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/ioasic.9 Fri Jul 1 17:34:44 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ioasic.9,v 1.11 2010/12/02 12:54:13 wiz Exp $ +.\ $NetBSD: ioasic.9,v 1.12 2011/07/01 17:34:44 dyoung Exp $ .\ .\ Copyright (c) 2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -39,7 +39,7 @@ .Nm ioasic_submatch .Nd baseboard I/O control ASIC for DEC TURBOchannel systems .Sh SYNOPSIS -.In machine/bus.h +.In sys/bus.h .In dev/tc/tcvar.h .In dev/tc/ioasicreg.h .In dev/tc/ioasicvar.h Index: src/share/man/man9/tc.9 diff -u src/share/man/man9/tc.9:1.11 src/share/man/man9/tc.9:1.12 --- src/share/man/man9/tc.9:1.11 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/tc.9 Fri Jul 1 17:34:44 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: tc.9,v 1.11 2010/12/02 12:54:13 wiz Exp $ +.\ $NetBSD: tc.9,v 1.12 2011/07/01 17:34:44 dyoung Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -43,7 +43,7 @@ .Nm TC_PHYS_TO_UNCACHED .Nd TURBOchannel bus .Sh SYNOPSIS -.In machine/bus.h +.In sys/bus.h .In dev/tc/tcvar.h .In dev/tc/tcdevs.h .Ft void Index: src/share/man/man9/vme.9 diff -u src/share/man/man9/vme.9:1.12 src/share/man/man9/vme.9:1.13 --- src/share/man/man9/vme.9:1.12 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/vme.9 Fri Jul 1 17:34:44 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: vme.9,v 1.12 2010/12/02 12:54:13 wiz Exp $ +.\ $NetBSD: vme.9,v 1.13 2011/07/01 17:34:44 dyoung Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -48,7 +48,7 @@ .Nm vme_space_get .Nd Versa Module Euroboard bus .Sh SYNOPSIS -.In machine/bus.h +.In sys/bus.h .In dev/vme/vmereg.h .In dev/vme/vmevar.h .Ft int
CVS commit: src/sys/arch/i386/pci
Module Name:src Committed By: dyoung Date: Fri Jul 1 17:37:27 UTC 2011 Modified Files: src/sys/arch/i386/pci: ali1543.c amd756.c elan520.c gcscehci.c geode.c geodecntr.c geodewdg.c gscpcib.c opti82c558.c opti82c700.c pceb.c pci_intr_fixup.c pcmb.c piix.c piixpcib.c sis85c503.c via8231.c via82c586.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/pci/ali1543.c \ src/sys/arch/i386/pci/via82c586.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/pci/amd756.c \ src/sys/arch/i386/pci/gcscehci.c src/sys/arch/i386/pci/geodecntr.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/pci/elan520.c \ src/sys/arch/i386/pci/pci_intr_fixup.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pci/geode.c \ src/sys/arch/i386/pci/piix.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/pci/geodewdg.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/pci/gscpcib.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/pci/opti82c558.c \ src/sys/arch/i386/pci/opti82c700.c src/sys/arch/i386/pci/sis85c503.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/pci/pceb.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/pci/pcmb.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/pci/piixpcib.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/pci/via8231.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/pci/ali1543.c diff -u src/sys/arch/i386/pci/ali1543.c:1.11 src/sys/arch/i386/pci/ali1543.c:1.12 --- src/sys/arch/i386/pci/ali1543.c:1.11 Tue Dec 15 22:17:12 2009 +++ src/sys/arch/i386/pci/ali1543.c Fri Jul 1 17:37:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $ */ +/* $NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $ */ /* * Copyright (c) 2001 @@ -84,7 +84,7 @@ /* HAYAKAWA Koichi wrote ALi 1543 PCI ICU code basing on VIA82C586 driver */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -94,7 +94,7 @@ #include sys/proc.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/i386/pci/via82c586.c diff -u src/sys/arch/i386/pci/via82c586.c:1.11 src/sys/arch/i386/pci/via82c586.c:1.12 --- src/sys/arch/i386/pci/via82c586.c:1.11 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/i386/pci/via82c586.c Fri Jul 1 17:37:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: via82c586.c,v 1.11 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: via82c586.c,v 1.12 2011/07/01 17:37:27 dyoung Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -60,14 +60,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: via82c586.c,v 1.11 2008/04/28 20:23:25 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: via82c586.c,v 1.12 2011/07/01 17:37:27 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/i386/pci/amd756.c diff -u src/sys/arch/i386/pci/amd756.c:1.8 src/sys/arch/i386/pci/amd756.c:1.9 --- src/sys/arch/i386/pci/amd756.c:1.8 Mon Apr 28 20:23:24 2008 +++ src/sys/arch/i386/pci/amd756.c Fri Jul 1 17:37:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: amd756.c,v 1.8 2008/04/28 20:23:24 martin Exp $ */ +/* $NetBSD: amd756.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $ */ /*- * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: amd756.c,v 1.8 2008/04/28 20:23:24 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: amd756.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -68,7 +68,7 @@ #include sys/malloc.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/i386/pci/gcscehci.c diff -u src/sys/arch/i386/pci/gcscehci.c:1.8 src/sys/arch/i386/pci/gcscehci.c:1.9 --- src/sys/arch/i386/pci/gcscehci.c:1.8 Tue May 25 08:37:10 2010 +++ src/sys/arch/i386/pci/gcscehci.c Fri Jul 1 17:37:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $ */ +/* $NetBSD: gcscehci.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: gcscehci.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -40,7 +40,7 @@ #include sys/proc.h #include sys/queue.h -#include machine/bus.h +#include sys/bus.h #include
CVS commit: src/sys/arch/i386/isa
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:11:24 UTC 2011 Modified Files: src/sys/arch/i386/isa: ahc_isa.c cmos.c isapnp_machdep.c lms.c mms.c npx_isa.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/isa/ahc_isa.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/isa/cmos.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/isa/isapnp_machdep.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/isa/lms.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/isa/mms.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/isa/npx_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/isa/ahc_isa.c diff -u src/sys/arch/i386/isa/ahc_isa.c:1.38 src/sys/arch/i386/isa/ahc_isa.c:1.39 --- src/sys/arch/i386/isa/ahc_isa.c:1.38 Sun Feb 28 15:52:16 2010 +++ src/sys/arch/i386/isa/ahc_isa.c Fri Jul 1 18:11:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ahc_isa.c,v 1.38 2010/02/28 15:52:16 snj Exp $ */ +/* $NetBSD: ahc_isa.c,v 1.39 2011/07/01 18:11:24 dyoung Exp $ */ /* * Product specific probe and attach routines for: @@ -110,7 +110,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ahc_isa.c,v 1.38 2010/02/28 15:52:16 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ahc_isa.c,v 1.39 2011/07/01 18:11:24 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -120,7 +120,7 @@ #include sys/malloc.h #include sys/reboot.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/scsipi/scsi_all.h Index: src/sys/arch/i386/isa/cmos.c diff -u src/sys/arch/i386/isa/cmos.c:1.8 src/sys/arch/i386/isa/cmos.c:1.9 --- src/sys/arch/i386/isa/cmos.c:1.8 Mon Oct 19 23:19:38 2009 +++ src/sys/arch/i386/isa/cmos.c Fri Jul 1 18:11:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $ */ +/* $NetBSD: cmos.c,v 1.9 2011/07/01 18:11:24 dyoung Exp $ */ /* * Copyright (C) 2003 JONE System Co., Inc. @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: cmos.c,v 1.9 2011/07/01 18:11:24 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -71,7 +71,7 @@ #include sys/conf.h #include sys/kauth.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/isa/isareg.h Index: src/sys/arch/i386/isa/isapnp_machdep.c diff -u src/sys/arch/i386/isa/isapnp_machdep.c:1.16 src/sys/arch/i386/isa/isapnp_machdep.c:1.17 --- src/sys/arch/i386/isa/isapnp_machdep.c:1.16 Wed Apr 28 19:17:03 2010 +++ src/sys/arch/i386/isa/isapnp_machdep.c Fri Jul 1 18:11:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isapnp_machdep.c,v 1.16 2010/04/28 19:17:03 dyoung Exp $ */ +/* $NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -45,14 +45,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: isapnp_machdep.c,v 1.16 2010/04/28 19:17:03 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include sys/malloc.h -#include machine/bus.h +#include sys/bus.h #include dev/isa/isavar.h Index: src/sys/arch/i386/isa/lms.c diff -u src/sys/arch/i386/isa/lms.c:1.55 src/sys/arch/i386/isa/lms.c:1.56 --- src/sys/arch/i386/isa/lms.c:1.55 Mon May 4 12:14:31 2009 +++ src/sys/arch/i386/isa/lms.c Fri Jul 1 18:11:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $ */ +/* $NetBSD: lms.c,v 1.56 2011/07/01 18:11:24 dyoung Exp $ */ /*- * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -24,14 +24,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: lms.c,v 1.56 2011/07/01 18:11:24 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/ioctl.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/isa/isavar.h Index: src/sys/arch/i386/isa/mms.c diff -u src/sys/arch/i386/isa/mms.c:1.52 src/sys/arch/i386/isa/mms.c:1.53 --- src/sys/arch/i386/isa/mms.c:1.52 Mon May 4 12:14:31 2009 +++ src/sys/arch/i386/isa/mms.c Fri Jul 1 18:11:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $ */ +/* $NetBSD: mms.c,v 1.53 2011/07/01 18:11:24 dyoung Exp $ */ /*- * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -24,7 +24,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: mms.c,v 1.53 2011/07/01 18:11:24 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -32,7 +32,7 @@ #include sys/device.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include
CVS commit: src/sys/arch/i386
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:14:15 UTC 2011 Modified Files: src/sys/arch/i386/acpi: npx_acpi.c src/sys/arch/i386/eisa: eisa_machdep.c src/sys/arch/i386/i386: genassym.cf machdep.c rbus_machdep.c src/sys/arch/i386/mca: mca_machdep.c src/sys/arch/i386/pnpbios: atppc_pnpbios.c com_pnpbios.c ess_pnpbios.c fdc_pnpbios.c joy_pnpbios.c lm_pnpbios.c lpt_pnpbios.c npx_pnpbios.c pciide_pnpbios.c sb_pnpbios.c wss_pnpbios.c ym_pnpbios.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/acpi/npx_acpi.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/eisa/eisa_machdep.c cvs rdiff -u -r1.89 -r1.90 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.705 -r1.706 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/rbus_machdep.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/i386/mca/mca_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/pnpbios/atppc_pnpbios.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pnpbios/com_pnpbios.c \ src/sys/arch/i386/pnpbios/lm_pnpbios.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/pnpbios/ess_pnpbios.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/pnpbios/fdc_pnpbios.c \ src/sys/arch/i386/pnpbios/sb_pnpbios.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pnpbios/joy_pnpbios.c \ src/sys/arch/i386/pnpbios/npx_pnpbios.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/pnpbios/lpt_pnpbios.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/pnpbios/pciide_pnpbios.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/pnpbios/wss_pnpbios.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/pnpbios/ym_pnpbios.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/acpi/npx_acpi.c diff -u src/sys/arch/i386/acpi/npx_acpi.c:1.18 src/sys/arch/i386/acpi/npx_acpi.c:1.19 --- src/sys/arch/i386/acpi/npx_acpi.c:1.18 Sat Feb 21 00:30:37 2009 +++ src/sys/arch/i386/acpi/npx_acpi.c Fri Jul 1 18:14:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: npx_acpi.c,v 1.18 2009/02/21 00:30:37 jmcneill Exp $ */ +/* $NetBSD: npx_acpi.c,v 1.19 2011/07/01 18:14:15 dyoung Exp $ */ /* * Copyright (c) 2002 Jared D. McNeill jmcne...@invisible.ca @@ -26,13 +26,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npx_acpi.c,v 1.18 2009/02/21 00:30:37 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: npx_acpi.c,v 1.19 2011/07/01 18:14:15 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/cpufunc.h #include machine/intr.h #include machine/specialreg.h Index: src/sys/arch/i386/eisa/eisa_machdep.c diff -u src/sys/arch/i386/eisa/eisa_machdep.c:1.34 src/sys/arch/i386/eisa/eisa_machdep.c:1.35 --- src/sys/arch/i386/eisa/eisa_machdep.c:1.34 Tue Nov 17 23:51:59 2009 +++ src/sys/arch/i386/eisa/eisa_machdep.c Fri Jul 1 18:14:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $ */ +/* $NetBSD: eisa_machdep.c,v 1.35 2011/07/01 18:14:15 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.35 2011/07/01 18:14:15 dyoung Exp $); #include ioapic.h @@ -76,7 +76,7 @@ #include sys/errno.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/bus_private.h #include dev/isa/isareg.h Index: src/sys/arch/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.89 src/sys/arch/i386/i386/genassym.cf:1.90 --- src/sys/arch/i386/i386/genassym.cf:1.89 Sun Jun 12 03:35:41 2011 +++ src/sys/arch/i386/i386/genassym.cf Fri Jul 1 18:14:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.89 2011/06/12 03:35:41 rmind Exp $ +# $NetBSD: genassym.cf,v 1.90 2011/07/01 18:14:15 dyoung Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -143,7 +143,7 @@ include machine/tlog.h -include x86/bus.h +include sys/bus.h define PAGE_SIZE PAGE_SIZE Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.705 src/sys/arch/i386/i386/machdep.c:1.706 --- src/sys/arch/i386/i386/machdep.c:1.705 Thu Jun 30 23:28:03 2011 +++ src/sys/arch/i386/i386/machdep.c Fri Jul 1 18:14:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $ */ +/* $NetBSD: machdep.c,v 1.706 2011/07/01 18:14:15 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.706 2011/07/01 18:14:15 dyoung Exp $); #include
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:15:11 UTC 2011 Modified Files: src/sys/arch/i386/include: mca_machdep.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/include/mca_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/include/mca_machdep.h diff -u src/sys/arch/i386/include/mca_machdep.h:1.14 src/sys/arch/i386/include/mca_machdep.h:1.15 --- src/sys/arch/i386/include/mca_machdep.h:1.14 Sun Apr 3 22:29:26 2011 +++ src/sys/arch/i386/include/mca_machdep.h Fri Jul 1 18:15:11 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mca_machdep.h,v 1.14 2011/04/03 22:29:26 dyoung Exp $ */ +/* $NetBSD: mca_machdep.h,v 1.15 2011/07/01 18:15:11 dyoung Exp $ */ /* * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #define _I386_MCA_MACHDEP_H_ #include sys/device.h /* for device_t */ -#include machine/bus.h +#include sys/bus.h /* * i386-specific definitions for MCA autoconfiguration.
CVS commit: src/sys/arch/i386/xbox
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:16:30 UTC 2011 Modified Files: src/sys/arch/i386/xbox: xbox.c xboxfb.c xboxlcd.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/xbox/xbox.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/xbox/xboxfb.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/xbox/xboxlcd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/xbox/xbox.c diff -u src/sys/arch/i386/xbox/xbox.c:1.5 src/sys/arch/i386/xbox/xbox.c:1.6 --- src/sys/arch/i386/xbox/xbox.c:1.5 Wed Apr 28 19:17:04 2010 +++ src/sys/arch/i386/xbox/xbox.c Fri Jul 1 18:16:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xbox.c,v 1.5 2010/04/28 19:17:04 dyoung Exp $ */ +/* $NetBSD: xbox.c,v 1.6 2011/07/01 18:16:30 dyoung Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca @@ -31,13 +31,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xbox.c,v 1.5 2010/04/28 19:17:04 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: xbox.c,v 1.6 2011/07/01 18:16:30 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include arch/i386/include/xbox.h Index: src/sys/arch/i386/xbox/xboxfb.c diff -u src/sys/arch/i386/xbox/xboxfb.c:1.14 src/sys/arch/i386/xbox/xboxfb.c:1.15 --- src/sys/arch/i386/xbox/xboxfb.c:1.14 Thu Dec 16 07:59:10 2010 +++ src/sys/arch/i386/xbox/xboxfb.c Fri Jul 1 18:16:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xboxfb.c,v 1.14 2010/12/16 07:59:10 cegger Exp $ */ +/* $NetBSD: xboxfb.c,v 1.15 2011/07/01 18:16:30 dyoung Exp $ */ /* * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xboxfb.c,v 1.14 2010/12/16 07:59:10 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: xboxfb.c,v 1.15 2011/07/01 18:16:30 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -46,7 +46,7 @@ #include uvm/uvm_extern.h /* #include machine/autoconf.h */ -#include machine/bus.h +#include sys/bus.h #include machine/xbox.h #include dev/pci/pcivar.h Index: src/sys/arch/i386/xbox/xboxlcd.c diff -u src/sys/arch/i386/xbox/xboxlcd.c:1.3 src/sys/arch/i386/xbox/xboxlcd.c:1.4 --- src/sys/arch/i386/xbox/xboxlcd.c:1.3 Tue Dec 11 12:00:56 2007 +++ src/sys/arch/i386/xbox/xboxlcd.c Fri Jul 1 18:16:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xboxlcd.c,v 1.3 2007/12/11 12:00:56 lukem Exp $ */ +/* $NetBSD: xboxlcd.c,v 1.4 2011/07/01 18:16:30 dyoung Exp $ */ /*- * Copyright (c) 2006 Andrew Gillham @@ -33,12 +33,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xboxlcd.c,v 1.3 2007/12/11 12:00:56 lukem Exp $); +__KERNEL_RCSID(0, $NetBSD: xboxlcd.c,v 1.4 2011/07/01 18:16:30 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/kernel.h -#include machine/bus.h +#include sys/bus.h #include machine/xbox.h #include machine/pio.h
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:21:31 UTC 2011 Modified Files: src/sys/arch/x86/x86: bus_dma.c consinit.c genfb_machdep.c mp.c mpacpi.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/bus_dma.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/x86/consinit.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/genfb_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/mp.c cvs rdiff -u -r1.91 -r1.92 src/sys/arch/x86/x86/mpacpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/bus_dma.c diff -u src/sys/arch/x86/x86/bus_dma.c:1.56 src/sys/arch/x86/x86/bus_dma.c:1.57 --- src/sys/arch/x86/x86/bus_dma.c:1.56 Sat Nov 6 11:46:03 2010 +++ src/sys/arch/x86/x86/bus_dma.c Fri Jul 1 18:21:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.56 2010/11/06 11:46:03 uebayasi Exp $ */ +/* $NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.56 2010/11/06 11:46:03 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $); /* * The following is included because _bus_dma_uiomove is derived from @@ -93,7 +93,7 @@ #include sys/mbuf.h #include sys/proc.h -#include machine/bus.h +#include sys/bus.h #include machine/bus_private.h #include machine/i82093var.h #include machine/mpbiosvar.h Index: src/sys/arch/x86/x86/consinit.c diff -u src/sys/arch/x86/x86/consinit.c:1.21 src/sys/arch/x86/x86/consinit.c:1.22 --- src/sys/arch/x86/x86/consinit.c:1.21 Wed Apr 28 19:17:04 2010 +++ src/sys/arch/x86/x86/consinit.c Fri Jul 1 18:21:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $ */ +/* $NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $ */ /* * Copyright (c) 1998 @@ -27,14 +27,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $); #include opt_kgdb.h #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/bootinfo.h #include arch/x86/include/genfb_machdep.h Index: src/sys/arch/x86/x86/genfb_machdep.c diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.9 src/sys/arch/x86/x86/genfb_machdep.c:1.10 --- src/sys/arch/x86/x86/genfb_machdep.c:1.9 Tue Feb 15 18:10:33 2011 +++ src/sys/arch/x86/x86/genfb_machdep.c Fri Jul 1 18:21:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb_machdep.c,v 1.9 2011/02/15 18:10:33 jruoho Exp $ */ +/* $NetBSD: genfb_machdep.c,v 1.10 2011/07/01 18:21:31 dyoung Exp $ */ /*- * Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.9 2011/02/15 18:10:33 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.10 2011/07/01 18:21:31 dyoung Exp $); #include opt_mtrr.h @@ -42,7 +42,7 @@ #include sys/kernel.h #include sys/lwp.h -#include machine/bus.h +#include sys/bus.h #include machine/bootinfo.h #include machine/mtrr.h Index: src/sys/arch/x86/x86/mp.c diff -u src/sys/arch/x86/x86/mp.c:1.2 src/sys/arch/x86/x86/mp.c:1.3 --- src/sys/arch/x86/x86/mp.c:1.2 Sat Jun 13 13:35:11 2009 +++ src/sys/arch/x86/x86/mp.c Fri Jul 1 18:21:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mp.c,v 1.2 2009/06/13 13:35:11 tsutsui Exp $ */ +/* $NetBSD: mp.c,v 1.3 2011/07/01 18:21:31 dyoung Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mp.c,v 1.2 2009/06/13 13:35:11 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: mp.c,v 1.3 2011/07/01 18:21:31 dyoung Exp $); #include opt_multiprocessor.h #include pchb.h @@ -50,7 +50,7 @@ #include machine/specialreg.h #include machine/cpuvar.h -#include machine/bus.h +#include sys/bus.h #include machine/mpconfig.h #include dev/pci/pcivar.h Index: src/sys/arch/x86/x86/mpacpi.c diff -u src/sys/arch/x86/x86/mpacpi.c:1.91 src/sys/arch/x86/x86/mpacpi.c:1.92 --- src/sys/arch/x86/x86/mpacpi.c:1.91 Tue Apr 5 13:17:04 2011 +++ src/sys/arch/x86/x86/mpacpi.c Fri Jul 1 18:21:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mpacpi.c,v 1.91 2011/04/05 13:17:04 pgoyette Exp $ */ +/* $NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mpacpi.c,v 1.91 2011/04/05 13:17:04 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $); #include acpica.h #include opt_acpi.h @@ -55,7 +55,7 @@ #include machine/specialreg.h #include
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:22:08 UTC 2011 Modified Files: src/sys/arch/x86/pci: agp_machdep.c amdpcib_hpet.c fwhrng.c ichlpcib.c ichlpcib_hpet.c pchb.c pci_addr_fixup.c pci_bus_fixup.c pcib.c rdcpcib.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/agp_machdep.c \ src/sys/arch/x86/pci/pci_bus_fixup.c src/sys/arch/x86/pci/rdcpcib.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/pci/amdpcib_hpet.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/fwhrng.c \ src/sys/arch/x86/pci/ichlpcib_hpet.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/pci/ichlpcib.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/pci/pchb.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/pci/pci_addr_fixup.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/agp_machdep.c diff -u src/sys/arch/x86/pci/agp_machdep.c:1.1 src/sys/arch/x86/pci/agp_machdep.c:1.2 --- src/sys/arch/x86/pci/agp_machdep.c:1.1 Mon Dec 18 12:11:33 2006 +++ src/sys/arch/x86/pci/agp_machdep.c Fri Jul 1 18:22:08 2011 @@ -1,13 +1,13 @@ -/* $NetBSD: agp_machdep.c,v 1.1 2006/12/18 12:11:33 christos Exp $ */ +/* $NetBSD: agp_machdep.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agp_machdep.c,v 1.1 2006/12/18 12:11:33 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: agp_machdep.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $); #include sys/types.h #include sys/device.h #include machine/cpu.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/x86/pci/pci_bus_fixup.c diff -u src/sys/arch/x86/pci/pci_bus_fixup.c:1.1 src/sys/arch/x86/pci/pci_bus_fixup.c:1.2 --- src/sys/arch/x86/pci/pci_bus_fixup.c:1.1 Sun May 18 02:06:14 2008 +++ src/sys/arch/x86/pci/pci_bus_fixup.c Fri Jul 1 18:22:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_bus_fixup.c,v 1.1 2008/05/18 02:06:14 jmcneill Exp $ */ +/* $NetBSD: pci_bus_fixup.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $ */ /* * Copyright (c) 1999, by UCHIYAMA Yasushi @@ -30,13 +30,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_bus_fixup.c,v 1.1 2008/05/18 02:06:14 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_bus_fixup.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/kernel.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcireg.h #include dev/pci/pcivar.h Index: src/sys/arch/x86/pci/rdcpcib.c diff -u src/sys/arch/x86/pci/rdcpcib.c:1.1 src/sys/arch/x86/pci/rdcpcib.c:1.2 --- src/sys/arch/x86/pci/rdcpcib.c:1.1 Mon Apr 4 17:09:39 2011 +++ src/sys/arch/x86/pci/rdcpcib.c Fri Jul 1 18:22:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rdcpcib.c,v 1.1 2011/04/04 17:09:39 bouyer Exp $ */ +/* $NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. @@ -31,7 +31,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rdcpcib.c,v 1.1 2011/04/04 17:09:39 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -40,7 +40,7 @@ #include sys/sysctl.h #include sys/timetc.h #include sys/gpio.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/x86/pci/amdpcib_hpet.c diff -u src/sys/arch/x86/pci/amdpcib_hpet.c:1.7 src/sys/arch/x86/pci/amdpcib_hpet.c:1.8 --- src/sys/arch/x86/pci/amdpcib_hpet.c:1.7 Wed Jun 15 08:19:43 2011 +++ src/sys/arch/x86/pci/amdpcib_hpet.c Fri Jul 1 18:22:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: amdpcib_hpet.c,v 1.7 2011/06/15 08:19:43 jruoho Exp $ */ +/* $NetBSD: amdpcib_hpet.c,v 1.8 2011/07/01 18:22:08 dyoung Exp $ */ /* * Copyright (c) 2006 Nicolas Joly @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: amdpcib_hpet.c,v 1.7 2011/06/15 08:19:43 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: amdpcib_hpet.c,v 1.8 2011/07/01 18:22:08 dyoung Exp $); #include sys/systm.h #include sys/device.h @@ -37,7 +37,7 @@ #include sys/time.h #include sys/timetc.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/x86/pci/fwhrng.c diff -u src/sys/arch/x86/pci/fwhrng.c:1.2 src/sys/arch/x86/pci/fwhrng.c:1.3 --- src/sys/arch/x86/pci/fwhrng.c:1.2 Mon Aug 23 02:57:19 2010 +++ src/sys/arch/x86/pci/fwhrng.c Fri Jul 1 18:22:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $ */ +/* $NetBSD: fwhrng.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $);
CVS commit: src/sys/arch/x86
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:22:39 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_machdep.c acpi_wakeup.c src/sys/arch/x86/include: isa_machdep.h mpconfig.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/acpi/acpi_machdep.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/acpi/acpi_wakeup.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/include/isa_machdep.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/include/mpconfig.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/acpi/acpi_machdep.c diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.1 src/sys/arch/x86/acpi/acpi_machdep.c:1.2 --- src/sys/arch/x86/acpi/acpi_machdep.c:1.1 Sun Jun 12 11:31:31 2011 +++ src/sys/arch/x86/acpi/acpi_machdep.c Fri Jul 1 18:22:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_machdep.c,v 1.1 2011/06/12 11:31:31 jruoho Exp $ */ +/* $NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -40,15 +40,15 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_machdep.c,v 1.1 2011/06/12 11:31:31 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $); #include sys/param.h #include sys/systm.h +#include sys/bus.h #include sys/device.h #include uvm/uvm_extern.h -#include machine/bus.h #include machine/cpufunc.h #include dev/acpi/acpica.h Index: src/sys/arch/x86/acpi/acpi_wakeup.c diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.28 src/sys/arch/x86/acpi/acpi_wakeup.c:1.29 --- src/sys/arch/x86/acpi/acpi_wakeup.c:1.28 Wed Feb 16 18:55:50 2011 +++ src/sys/arch/x86/acpi/acpi_wakeup.c Fri Jul 1 18:22:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $ */ +/* $NetBSD: acpi_wakeup.c,v 1.29 2011/07/01 18:22:39 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_wakeup.c,v 1.29 2011/07/01 18:22:39 dyoung Exp $); /*- * Copyright (c) 2001 Takanori Watanabe takaw...@jp.freebsd.org @@ -64,7 +64,7 @@ #include sys/param.h #include sys/systm.h #include sys/kernel.h -#include machine/bus.h +#include sys/bus.h #include sys/proc.h #include sys/sysctl.h Index: src/sys/arch/x86/include/isa_machdep.h diff -u src/sys/arch/x86/include/isa_machdep.h:1.10 src/sys/arch/x86/include/isa_machdep.h:1.11 --- src/sys/arch/x86/include/isa_machdep.h:1.10 Wed Aug 19 15:04:27 2009 +++ src/sys/arch/x86/include/isa_machdep.h Fri Jul 1 18:22:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.10 2009/08/19 15:04:27 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.11 2011/07/01 18:22:39 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ #ifndef _X86_ISA_MACHDEP_H_ /* XXX */ #define _X86_ISA_MACHDEP_H_ /* XXX */ -#include machine/bus.h +#include sys/bus.h #include sys/device.h #include dev/isa/isadmavar.h Index: src/sys/arch/x86/include/mpconfig.h diff -u src/sys/arch/x86/include/mpconfig.h:1.12 src/sys/arch/x86/include/mpconfig.h:1.13 --- src/sys/arch/x86/include/mpconfig.h:1.12 Sat Jan 9 20:56:17 2010 +++ src/sys/arch/x86/include/mpconfig.h Fri Jul 1 18:22:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mpconfig.h,v 1.12 2010/01/09 20:56:17 cegger Exp $ */ +/* $NetBSD: mpconfig.h,v 1.13 2011/07/01 18:22:39 dyoung Exp $ */ /* * Definitions originally from the mpbios code, but now used for ACPI @@ -11,7 +11,7 @@ /* * XXX */ -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include machine/pci_machdep.h
CVS commit: src/sys/arch/algor/algor
Module Name:src
Committed By: dyoung
Date: Fri Jul 1 18:30:36 UTC 2011
Modified Files:
src/sys/arch/algor/algor: algor_p4032_dma.c algor_p4032_intr.c
algor_p4032var.h algor_p5064_dma.c algor_p5064_intr.c
algor_p5064var.h algor_p6032_dma.c algor_p6032_intr.c
algor_p6032var.h autoconf.c bus_dma.c machdep.c
Log Message:
#include sys/bus.h instead of machine/bus.h.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/algor/algor_p4032_dma.c \
src/sys/arch/algor/algor/algor_p4032var.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/algor/algor/algor_p4032_intr.c \
src/sys/arch/algor/algor/bus_dma.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/algor/algor/algor_p5064_dma.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/algor/algor/algor_p5064_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/algor/algor_p5064var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/algor/algor_p6032_dma.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/algor/algor/algor_p6032_intr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/algor/algor_p6032var.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/algor/algor/autoconf.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/algor/algor/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/algor/algor/algor_p4032_dma.c
diff -u src/sys/arch/algor/algor/algor_p4032_dma.c:1.6 src/sys/arch/algor/algor/algor_p4032_dma.c:1.7
--- src/sys/arch/algor/algor/algor_p4032_dma.c:1.6 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/algor/algor_p4032_dma.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $);
#include sys/param.h
#define _ALGOR_BUS_DMA_PRIVATE
-#include machine/bus.h
+#include sys/bus.h
#include algor/algor/algor_p4032reg.h
#include algor/algor/algor_p4032var.h
Index: src/sys/arch/algor/algor/algor_p4032var.h
diff -u src/sys/arch/algor/algor/algor_p4032var.h:1.6 src/sys/arch/algor/algor/algor_p4032var.h:1.7
--- src/sys/arch/algor/algor/algor_p4032var.h:1.6 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/algor/algor_p4032var.h Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032var.h,v 1.6 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: algor_p4032var.h,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include machine/bus.h
+#include sys/bus.h
#include dev/pci/pcivar.h
struct p4032_config {
Index: src/sys/arch/algor/algor/algor_p4032_intr.c
diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.22 src/sys/arch/algor/algor/algor_p4032_intr.c:1.23
--- src/sys/arch/algor/algor/algor_p4032_intr.c:1.22 Thu Apr 7 04:01:40 2011
+++ src/sys/arch/algor/algor/algor_p4032_intr.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $ */
+/* $NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $);
#include opt_ddb.h
#define __INTR_PRIVATE
@@ -51,7 +51,7 @@
#include sys/kernel.h
#include sys/cpu.h
-#include machine/bus.h
+#include sys/bus.h
#include machine/autoconf.h
#include machine/intr.h
Index: src/sys/arch/algor/algor/bus_dma.c
diff -u src/sys/arch/algor/algor/bus_dma.c:1.22 src/sys/arch/algor/algor/bus_dma.c:1.23
--- src/sys/arch/algor/algor/bus_dma.c:1.22 Mon Dec 14 00:45:59 2009
+++ src/sys/arch/algor/algor/bus_dma.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -47,7 +47,7 @@
#include mips/cache.h
#define _ALGOR_BUS_DMA_PRIVATE
-#include machine/bus.h
+#include sys/bus.h
#include machine/cpu.h
#include machine/locore.h
Index: src/sys/arch/algor/algor/algor_p5064_dma.c
diff -u src/sys/arch/algor/algor/algor_p5064_dma.c:1.4
CVS commit: src/sys/arch/algor
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:31:32 UTC 2011 Modified Files: src/sys/arch/algor/dev: bonito_mainbus.c com_mainbus.c lpt_mainbus.c mainbus.c mcclock_mainbus.c vtpbc_mainbus.c src/sys/arch/algor/isa: isadma_bounce.c mcclock_isa.c src/sys/arch/algor/pci: pcib.c vtpbc.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/algor/dev/bonito_mainbus.c \ src/sys/arch/algor/dev/com_mainbus.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/algor/dev/lpt_mainbus.c \ src/sys/arch/algor/dev/mcclock_mainbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/algor/dev/mainbus.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/algor/dev/vtpbc_mainbus.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/algor/isa/isadma_bounce.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/algor/isa/mcclock_isa.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/algor/pci/pcib.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/pci/vtpbc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/dev/bonito_mainbus.c diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.12 src/sys/arch/algor/dev/bonito_mainbus.c:1.13 --- src/sys/arch/algor/dev/bonito_mainbus.c:1.12 Tue May 17 17:34:47 2011 +++ src/sys/arch/algor/dev/bonito_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $ */ +/* $NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $); #include opt_algor_p6032.h @@ -40,7 +40,7 @@ #include sys/reboot.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include mips/bonito/bonitoreg.h Index: src/sys/arch/algor/dev/com_mainbus.c diff -u src/sys/arch/algor/dev/com_mainbus.c:1.12 src/sys/arch/algor/dev/com_mainbus.c:1.13 --- src/sys/arch/algor/dev/com_mainbus.c:1.12 Fri Nov 27 03:23:03 2009 +++ src/sys/arch/algor/dev/com_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $ */ +/* $NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -51,7 +51,7 @@ #include machine/autoconf.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/comreg.h #include dev/ic/comvar.h Index: src/sys/arch/algor/dev/lpt_mainbus.c diff -u src/sys/arch/algor/dev/lpt_mainbus.c:1.10 src/sys/arch/algor/dev/lpt_mainbus.c:1.11 --- src/sys/arch/algor/dev/lpt_mainbus.c:1.10 Fri Nov 27 03:23:04 2009 +++ src/sys/arch/algor/dev/lpt_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $ */ +/* $NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -49,7 +49,7 @@ #include machine/autoconf.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/lptreg.h #include dev/ic/lptvar.h Index: src/sys/arch/algor/dev/mcclock_mainbus.c diff -u src/sys/arch/algor/dev/mcclock_mainbus.c:1.10 src/sys/arch/algor/dev/mcclock_mainbus.c:1.11 --- src/sys/arch/algor/dev/mcclock_mainbus.c:1.10 Sat Mar 29 05:42:45 2008 +++ src/sys/arch/algor/dev/mcclock_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $ */ +/* $NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -29,7 +29,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $); #include sys/param.h #include sys/kernel.h @@ -37,7 +37,7 @@ #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include dev/clock_subr.h #include
CVS commit: src/sys/arch/hp700
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:33:10 UTC 2011 Modified Files: src/sys/arch/hp700/dev: asp.c com_dino.c com_ssio.c gecko.c lasi.c lcd.c lpt_ssio.c mongoose.c siop_sgc.c ssio.c sti_sgc.c uturn.c src/sys/arch/hp700/gsc: com_gsc.c fdc_gsc.c gsckbc.c harmony.c if_ie_gsc.c if_iee_gsc.c lpt_gsc.c oosiop_gsc.c osiop_gsc.c siop_gsc.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/dev/asp.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp700/dev/com_dino.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp700/dev/com_ssio.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp700/dev/gecko.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp700/dev/lasi.c \ src/sys/arch/hp700/dev/sti_sgc.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp700/dev/lcd.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp700/dev/lpt_ssio.c \ src/sys/arch/hp700/dev/ssio.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp700/dev/mongoose.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/dev/siop_sgc.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/dev/uturn.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp700/gsc/com_gsc.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp700/gsc/fdc_gsc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/gsc/gsckbc.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hp700/gsc/harmony.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hp700/gsc/if_ie_gsc.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp700/gsc/if_iee_gsc.c \ src/sys/arch/hp700/gsc/osiop_gsc.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp700/gsc/lpt_gsc.c \ src/sys/arch/hp700/gsc/siop_gsc.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp700/gsc/oosiop_gsc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/dev/asp.c diff -u src/sys/arch/hp700/dev/asp.c:1.18 src/sys/arch/hp700/dev/asp.c:1.19 --- src/sys/arch/hp700/dev/asp.c:1.18 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/dev/asp.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */ @@ -37,14 +37,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include sys/reboot.h -#include machine/bus.h +#include sys/bus.h #include machine/iomod.h #include machine/autoconf.h #include machine/cpufunc.h Index: src/sys/arch/hp700/dev/com_dino.c diff -u src/sys/arch/hp700/dev/com_dino.c:1.8 src/sys/arch/hp700/dev/com_dino.c:1.9 --- src/sys/arch/hp700/dev/com_dino.c:1.8 Mon May 18 05:13:26 2009 +++ src/sys/arch/hp700/dev/com_dino.c Fri Jul 1 18:33:09 2011 @@ -31,7 +31,7 @@ #include sys/device.h #include sys/tty.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/iomod.h #include machine/autoconf.h Index: src/sys/arch/hp700/dev/com_ssio.c diff -u src/sys/arch/hp700/dev/com_ssio.c:1.2 src/sys/arch/hp700/dev/com_ssio.c:1.3 --- src/sys/arch/hp700/dev/com_ssio.c:1.2 Fri Mar 5 18:41:29 2010 +++ src/sys/arch/hp700/dev/com_ssio.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_ssio.c,v 1.2 2010/03/05 18:41:29 skrll Exp $ */ +/* $NetBSD: com_ssio.c,v 1.3 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $ */ @@ -23,7 +23,7 @@ #include sys/device.h #include sys/tty.h -#include machine/bus.h +#include sys/bus.h #include machine/iomod.h #include dev/ic/comreg.h Index: src/sys/arch/hp700/dev/gecko.c diff -u src/sys/arch/hp700/dev/gecko.c:1.3 src/sys/arch/hp700/dev/gecko.c:1.4 --- src/sys/arch/hp700/dev/gecko.c:1.3 Thu Jan 13 21:15:13 2011 +++ src/sys/arch/hp700/dev/gecko.c Fri Jul 1 18:33:09 2011 @@ -22,7 +22,7 @@ #include sys/systm.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/iomod.h #include machine/pdc.h Index: src/sys/arch/hp700/dev/lasi.c diff -u src/sys/arch/hp700/dev/lasi.c:1.20 src/sys/arch/hp700/dev/lasi.c:1.21 --- src/sys/arch/hp700/dev/lasi.c:1.20 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/dev/lasi.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $); #undef LASIDEBUG @@ -38,7 +38,7 @@ #include sys/device.h #include sys/reboot.h -#include machine/bus.h
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:36:15 UTC 2011 Modified Files: src/sys/external/bsd/drm/dist/bsd-core: drmP.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm/dist/bsd-core/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm/dist/bsd-core/drmP.h diff -u src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.22 src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.23 --- src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.22 Thu Jun 9 14:47:15 2011 +++ src/sys/external/bsd/drm/dist/bsd-core/drmP.h Fri Jul 1 18:36:15 2011 @@ -74,7 +74,7 @@ #include machine/param.h #endif #include machine/pmap.h -#include machine/bus.h +#include sys/bus.h #if defined(__i386__) || defined(__x86_64__) #include machine/specialreg.h #include machine/sysarch.h
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:36:45 UTC 2011 Modified Files: src/sys/arch/xen/xen: isa_machdep.c pci_intr_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/xen/isa_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/xen/pci_intr_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/xen/isa_machdep.c diff -u src/sys/arch/xen/xen/isa_machdep.c:1.23 src/sys/arch/xen/xen/isa_machdep.c:1.24 --- src/sys/arch/xen/xen/isa_machdep.c:1.23 Sat Feb 6 17:48:54 2010 +++ src/sys/arch/xen/xen/isa_machdep.c Fri Jul 1 18:36:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.c,v 1.23 2010/02/06 17:48:54 bouyer Exp $ */ +/* $NetBSD: isa_machdep.c,v 1.24 2011/07/01 18:36:45 dyoung Exp $ */ /* NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp */ /*- @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.23 2010/02/06 17:48:54 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.24 2011/07/01 18:36:45 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -76,7 +76,7 @@ #include sys/proc.h #include sys/mbuf.h -#include machine/bus.h +#include sys/bus.h #include machine/bus_private.h #include machine/pio.h Index: src/sys/arch/xen/xen/pci_intr_machdep.c diff -u src/sys/arch/xen/xen/pci_intr_machdep.c:1.14 src/sys/arch/xen/xen/pci_intr_machdep.c:1.15 --- src/sys/arch/xen/xen/pci_intr_machdep.c:1.14 Mon Apr 4 20:37:55 2011 +++ src/sys/arch/xen/xen/pci_intr_machdep.c Fri Jul 1 18:36:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_intr_machdep.c,v 1.14 2011/04/04 20:37:55 dyoung Exp $ */ +/* $NetBSD: pci_intr_machdep.c,v 1.15 2011/07/01 18:36:45 dyoung Exp $ */ /* * Copyright (c) 2005 Manuel Bouyer. @@ -26,13 +26,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.14 2011/04/04 20:37:55 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.15 2011/07/01 18:36:45 dyoung Exp $); #include sys/types.h #include sys/param.h #include sys/systm.h -#include machine/bus.h +#include sys/bus.h #include machine/bus_private.h #include dev/pci/pcivar.h
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:37:09 UTC 2011 Modified Files: src/sys/arch/xen/x86: consinit.c mainbus.c xen_bus_dma.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/x86/consinit.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/x86/mainbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/xen/x86/xen_bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/x86/consinit.c diff -u src/sys/arch/xen/x86/consinit.c:1.14 src/sys/arch/xen/x86/consinit.c:1.15 --- src/sys/arch/xen/x86/consinit.c:1.14 Wed Apr 28 19:17:04 2010 +++ src/sys/arch/xen/x86/consinit.c Fri Jul 1 18:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.14 2010/04/28 19:17:04 dyoung Exp $ */ +/* $NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 dyoung Exp $ */ /* NetBSD: consinit.c,v 1.4 2004/03/13 17:31:34 bjh21 Exp */ /* @@ -28,14 +28,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.14 2010/04/28 19:17:04 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 dyoung Exp $); #include opt_kgdb.h #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/bootinfo.h #include xencons.h Index: src/sys/arch/xen/x86/mainbus.c diff -u src/sys/arch/xen/x86/mainbus.c:1.13 src/sys/arch/xen/x86/mainbus.c:1.14 --- src/sys/arch/xen/x86/mainbus.c:1.13 Fri Nov 12 02:07:27 2010 +++ src/sys/arch/xen/x86/mainbus.c Fri Jul 1 18:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.13 2010/11/12 02:07:27 dholland Exp $ */ +/* $NetBSD: mainbus.c,v 1.14 2011/07/01 18:37:08 dyoung Exp $ */ /* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */ /* @@ -32,13 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.13 2010/11/12 02:07:27 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.14 2011/07/01 18:37:08 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include hypervisor.h #include pci.h Index: src/sys/arch/xen/x86/xen_bus_dma.c diff -u src/sys/arch/xen/x86/xen_bus_dma.c:1.22 src/sys/arch/xen/x86/xen_bus_dma.c:1.23 --- src/sys/arch/xen/x86/xen_bus_dma.c:1.22 Fri Nov 12 10:51:14 2010 +++ src/sys/arch/xen/x86/xen_bus_dma.c Fri Jul 1 18:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xen_bus_dma.c,v 1.22 2010/11/12 10:51:14 njoly Exp $ */ +/* $NetBSD: xen_bus_dma.c,v 1.23 2011/07/01 18:37:08 dyoung Exp $ */ /* NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */ /*- @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xen_bus_dma.c,v 1.22 2010/11/12 10:51:14 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: xen_bus_dma.c,v 1.23 2011/07/01 18:37:08 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -40,7 +40,7 @@ #include sys/mbuf.h #include sys/proc.h -#include machine/bus.h +#include sys/bus.h #include machine/bus_private.h #include uvm/uvm.h
CVS commit: src/sys/arch/macppc/dev
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:41:52 UTC 2011 Modified Files: src/sys/arch/macppc/dev: adb.c am79c950.c battery.c com_mainbus.c cuda.c if_mc.c if_wi_obio.c kauai.c ofb.c pmu.c smartbat.c wdc_obio.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/dev/adb.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/macppc/dev/am79c950.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/dev/battery.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/com_mainbus.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/dev/cuda.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/dev/if_mc.c \ src/sys/arch/macppc/dev/pmu.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/dev/if_wi_obio.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/macppc/dev/kauai.c cvs rdiff -u -r1.66 -r1.67 src/sys/arch/macppc/dev/ofb.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/dev/smartbat.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/dev/wdc_obio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/macppc/dev/adb.c diff -u src/sys/arch/macppc/dev/adb.c:1.31 src/sys/arch/macppc/dev/adb.c:1.32 --- src/sys/arch/macppc/dev/adb.c:1.31 Thu Jun 30 00:52:57 2011 +++ src/sys/arch/macppc/dev/adb.c Fri Jul 1 18:41:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: adb.c,v 1.31 2011/06/30 00:52:57 matt Exp $ */ +/* $NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $ */ /*- * Copyright (C) 1994 Bradley A. Grantham @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: adb.c,v 1.31 2011/06/30 00:52:57 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $); #include sys/param.h #include sys/device.h @@ -37,7 +37,7 @@ #include sys/signalvar.h #include sys/systm.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/pio.h Index: src/sys/arch/macppc/dev/am79c950.c diff -u src/sys/arch/macppc/dev/am79c950.c:1.30 src/sys/arch/macppc/dev/am79c950.c:1.31 --- src/sys/arch/macppc/dev/am79c950.c:1.30 Mon Dec 20 00:25:37 2010 +++ src/sys/arch/macppc/dev/am79c950.c Fri Jul 1 18:41:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: am79c950.c,v 1.30 2010/12/20 00:25:37 matt Exp $ */ +/* $NetBSD: am79c950.c,v 1.31 2011/07/01 18:41:51 dyoung Exp $ */ /*- * Copyright (c) 1997 David Huang k...@bga.com @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: am79c950.c,v 1.30 2010/12/20 00:25:37 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: am79c950.c,v 1.31 2011/07/01 18:41:51 dyoung Exp $); #include opt_inet.h @@ -66,7 +66,7 @@ #include net/bpf.h #include net/bpfdesc.h -#include machine/bus.h +#include sys/bus.h #include macppc/dev/am79c950reg.h #include macppc/dev/if_mcvar.h Index: src/sys/arch/macppc/dev/battery.c diff -u src/sys/arch/macppc/dev/battery.c:1.12 src/sys/arch/macppc/dev/battery.c:1.13 --- src/sys/arch/macppc/dev/battery.c:1.12 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/battery.c Fri Jul 1 18:41:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: battery.c,v 1.12 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: battery.c,v 1.13 2011/07/01 18:41:51 dyoung Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: battery.c,v 1.12 2011/06/18 08:08:28 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: battery.c,v 1.13 2011/07/01 18:41:51 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -40,7 +40,7 @@ #include macppc/dev/pmuvar.h #include macppc/dev/batteryvar.h -#include machine/bus.h +#include sys/bus.h #include machine/pio.h #include opt_battery.h Index: src/sys/arch/macppc/dev/com_mainbus.c diff -u src/sys/arch/macppc/dev/com_mainbus.c:1.3 src/sys/arch/macppc/dev/com_mainbus.c:1.4 --- src/sys/arch/macppc/dev/com_mainbus.c:1.3 Fri Mar 14 15:09:10 2008 +++ src/sys/arch/macppc/dev/com_mainbus.c Fri Jul 1 18:41:52 2011 @@ -41,7 +41,7 @@ #include sys/device.h #include sys/tty.h -#include machine/bus.h +#include sys/bus.h #include dev/ofw/openfirm.h #include dev/ic/comreg.h Index: src/sys/arch/macppc/dev/cuda.c diff -u src/sys/arch/macppc/dev/cuda.c:1.16 src/sys/arch/macppc/dev/cuda.c:1.17 --- src/sys/arch/macppc/dev/cuda.c:1.16 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/cuda.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cuda.c,v 1.16 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: cuda.c,v 1.17 2011/07/01 18:41:52 dyoung Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cuda.c,v 1.16 2011/06/18 08:08:28 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cuda.c,v 1.17 2011/07/01 18:41:52 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -36,7 +36,7 @@ #include sys/proc.h #include sys/mutex.h -#include machine/bus.h
CVS commit: src/sys/arch/evbmips
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:45:36 UTC 2011 Modified Files: src/sys/arch/evbmips/adm5120: mainbus.c src/sys/arch/evbmips/atheros: mach_intr.c src/sys/arch/evbmips/gdium: bonito_mainbus.c gdium_dma.c gdium_genfb.c gdium_intr.c gdiumvar.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/adm5120/mainbus.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/atheros/mach_intr.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/gdium/bonito_mainbus.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/gdium/gdium_dma.c \ src/sys/arch/evbmips/gdium/gdium_intr.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/gdium/gdium_genfb.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/gdium/gdiumvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/adm5120/mainbus.c diff -u src/sys/arch/evbmips/adm5120/mainbus.c:1.2 src/sys/arch/evbmips/adm5120/mainbus.c:1.3 --- src/sys/arch/evbmips/adm5120/mainbus.c:1.2 Sun Feb 20 07:48:33 2011 +++ src/sys/arch/evbmips/adm5120/mainbus.c Fri Jul 1 18:45:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.2 2011/02/20 07:48:33 matt Exp $ */ +/* $NetBSD: mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $ */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -66,13 +66,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.2 2011/02/20 07:48:33 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include mips/cache.h #include mips/cpuregs.h Index: src/sys/arch/evbmips/atheros/mach_intr.c diff -u src/sys/arch/evbmips/atheros/mach_intr.c:1.3 src/sys/arch/evbmips/atheros/mach_intr.c:1.4 --- src/sys/arch/evbmips/atheros/mach_intr.c:1.3 Sun Feb 20 07:48:33 2011 +++ src/sys/arch/evbmips/atheros/mach_intr.c Fri Jul 1 18:45:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mach_intr.c,v 1.3 2011/02/20 07:48:33 matt Exp $ */ +/* $NetBSD: mach_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mach_intr.c,v 1.3 2011/02/20 07:48:33 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mach_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $); #include opt_ddb.h @@ -44,7 +44,7 @@ #include sys/device.h #include sys/kernel.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include mips/locore.h Index: src/sys/arch/evbmips/gdium/bonito_mainbus.c diff -u src/sys/arch/evbmips/gdium/bonito_mainbus.c:1.2 src/sys/arch/evbmips/gdium/bonito_mainbus.c:1.3 --- src/sys/arch/evbmips/gdium/bonito_mainbus.c:1.2 Tue May 17 17:34:49 2011 +++ src/sys/arch/evbmips/gdium/bonito_mainbus.c Fri Jul 1 18:45:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bonito_mainbus.c,v 1.2 2011/05/17 17:34:49 dyoung Exp $ */ +/* $NetBSD: bonito_mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.2 2011/05/17 17:34:49 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -38,7 +38,7 @@ #include sys/reboot.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include mips/bonito/bonitoreg.h Index: src/sys/arch/evbmips/gdium/gdium_dma.c diff -u src/sys/arch/evbmips/gdium/gdium_dma.c:1.3 src/sys/arch/evbmips/gdium/gdium_dma.c:1.4 --- src/sys/arch/evbmips/gdium/gdium_dma.c:1.3 Wed Jun 8 17:47:48 2011 +++ src/sys/arch/evbmips/gdium/gdium_dma.c Fri Jul 1 18:45:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gdium_dma.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $ */ +/* $NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,12 +34,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gdium_dma.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $); #include sys/param.h #define _MIPS_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include evbmips/gdium/gdiumreg.h #include evbmips/gdium/gdiumvar.h Index: src/sys/arch/evbmips/gdium/gdium_intr.c diff -u src/sys/arch/evbmips/gdium/gdium_intr.c:1.3 src/sys/arch/evbmips/gdium/gdium_intr.c:1.4 --- src/sys/arch/evbmips/gdium/gdium_intr.c:1.3 Wed Jun 8 17:47:48 2011 +++ src/sys/arch/evbmips/gdium/gdium_intr.c Fri Jul 1 18:45:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gdium_intr.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $ */ +/* $NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $ */ /*- * Copyright
CVS commit: src/sys/arch/evbmips
Module Name:src
Committed By: dyoung
Date: Fri Jul 1 18:46:35 UTC 2011
Modified Files:
src/sys/arch/evbmips/isa: isadma_bounce.c mcclock_isa.c
src/sys/arch/evbmips/malta: autoconf.h malta_dma.c maltavar.h
src/sys/arch/evbmips/malta/pci: pci_machdep.c pcib.c
Log Message:
#include sys/bus.h instead of machine/bus.h.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/isa/isadma_bounce.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/isa/mcclock_isa.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/malta/autoconf.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/malta/malta_dma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/malta/maltavar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/malta/pci/pci_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/malta/pci/pcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/isa/isadma_bounce.c
diff -u src/sys/arch/evbmips/isa/isadma_bounce.c:1.8 src/sys/arch/evbmips/isa/isadma_bounce.c:1.9
--- src/sys/arch/evbmips/isa/isadma_bounce.c:1.8 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbmips/isa/isadma_bounce.c Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:17 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,7 +43,7 @@
#include mips/cache.h
#define _MIPS_BUS_DMA_PRIVATE
-#include machine/bus.h
+#include sys/bus.h
#include machine/locore.h
#include dev/isa/isareg.h
Index: src/sys/arch/evbmips/isa/mcclock_isa.c
diff -u src/sys/arch/evbmips/isa/mcclock_isa.c:1.12 src/sys/arch/evbmips/isa/mcclock_isa.c:1.13
--- src/sys/arch/evbmips/isa/mcclock_isa.c:1.12 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/evbmips/isa/mcclock_isa.c Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,14 +29,14 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46:35 dyoung Exp $);
#include sys/param.h
#include sys/kernel.h
#include sys/systm.h
#include sys/device.h
-#include machine/bus.h
+#include sys/bus.h
#include dev/clock_subr.h
#include dev/ic/mc146818reg.h
Index: src/sys/arch/evbmips/malta/autoconf.h
diff -u src/sys/arch/evbmips/malta/autoconf.h:1.1 src/sys/arch/evbmips/malta/autoconf.h:1.2
--- src/sys/arch/evbmips/malta/autoconf.h:1.1 Thu Mar 7 14:44:03 2002
+++ src/sys/arch/evbmips/malta/autoconf.h Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.1 2002/03/07 14:44:03 simonb Exp $ */
+/* $NetBSD: autoconf.h,v 1.2 2011/07/01 18:46:35 dyoung Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include machine/bus.h
+#include sys/bus.h
struct mainbus_attach_args {
const char *ma_name;
Index: src/sys/arch/evbmips/malta/malta_dma.c
diff -u src/sys/arch/evbmips/malta/malta_dma.c:1.8 src/sys/arch/evbmips/malta/malta_dma.c:1.9
--- src/sys/arch/evbmips/malta/malta_dma.c:1.8 Sun Feb 20 07:48:34 2011
+++ src/sys/arch/evbmips/malta/malta_dma.c Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: malta_dma.c,v 1.8 2011/02/20 07:48:34 matt Exp $ */
+/* $NetBSD: malta_dma.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,13 +34,13 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: malta_dma.c,v 1.8 2011/02/20 07:48:34 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: malta_dma.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $);
#include sys/param.h
#include sys/device.h
#define _MIPS_BUS_DMA_PRIVATE
-#include machine/bus.h
+#include sys/bus.h
#include dev/isa/isavar.h
Index: src/sys/arch/evbmips/malta/maltavar.h
diff -u src/sys/arch/evbmips/malta/maltavar.h:1.5 src/sys/arch/evbmips/malta/maltavar.h:1.6
--- src/sys/arch/evbmips/malta/maltavar.h:1.5 Sun Feb 20 07:48:34 2011
+++ src/sys/arch/evbmips/malta/maltavar.h Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: maltavar.h,v 1.5 2011/02/20 07:48:34 matt Exp $ */
+/* $NetBSD: maltavar.h,v 1.6 2011/07/01 18:46:35 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include machine/bus.h
+#include sys/bus.h
#include dev/pci/pcivar.h
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:48:37 UTC 2011 Modified Files: src/sys/arch/sparc64/dev: com_ebus.c ebus.c ebus_mainbus.c ebusvar.h ffb.c ffb_mainbus.c gfb.c iommu.c lpt_ebus.c mkclock.c pcfiic_ebus.c pci_machdep.c psm.c psycho.c pyro.c rtc.c sbus.c sbusvar.h schizo.c upa.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sparc64/dev/com_ebus.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc64/dev/ebus.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/dev/ebus_mainbus.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/ebusvar.h \ src/sys/arch/sparc64/dev/ffb_mainbus.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc64/dev/ffb.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/dev/gfb.c cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc64/dev/iommu.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc64/dev/lpt_ebus.c \ src/sys/arch/sparc64/dev/schizo.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/dev/mkclock.c \ src/sys/arch/sparc64/dev/pyro.c src/sys/arch/sparc64/dev/rtc.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/pcfiic_ebus.c cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sparc64/dev/pci_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/psm.c cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sparc64/dev/psycho.c cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc64/dev/sbus.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc64/dev/sbusvar.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/dev/upa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/dev/com_ebus.c diff -u src/sys/arch/sparc64/dev/com_ebus.c:1.32 src/sys/arch/sparc64/dev/com_ebus.c:1.33 --- src/sys/arch/sparc64/dev/com_ebus.c:1.32 Thu Jun 2 00:16:22 2011 +++ src/sys/arch/sparc64/dev/com_ebus.c Fri Jul 1 18:48:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $ */ +/* $NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $ */ /* * Copyright (c) 1999, 2000 Matthew R. Green @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -40,7 +40,7 @@ #include sys/tty.h #include sys/conf.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/openfirm.h Index: src/sys/arch/sparc64/dev/ebus.c diff -u src/sys/arch/sparc64/dev/ebus.c:1.57 src/sys/arch/sparc64/dev/ebus.c:1.58 --- src/sys/arch/sparc64/dev/ebus.c:1.57 Thu Jun 2 00:24:23 2011 +++ src/sys/arch/sparc64/dev/ebus.c Fri Jul 1 18:48:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $ */ +/* $NetBSD: ebus.c,v 1.58 2011/07/01 18:48:36 dyoung Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ebus.c,v 1.58 2011/07/01 18:48:36 dyoung Exp $); #include opt_ddb.h @@ -64,7 +64,7 @@ #include sys/time.h #define _SPARC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/openfirm.h Index: src/sys/arch/sparc64/dev/ebus_mainbus.c diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.4 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.5 --- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.4 Thu Jun 2 00:24:23 2011 +++ src/sys/arch/sparc64/dev/ebus_mainbus.c Fri Jul 1 18:48:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ebus_mainbus.c,v 1.4 2011/06/02 00:24:23 christos Exp $ */ +/* $NetBSD: ebus_mainbus.c,v 1.5 2011/07/01 18:48:36 dyoung Exp $ */ /* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */ /* @@ -40,7 +40,7 @@ #include sys/time.h #define _SPARC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/openfirm.h Index: src/sys/arch/sparc64/dev/ebusvar.h diff -u src/sys/arch/sparc64/dev/ebusvar.h:1.10 src/sys/arch/sparc64/dev/ebusvar.h:1.11 --- src/sys/arch/sparc64/dev/ebusvar.h:1.10 Thu Jun 2 00:24:23 2011 +++ src/sys/arch/sparc64/dev/ebusvar.h Fri Jul 1 18:48:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ebusvar.h,v 1.10 2011/06/02 00:24:23 christos Exp $ */ +/* $NetBSD: ebusvar.h,v 1.11 2011/07/01 18:48:36 dyoung Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Matthew R. Green @@ -36,7 +36,7 @@ #include sys/time.h #define _SPARC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/sparc64/dev/ffb_mainbus.c diff -u src/sys/arch/sparc64/dev/ffb_mainbus.c:1.10 src/sys/arch/sparc64/dev/ffb_mainbus.c:1.11 --- src/sys/arch/sparc64/dev/ffb_mainbus.c:1.10 Fri Jun 3
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:49:24 UTC 2011 Modified Files: src/sys/arch/sparc64/sparc64: autoconf.c clock.c core_machdep.c rbus_machdep.c vm_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/sys/arch/sparc64/sparc64/autoconf.c cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sparc64/sparc64/clock.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/sparc64/core_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/sparc64/rbus_machdep.c cvs rdiff -u -r1.96 -r1.97 src/sys/arch/sparc64/sparc64/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/autoconf.c diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.181 src/sys/arch/sparc64/sparc64/autoconf.c:1.182 --- src/sys/arch/sparc64/sparc64/autoconf.c:1.181 Fri Jun 3 02:33:27 2011 +++ src/sys/arch/sparc64/sparc64/autoconf.c Fri Jul 1 18:49:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $ */ +/* $NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -83,7 +83,7 @@ #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/openfirm.h #include machine/sparc64.h Index: src/sys/arch/sparc64/sparc64/clock.c diff -u src/sys/arch/sparc64/sparc64/clock.c:1.104 src/sys/arch/sparc64/sparc64/clock.c:1.105 --- src/sys/arch/sparc64/sparc64/clock.c:1.104 Fri Jun 3 02:33:27 2011 +++ src/sys/arch/sparc64/sparc64/clock.c Fri Jul 1 18:49:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $ */ +/* $NetBSD: clock.c,v 1.105 2011/07/01 18:49:24 dyoung Exp $ */ /* * Copyright (c) 1992, 1993 @@ -55,7 +55,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.105 2011/07/01 18:49:24 dyoung Exp $); #include opt_multiprocessor.h @@ -81,7 +81,7 @@ #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/eeprom.h #include machine/cpu.h Index: src/sys/arch/sparc64/sparc64/core_machdep.c diff -u src/sys/arch/sparc64/sparc64/core_machdep.c:1.4 src/sys/arch/sparc64/sparc64/core_machdep.c:1.5 --- src/sys/arch/sparc64/sparc64/core_machdep.c:1.4 Fri Jan 14 02:06:32 2011 +++ src/sys/arch/sparc64/sparc64/core_machdep.c Fri Jul 1 18:49:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: core_machdep.c,v 1.4 2011/01/14 02:06:32 rmind Exp $ */ +/* $NetBSD: core_machdep.c,v 1.5 2011/07/01 18:49:24 dyoung Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: core_machdep.c,v 1.4 2011/01/14 02:06:32 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: core_machdep.c,v 1.5 2011/07/01 18:49:24 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -68,7 +68,7 @@ #include machine/frame.h #include machine/pcb.h #include machine/trap.h -#include machine/bus.h +#include sys/bus.h /* * cpu_coredump is called to write a core dump header. Index: src/sys/arch/sparc64/sparc64/rbus_machdep.c diff -u src/sys/arch/sparc64/sparc64/rbus_machdep.c:1.15 src/sys/arch/sparc64/sparc64/rbus_machdep.c:1.16 --- src/sys/arch/sparc64/sparc64/rbus_machdep.c:1.15 Sat Mar 14 21:04:16 2009 +++ src/sys/arch/sparc64/sparc64/rbus_machdep.c Fri Jul 1 18:49:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rbus_machdep.c,v 1.15 2009/03/14 21:04:16 dsl Exp $ */ +/* $NetBSD: rbus_machdep.c,v 1.16 2011/07/01 18:49:24 dyoung Exp $ */ /* * Copyright (c) 2003 Takeshi Nakayama. @@ -26,14 +26,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rbus_machdep.c,v 1.15 2009/03/14 21:04:16 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: rbus_machdep.c,v 1.16 2011/07/01 18:49:24 dyoung Exp $); #include sys/param.h #include sys/device.h #include sys/extent.h #include sys/systm.h -#include machine/bus.h +#include sys/bus.h #include machine/openfirm.h #include machine/promlib.h #include dev/pci/pcivar.h Index: src/sys/arch/sparc64/sparc64/vm_machdep.c diff -u src/sys/arch/sparc64/sparc64/vm_machdep.c:1.96 src/sys/arch/sparc64/sparc64/vm_machdep.c:1.97 --- src/sys/arch/sparc64/sparc64/vm_machdep.c:1.96 Thu Feb 24 04:28:48 2011 +++ src/sys/arch/sparc64/sparc64/vm_machdep.c Fri Jul 1 18:49:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.96 2011/02/24 04:28:48 joerg Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.97 2011/07/01 18:49:24 dyoung Exp $ */ /* * Copyright (c) 1996-2002
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:50:42 UTC 2011 Modified Files: src/sys/arch/sparc/dev: bootbus.c cgsix_obio.c com_ebus.c com_obio.c dma_obio.c ebus.c esp_obio.c if_ie_obio.c if_le_obio.c kbd_pckbport.c ms_pckbport.c obio.c rtc.c sbus.c sw.c tctrl.c ts102.c vme_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/dev/bootbus.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/dev/cgsix_obio.c \ src/sys/arch/sparc/dev/com_obio.c src/sys/arch/sparc/dev/esp_obio.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/dev/com_ebus.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/dev/dma_obio.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/dev/ebus.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc/dev/if_ie_obio.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/dev/if_le_obio.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/dev/kbd_pckbport.c \ src/sys/arch/sparc/dev/ms_pckbport.c cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sparc/dev/obio.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/dev/rtc.c cvs rdiff -u -r1.74 -r1.75 src/sys/arch/sparc/dev/sbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/dev/sw.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc/dev/tctrl.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc/dev/ts102.c cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sparc/dev/vme_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/dev/bootbus.c diff -u src/sys/arch/sparc/dev/bootbus.c:1.17 src/sys/arch/sparc/dev/bootbus.c:1.18 --- src/sys/arch/sparc/dev/bootbus.c:1.17 Sun Sep 20 16:18:21 2009 +++ src/sys/arch/sparc/dev/bootbus.c Fri Jul 1 18:50:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $ */ +/* $NetBSD: bootbus.c,v 1.18 2011/07/01 18:50:41 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: bootbus.c,v 1.18 2011/07/01 18:50:41 dyoung Exp $); #include sys/param.h #include sys/malloc.h @@ -42,7 +42,7 @@ #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include sparc/sparc/cpuunitvar.h #include sparc/dev/bootbusvar.h Index: src/sys/arch/sparc/dev/cgsix_obio.c diff -u src/sys/arch/sparc/dev/cgsix_obio.c:1.23 src/sys/arch/sparc/dev/cgsix_obio.c:1.24 --- src/sys/arch/sparc/dev/cgsix_obio.c:1.23 Fri Dec 12 18:50:13 2008 +++ src/sys/arch/sparc/dev/cgsix_obio.c Fri Jul 1 18:50:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix_obio.c,v 1.23 2008/12/12 18:50:13 macallan Exp $ */ +/* $NetBSD: cgsix_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cgsix_obio.c,v 1.23 2008/12/12 18:50:13 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: cgsix_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -51,7 +51,7 @@ #include sys/syslog.h #endif -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/eeprom.h Index: src/sys/arch/sparc/dev/com_obio.c diff -u src/sys/arch/sparc/dev/com_obio.c:1.23 src/sys/arch/sparc/dev/com_obio.c:1.24 --- src/sys/arch/sparc/dev/com_obio.c:1.23 Sat Nov 21 04:16:51 2009 +++ src/sys/arch/sparc/dev/com_obio.c Fri Jul 1 18:50:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_obio.c,v 1.23 2009/11/21 04:16:51 rmind Exp $ */ +/* $NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.23 2009/11/21 04:16:51 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -78,7 +78,7 @@ #include sys/device.h #include sys/termios.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/intr.h Index: src/sys/arch/sparc/dev/esp_obio.c diff -u src/sys/arch/sparc/dev/esp_obio.c:1.23 src/sys/arch/sparc/dev/esp_obio.c:1.24 --- src/sys/arch/sparc/dev/esp_obio.c:1.23 Mon Apr 28 20:23:35 2008 +++ src/sys/arch/sparc/dev/esp_obio.c Fri Jul 1 18:50:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: esp_obio.c,v 1.23 2008/04/28 20:23:35 martin Exp $ */ +/* $NetBSD: esp_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: esp_obio.c,v 1.23 2008/04/28 20:23:35 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: esp_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $); #include sys/types.h #include
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:51:52 UTC 2011 Modified Files: src/sys/arch/sparc/sparc: clock.c cpuunit.c eeprom.c genassym.cf iommu.c memecc.c mkclock.c msiiep.c oclock.c pci_machdep.c timer.c timer_sun4.c timer_sun4m.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/arch/sparc/sparc/clock.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/sparc/cpuunit.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/sparc/eeprom.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sparc/sparc/genassym.cf cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc/sparc/iommu.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/sparc/memecc.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/mkclock.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc/sparc/msiiep.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/sparc/oclock.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/sparc/pci_machdep.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc/sparc/timer.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/sparc/timer_sun4.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc/sparc/timer_sun4m.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/sparc/clock.c diff -u src/sys/arch/sparc/sparc/clock.c:1.102 src/sys/arch/sparc/sparc/clock.c:1.103 --- src/sys/arch/sparc/sparc/clock.c:1.102 Wed Oct 17 19:57:14 2007 +++ src/sys/arch/sparc/sparc/clock.c Fri Jul 1 18:51:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.102 2007/10/17 19:57:14 garbled Exp $ */ +/* $NetBSD: clock.c,v 1.103 2011/07/01 18:51:51 dyoung Exp $ */ /* * Copyright (c) 1992, 1993 @@ -88,7 +88,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.102 2007/10/17 19:57:14 garbled Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.103 2011/07/01 18:51:51 dyoung Exp $); #include opt_sparc_arch.h @@ -100,7 +100,7 @@ #include sys/systm.h #include sys/timetc.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/eeprom.h #include machine/cpu.h Index: src/sys/arch/sparc/sparc/cpuunit.c diff -u src/sys/arch/sparc/sparc/cpuunit.c:1.13 src/sys/arch/sparc/sparc/cpuunit.c:1.14 --- src/sys/arch/sparc/sparc/cpuunit.c:1.13 Mon Apr 28 20:23:36 2008 +++ src/sys/arch/sparc/sparc/cpuunit.c Fri Jul 1 18:51:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuunit.c,v 1.13 2008/04/28 20:23:36 martin Exp $ */ +/* $NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpuunit.c,v 1.13 2008/04/28 20:23:36 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $); #include sys/param.h #include sys/malloc.h @@ -42,7 +42,7 @@ #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include sparc/sparc/cpuunitvar.h Index: src/sys/arch/sparc/sparc/eeprom.c diff -u src/sys/arch/sparc/sparc/eeprom.c:1.7 src/sys/arch/sparc/sparc/eeprom.c:1.8 --- src/sys/arch/sparc/sparc/eeprom.c:1.7 Mon Apr 28 20:23:36 2008 +++ src/sys/arch/sparc/sparc/eeprom.c Fri Jul 1 18:51:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: eeprom.c,v 1.7 2008/04/28 20:23:36 martin Exp $ */ +/* $NetBSD: eeprom.c,v 1.8 2011/07/01 18:51:51 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: eeprom.c,v 1.7 2008/04/28 20:23:36 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: eeprom.c,v 1.8 2011/07/01 18:51:51 dyoung Exp $); #include opt_sparc_arch.h @@ -49,7 +49,7 @@ #include sys/device.h #include sys/systm.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/eeprom.h Index: src/sys/arch/sparc/sparc/genassym.cf diff -u src/sys/arch/sparc/sparc/genassym.cf:1.65 src/sys/arch/sparc/sparc/genassym.cf:1.66 --- src/sys/arch/sparc/sparc/genassym.cf:1.65 Sun Feb 20 10:02:01 2011 +++ src/sys/arch/sparc/sparc/genassym.cf Fri Jul 1 18:51:51 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.65 2011/02/20 10:02:01 mrg Exp $ +# $NetBSD: genassym.cf,v 1.66 2011/07/01 18:51:51 dyoung Exp $ # # Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ include sparc/dev/zsvar.h endif -include machine/bus.h +include sys/bus.h include sparc/dev/audioamdvar.h include sparc/dev/fdreg.h Index: src/sys/arch/sparc/sparc/iommu.c diff -u src/sys/arch/sparc/sparc/iommu.c:1.92 src/sys/arch/sparc/sparc/iommu.c:1.93 --- src/sys/arch/sparc/sparc/iommu.c:1.92 Sat Nov 7 07:27:46 2009 +++ src/sys/arch/sparc/sparc/iommu.c Fri Jul 1 18:51:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iommu.c,v 1.92 2009/11/07 07:27:46 cegger Exp $ */ +/* $NetBSD: iommu.c,v 1.93 2011/07/01 18:51:51 dyoung Exp $ */ /* * Copyright (c) 1996 @@ -37,7
CVS commit: src/sys/arch/sgimips
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:53:48 UTC 2011 Modified Files: src/sys/arch/sgimips/dev: crime.c crimevar.h crmfb.c ctl.c dpclock.c dsclock.c imc.c int.c pic.c src/sys/arch/sgimips/eisa: eisa_machdep.c src/sys/arch/sgimips/gio: gio.c giovar.h grtwovar.h lightvar.h newportvar.h pci_gio.c src/sys/arch/sgimips/hpc: haltwo.c hpc.c hpcdma.c hpcdma.h if_sq.c pi1ppc.c pi1ppcvar.h wdsc.c src/sys/arch/sgimips/ioc: ioc.c oioc.c oiocsc.c oiocvar.h src/sys/arch/sgimips/mace: com_mace.c if_mec.c lpt_mace.c mace.c macekbc.c mavb.c mcclock_mace.c pci_mace.c src/sys/arch/sgimips/pci: pci_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sgimips/dev/crime.c \ src/sys/arch/sgimips/dev/crmfb.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sgimips/dev/crimevar.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/dev/ctl.c \ src/sys/arch/sgimips/dev/dpclock.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sgimips/dev/dsclock.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/dev/imc.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sgimips/dev/int.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/dev/pic.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/eisa/eisa_machdep.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/gio/gio.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/gio/giovar.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/gio/grtwovar.h \ src/sys/arch/sgimips/gio/newportvar.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sgimips/gio/lightvar.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/gio/pci_gio.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/hpc/haltwo.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sgimips/hpc/hpc.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/hpc/hpcdma.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/hpc/hpcdma.h \ src/sys/arch/sgimips/hpc/pi1ppc.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sgimips/hpc/if_sq.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/hpc/pi1ppcvar.h cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/hpc/wdsc.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/ioc/ioc.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oioc.c \ src/sys/arch/sgimips/ioc/oiocsc.c src/sys/arch/sgimips/ioc/oiocvar.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/mace/com_mace.c \ src/sys/arch/sgimips/mace/lpt_mace.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sgimips/mace/if_mec.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sgimips/mace/mace.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/mace/macekbc.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/mace/mavb.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/mace/mcclock_mace.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sgimips/mace/pci_mace.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/pci/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sgimips/dev/crime.c diff -u src/sys/arch/sgimips/dev/crime.c:1.34 src/sys/arch/sgimips/dev/crime.c:1.35 --- src/sys/arch/sgimips/dev/crime.c:1.34 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/dev/crime.c Fri Jul 1 18:53:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: crime.c,v 1.34 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: crime.c,v 1.35 2011/07/01 18:53:45 dyoung Exp $ */ /* * Copyright (c) 2004 Christopher SEKIYA @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: crime.c,v 1.34 2011/02/20 07:59:50 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: crime.c,v 1.35 2011/07/01 18:53:45 dyoung Exp $); #include sys/param.h #include sys/device.h @@ -48,7 +48,7 @@ #include machine/locore.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/machtype.h #include machine/sysconf.h Index: src/sys/arch/sgimips/dev/crmfb.c diff -u src/sys/arch/sgimips/dev/crmfb.c:1.34 src/sys/arch/sgimips/dev/crmfb.c:1.35 --- src/sys/arch/sgimips/dev/crmfb.c:1.34 Tue May 17 22:52:28 2011 +++ src/sys/arch/sgimips/dev/crmfb.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: crmfb.c,v 1.34 2011/05/17 22:52:28 macallan Exp $ */ +/* $NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: crmfb.c,v 1.34 2011/05/17 22:52:28 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -41,7 +41,7 @@ #define _SGIMIPS_BUS_DMA_PRIVATE #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/machtype.h #include machine/vmparam.h Index: src/sys/arch/sgimips/dev/crimevar.h diff -u src/sys/arch/sgimips/dev/crimevar.h:1.7 src/sys/arch/sgimips/dev/crimevar.h:1.8 ---
CVS commit: src/sys/arch/sgimips/sgimips
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:54:33 UTC 2011 Modified Files: src/sys/arch/sgimips/sgimips: arcemu.c console.c machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/sgimips/arcemu.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sgimips/sgimips/console.c cvs rdiff -u -r1.134 -r1.135 src/sys/arch/sgimips/sgimips/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sgimips/sgimips/arcemu.c diff -u src/sys/arch/sgimips/sgimips/arcemu.c:1.20 src/sys/arch/sgimips/sgimips/arcemu.c:1.21 --- src/sys/arch/sgimips/sgimips/arcemu.c:1.20 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/sgimips/arcemu.c Fri Jul 1 18:54:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: arcemu.c,v 1.20 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: arcemu.c,v 1.21 2011/07/01 18:54:32 dyoung Exp $ */ /* * Copyright (c) 2004 Steve Rumble @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arcemu.c,v 1.20 2011/02/20 07:59:51 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: arcemu.c,v 1.21 2011/07/01 18:54:32 dyoung Exp $); #ifndef _LP64 @@ -37,7 +37,7 @@ #include sys/systm.h #include machine/machtype.h -#include machine/bus.h +#include sys/bus.h #include dev/cons.h Index: src/sys/arch/sgimips/sgimips/console.c diff -u src/sys/arch/sgimips/sgimips/console.c:1.41 src/sys/arch/sgimips/sgimips/console.c:1.42 --- src/sys/arch/sgimips/sgimips/console.c:1.41 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/sgimips/console.c Fri Jul 1 18:54:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: console.c,v 1.41 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: console.c,v 1.42 2011/07/01 18:54:32 dyoung Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: console.c,v 1.41 2011/02/20 07:59:51 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: console.c,v 1.42 2011/07/01 18:54:32 dyoung Exp $); #include opt_kgdb.h @@ -37,7 +37,7 @@ #include sys/termios.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/machtype.h #include dev/cons.h Index: src/sys/arch/sgimips/sgimips/machdep.c diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.134 src/sys/arch/sgimips/sgimips/machdep.c:1.135 --- src/sys/arch/sgimips/sgimips/machdep.c:1.134 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/sgimips/machdep.c Fri Jul 1 18:54:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.134 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.135 2011/07/01 18:54:33 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.134 2011/02/20 07:59:51 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.135 2011/07/01 18:54:33 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -75,7 +75,7 @@ #include machine/sysconf.h #include machine/intr.h #include machine/bootinfo.h -#include machine/bus.h +#include sys/bus.h #include mips/locore.h #include mips/cache.h
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:59:20 UTC 2011 Modified Files: src/sys/arch/powerpc/isa: isadma_machdep.c isapnp_machdep.c src/sys/arch/powerpc/oea: ofw_autoconf.c ofw_consinit.c ofw_rascons.c prep_machdep.c src/sys/arch/powerpc/pci: pchb.c pcib.c src/sys/arch/powerpc/powerpc: pio_subr.S Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/isa/isadma_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/isa/isapnp_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/oea/ofw_autoconf.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/oea/ofw_consinit.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/oea/ofw_rascons.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/oea/prep_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/pci/pchb.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/pci/pcib.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/powerpc/pio_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/isa/isadma_machdep.c diff -u src/sys/arch/powerpc/isa/isadma_machdep.c:1.6 src/sys/arch/powerpc/isa/isadma_machdep.c:1.7 --- src/sys/arch/powerpc/isa/isadma_machdep.c:1.6 Wed Nov 10 09:27:23 2010 +++ src/sys/arch/powerpc/isa/isadma_machdep.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isadma_machdep.c,v 1.6 2010/11/10 09:27:23 uebayasi Exp $ */ +/* $NetBSD: isadma_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: isadma_machdep.c,v 1.6 2010/11/10 09:27:23 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: isadma_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $); #define ISA_DMA_STATS @@ -44,7 +44,7 @@ #include sys/mbuf.h #define _POWERPC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/pio.h Index: src/sys/arch/powerpc/isa/isapnp_machdep.c diff -u src/sys/arch/powerpc/isa/isapnp_machdep.c:1.4 src/sys/arch/powerpc/isa/isapnp_machdep.c:1.5 --- src/sys/arch/powerpc/isa/isapnp_machdep.c:1.4 Wed Oct 21 21:57:40 2009 +++ src/sys/arch/powerpc/isa/isapnp_machdep.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isapnp_machdep.c,v 1.4 2009/10/21 21:57:40 snj Exp $ */ +/* $NetBSD: isapnp_machdep.c,v 1.5 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -73,14 +73,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: isapnp_machdep.c,v 1.4 2009/10/21 21:57:40 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: isapnp_machdep.c,v 1.5 2011/07/01 18:59:19 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include sys/malloc.h -#include machine/bus.h +#include sys/bus.h #include dev/isa/isavar.h Index: src/sys/arch/powerpc/oea/ofw_autoconf.c diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.13 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.14 --- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.13 Fri Jun 17 19:03:04 2011 +++ src/sys/arch/powerpc/oea/ofw_autoconf.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_autoconf.c,v 1.13 2011/06/17 19:03:04 matt Exp $ */ +/* $NetBSD: ofw_autoconf.c,v 1.14 2011/07/01 18:59:19 dyoung Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 TooLs GmbH. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ofw_autoconf.c,v 1.13 2011/06/17 19:03:04 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ofw_autoconf.c,v 1.14 2011/07/01 18:59:19 dyoung Exp $); #ifdef ofppc #include gtpci.h @@ -46,7 +46,7 @@ #include uvm/uvm_extern.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/stdarg.h #include dev/ofw/openfirm.h Index: src/sys/arch/powerpc/oea/ofw_consinit.c diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.11 src/sys/arch/powerpc/oea/ofw_consinit.c:1.12 --- src/sys/arch/powerpc/oea/ofw_consinit.c:1.11 Sun Nov 14 03:32:44 2010 +++ src/sys/arch/powerpc/oea/ofw_consinit.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_consinit.c,v 1.11 2010/11/14 03:32:44 uebayasi Exp $ */ +/* $NetBSD: ofw_consinit.c,v 1.12 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ofw_consinit.c,v 1.11 2010/11/14 03:32:44 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: ofw_consinit.c,v 1.12 2011/07/01 18:59:19 dyoung Exp $); #include sys/param.h #include sys/buf.h @@ -40,7 +40,7 @@ #include machine/autoconf.h #include machine/trap.h -#include machine/bus.h +#include sys/bus.h #include powerpc/ofw_cons.h Index: src/sys/arch/powerpc/oea/ofw_rascons.c diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.5
CVS commit: src/sys/arch/mips/rmi
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:01:31 UTC 2011 Modified Files: src/sys/arch/mips/rmi: rmixl_com.c rmixl_cpunode.c rmixl_ehci.c rmixl_gpio.c rmixl_intr.c rmixl_iobus.c rmixl_iobus_space.c rmixl_mainbus.c rmixl_nand.c rmixl_obio.c rmixl_obio_eb_space.c rmixl_obio_el_space.c rmixl_ohci.c rmixl_pci_cfg_space.c rmixl_pci_ecfg_space.c rmixl_pci_io_space.c rmixl_pci_mem_space.c rmixl_pcie.c rmixl_pcix.c rmixl_usbi.c rmixlvar.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/rmi/rmixl_com.c \ src/sys/arch/mips/rmi/rmixl_usbi.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/rmi/rmixl_cpunode.c \ src/sys/arch/mips/rmi/rmixl_iobus.c \ src/sys/arch/mips/rmi/rmixl_iobus_space.c \ src/sys/arch/mips/rmi/rmixl_obio_eb_space.c \ src/sys/arch/mips/rmi/rmixl_obio_el_space.c \ src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c \ src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c \ src/sys/arch/mips/rmi/rmixl_pci_io_space.c \ src/sys/arch/mips/rmi/rmixl_pci_mem_space.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_ehci.c \ src/sys/arch/mips/rmi/rmixl_mainbus.c src/sys/arch/mips/rmi/rmixl_obio.c \ src/sys/arch/mips/rmi/rmixl_ohci.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/rmi/rmixl_gpio.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/rmi/rmixl_intr.c \ src/sys/arch/mips/rmi/rmixlvar.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/rmi/rmixl_nand.c \ src/sys/arch/mips/rmi/rmixl_pcie.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/rmi/rmixl_pcix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/rmi/rmixl_com.c diff -u src/sys/arch/mips/rmi/rmixl_com.c:1.4 src/sys/arch/mips/rmi/rmixl_com.c:1.5 --- src/sys/arch/mips/rmi/rmixl_com.c:1.4 Wed May 11 00:38:03 2011 +++ src/sys/arch/mips/rmi/rmixl_com.c Fri Jul 1 19:01:30 2011 @@ -1,4 +1,4 @@ -/* $Id: rmixl_com.c,v 1.4 2011/05/11 00:38:03 cliff Exp $ */ +/* $Id: rmixl_com.c,v 1.5 2011/07/01 19:01:30 dyoung Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. * Copyright (c) 2006 Garrett D'Amore. @@ -101,7 +101,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_com.c,v 1.4 2011/05/11 00:38:03 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_com.c,v 1.5 2011/07/01 19:01:30 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -111,7 +111,7 @@ #include sys/ttydefaults.h #include sys/types.h -#include machine/bus.h +#include sys/bus.h #include dev/cons.h #include dev/ic/comreg.h Index: src/sys/arch/mips/rmi/rmixl_usbi.c diff -u src/sys/arch/mips/rmi/rmixl_usbi.c:1.4 src/sys/arch/mips/rmi/rmixl_usbi.c:1.5 --- src/sys/arch/mips/rmi/rmixl_usbi.c:1.4 Fri Apr 29 21:54:14 2011 +++ src/sys/arch/mips/rmi/rmixl_usbi.c Fri Jul 1 19:01:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_usbi.c,v 1.4 2011/04/29 21:54:14 matt Exp $ */ +/* $NetBSD: rmixl_usbi.c,v 1.5 2011/07/01 19:01:31 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_usbi.c,v 1.4 2011/04/29 21:54:14 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_usbi.c,v 1.5 2011/07/01 19:01:31 dyoung Exp $); #include locators.h @@ -38,7 +38,7 @@ #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include mips/rmi/rmixlreg.h #include mips/rmi/rmixlvar.h Index: src/sys/arch/mips/rmi/rmixl_cpunode.c diff -u src/sys/arch/mips/rmi/rmixl_cpunode.c:1.2 src/sys/arch/mips/rmi/rmixl_cpunode.c:1.3 --- src/sys/arch/mips/rmi/rmixl_cpunode.c:1.2 Sun Feb 20 07:48:37 2011 +++ src/sys/arch/mips/rmi/rmixl_cpunode.c Fri Jul 1 19:01:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_cpunode.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */ +/* $NetBSD: rmixl_cpunode.c,v 1.3 2011/07/01 19:01:30 dyoung Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_cpunode.c,v 1.2 2011/02/20 07:48:37 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_cpunode.c,v 1.3 2011/07/01 19:01:30 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -56,7 +56,7 @@ #include mips/rmi/rmixlvar.h #include mips/rmi/rmixl_cpunodevar.h -#include machine/bus.h +#include sys/bus.h #include locators.h static int cpunode_rmixl_match(device_t, cfdata_t, void *); Index: src/sys/arch/mips/rmi/rmixl_iobus.c diff -u src/sys/arch/mips/rmi/rmixl_iobus.c:1.2 src/sys/arch/mips/rmi/rmixl_iobus.c:1.3 --- src/sys/arch/mips/rmi/rmixl_iobus.c:1.2 Fri Mar 18 01:21:34 2011 +++ src/sys/arch/mips/rmi/rmixl_iobus.c Fri Jul 1 19:01:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_iobus.c,v 1.2 2011/03/18 01:21:34 cliff Exp $ */ +/* $NetBSD: rmixl_iobus.c,v 1.3 2011/07/01
CVS commit: src/sys/arch/evbppc/explora
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:02:32 UTC 2011 Modified Files: src/sys/arch/evbppc/explora: consinit.c src/sys/arch/evbppc/explora/dev: com_elb.c elb.c fb_elb.c le_elb.c lpt_elb.c pckbc_elb.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/explora/consinit.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/explora/dev/com_elb.c \ src/sys/arch/evbppc/explora/dev/elb.c \ src/sys/arch/evbppc/explora/dev/le_elb.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/explora/dev/fb_elb.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/explora/dev/lpt_elb.c \ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/consinit.c diff -u src/sys/arch/evbppc/explora/consinit.c:1.7 src/sys/arch/evbppc/explora/consinit.c:1.8 --- src/sys/arch/evbppc/explora/consinit.c:1.7 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/explora/consinit.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.7 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: consinit.c,v 1.8 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,13 +30,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.7 2008/04/28 20:23:17 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.8 2011/07/01 19:02:32 dyoung Exp $); #include sys/param.h #include sys/systm.h #include machine/explora.h -#include machine/bus.h +#include sys/bus.h #include com.h #if NCOM 0 Index: src/sys/arch/evbppc/explora/dev/com_elb.c diff -u src/sys/arch/evbppc/explora/dev/com_elb.c:1.8 src/sys/arch/evbppc/explora/dev/com_elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/com_elb.c:1.8 Fri Aug 8 09:50:19 2008 +++ src/sys/arch/evbppc/explora/dev/com_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_elb.c,v 1.8 2008/08/08 09:50:19 hannken Exp $ */ +/* $NetBSD: com_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_elb.c,v 1.8 2008/08/08 09:50:19 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: com_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $); #include sys/param.h #include sys/conf.h @@ -38,7 +38,7 @@ #include sys/systm.h #include sys/tty.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/comreg.h #include dev/ic/comvar.h Index: src/sys/arch/evbppc/explora/dev/elb.c diff -u src/sys/arch/evbppc/explora/dev/elb.c:1.8 src/sys/arch/evbppc/explora/dev/elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/elb.c:1.8 Mon Jun 6 17:13:06 2011 +++ src/sys/arch/evbppc/explora/dev/elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: elb.c,v 1.8 2011/06/06 17:13:06 matt Exp $ */ +/* $NetBSD: elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: elb.c,v 1.8 2011/06/06 17:13:06 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $); #include sys/param.h #include sys/conf.h @@ -40,7 +40,7 @@ #include machine/explora.h #define _POWERPC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include powerpc/ibm4xx/dcr403cgx.h Index: src/sys/arch/evbppc/explora/dev/le_elb.c diff -u src/sys/arch/evbppc/explora/dev/le_elb.c:1.8 src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/le_elb.c:1.8 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/explora/dev/le_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: le_elb.c,v 1.8 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: le_elb.c,v 1.8 2008/04/28 20:23:17 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $); #include sys/param.h #include sys/conf.h @@ -39,7 +39,7 @@ #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h #include net/if.h #include net/if_ether.h Index: src/sys/arch/evbppc/explora/dev/fb_elb.c diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.12 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.13 --- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.12 Sat Jun 18 06:44:25 2011 +++ src/sys/arch/evbppc/explora/dev/fb_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fb_elb.c,v 1.12 2011/06/18 06:44:25 matt Exp $ */ +/* $NetBSD: fb_elb.c,v 1.13 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fb_elb.c,v 1.12
CVS commit: src/sys/arch/evbppc
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:03:51 UTC 2011 Modified Files: src/sys/arch/evbppc/virtex: consinit.c dcr.c src/sys/arch/evbppc/virtex/dev: pstwo.c tft.c tft_ll.c tft_plb.c xcvbus.c xcvbusvar.h src/sys/arch/evbppc/walnut: consinit.c src/sys/arch/evbppc/walnut/dev: ds1743.c pbus.c pbusvar.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/virtex/consinit.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/virtex/dcr.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/virtex/dev/pstwo.c \ src/sys/arch/evbppc/virtex/dev/tft.c \ src/sys/arch/evbppc/virtex/dev/tft_ll.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/dev/tft_plb.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/virtex/dev/xcvbus.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/virtex/dev/xcvbusvar.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/walnut/consinit.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/walnut/dev/ds1743.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/walnut/dev/pbus.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/walnut/dev/pbusvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/virtex/consinit.c diff -u src/sys/arch/evbppc/virtex/consinit.c:1.2 src/sys/arch/evbppc/virtex/consinit.c:1.3 --- src/sys/arch/evbppc/virtex/consinit.c:1.2 Wed Oct 17 19:54:20 2007 +++ src/sys/arch/evbppc/virtex/consinit.c Fri Jul 1 19:03:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.2 2007/10/17 19:54:20 garbled Exp $ */ +/* $NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -33,13 +33,13 @@ #include xlcom.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.2 2007/10/17 19:54:20 garbled Exp $); +__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include evbppc/virtex/virtex.h Index: src/sys/arch/evbppc/virtex/dcr.c diff -u src/sys/arch/evbppc/virtex/dcr.c:1.1 src/sys/arch/evbppc/virtex/dcr.c:1.2 --- src/sys/arch/evbppc/virtex/dcr.c:1.1 Sat Dec 2 22:18:47 2006 +++ src/sys/arch/evbppc/virtex/dcr.c Fri Jul 1 19:03:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dcr.c,v 1.1 2006/12/02 22:18:47 freza Exp $ */ +/* $NetBSD: dcr.c,v 1.2 2011/07/01 19:03:50 dyoung Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -37,10 +37,10 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dcr.c,v 1.1 2006/12/02 22:18:47 freza Exp $); +__KERNEL_RCSID(0, $NetBSD: dcr.c,v 1.2 2011/07/01 19:03:50 dyoung Exp $); #include sys/types.h -#include machine/bus.h +#include sys/bus.h #include evbppc/virtex/dcr.h int Index: src/sys/arch/evbppc/virtex/dev/pstwo.c diff -u src/sys/arch/evbppc/virtex/dev/pstwo.c:1.3 src/sys/arch/evbppc/virtex/dev/pstwo.c:1.4 --- src/sys/arch/evbppc/virtex/dev/pstwo.c:1.3 Sat Jun 18 06:44:27 2011 +++ src/sys/arch/evbppc/virtex/dev/pstwo.c Fri Jul 1 19:03:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pstwo.c,v 1.3 2011/06/18 06:44:27 matt Exp $ */ +/* $NetBSD: pstwo.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pstwo.c,v 1.3 2011/06/18 06:44:27 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pstwo.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -44,7 +44,7 @@ #include sys/syslog.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/pckbport/pckbportvar.h Index: src/sys/arch/evbppc/virtex/dev/tft.c diff -u src/sys/arch/evbppc/virtex/dev/tft.c:1.3 src/sys/arch/evbppc/virtex/dev/tft.c:1.4 --- src/sys/arch/evbppc/virtex/dev/tft.c:1.3 Sun Feb 6 23:25:17 2011 +++ src/sys/arch/evbppc/virtex/dev/tft.c Fri Jul 1 19:03:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tft.c,v 1.3 2011/02/06 23:25:17 jmcneill Exp $ */ +/* $NetBSD: tft.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tft.c,v 1.3 2011/02/06 23:25:17 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: tft.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -43,7 +43,7 @@ #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h #include dev/wscons/wsdisplayvar.h #include dev/wscons/wsconsio.h Index: src/sys/arch/evbppc/virtex/dev/tft_ll.c diff -u src/sys/arch/evbppc/virtex/dev/tft_ll.c:1.3 src/sys/arch/evbppc/virtex/dev/tft_ll.c:1.4 --- src/sys/arch/evbppc/virtex/dev/tft_ll.c:1.3 Sat Jun 18 06:44:27 2011 +++ src/sys/arch/evbppc/virtex/dev/tft_ll.c Fri Jul 1 19:03:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tft_ll.c,v 1.3 2011/06/18 06:44:27 matt
CVS commit: src/sys/arch/evbarm/tsarm
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:11:35 UTC 2011 Modified Files: src/sys/arch/evbarm/tsarm: epcom_ts.c toastersensors.c tsarm_machdep.c tskp.c tslcd.c tspld.c tsrtc.c wdc_ts.c src/sys/arch/evbarm/tsarm/isa: isa_io.c isa_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/tsarm/epcom_ts.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/toastersensors.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/tsarm/tsarm_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/tsarm/tskp.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/tslcd.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/tsarm/tspld.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/tsarm/tsrtc.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/tsarm/wdc_ts.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/tsarm/isa/isa_io.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/tsarm/epcom_ts.c diff -u src/sys/arch/evbarm/tsarm/epcom_ts.c:1.4 src/sys/arch/evbarm/tsarm/epcom_ts.c:1.5 --- src/sys/arch/evbarm/tsarm/epcom_ts.c:1.4 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/tsarm/epcom_ts.c Fri Jul 1 19:11:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: epcom_ts.c,v 1.4 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: epcom_ts.c,v 1.5 2011/07/01 19:11:34 dyoung Exp $ */ /* * Copyright (c) 2002 * Ichiro FUKUHARA ich...@ichiro.org. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: epcom_ts.c,v 1.4 2009/10/21 14:15:51 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: epcom_ts.c,v 1.5 2011/07/01 19:11:34 dyoung Exp $); /* Front-end of epcom */ @@ -40,7 +40,7 @@ #include sys/termios.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include arm/ep93xx/epcomreg.h #include arm/ep93xx/epcomvar.h Index: src/sys/arch/evbarm/tsarm/toastersensors.c diff -u src/sys/arch/evbarm/tsarm/toastersensors.c:1.8 src/sys/arch/evbarm/tsarm/toastersensors.c:1.9 --- src/sys/arch/evbarm/tsarm/toastersensors.c:1.8 Sat Mar 14 15:36:05 2009 +++ src/sys/arch/evbarm/tsarm/toastersensors.c Fri Jul 1 19:11:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: toastersensors.c,v 1.8 2009/03/14 15:36:05 dsl Exp $ */ +/* $NetBSD: toastersensors.c,v 1.9 2011/07/01 19:11:34 dyoung Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: toastersensors.c,v 1.8 2009/03/14 15:36:05 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: toastersensors.c,v 1.9 2011/07/01 19:11:34 dyoung Exp $); #include sys/param.h #include sys/sysctl.h @@ -44,7 +44,7 @@ #include sys/callout.h #include sys/select.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include dev/wscons/wsconsio.h Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.15 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.16 --- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.15 Thu Jun 30 20:09:28 2011 +++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Fri Jul 1 19:11:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tsarm_machdep.c,v 1.15 2011/06/30 20:09:28 wiz Exp $ */ +/* $NetBSD: tsarm_machdep.c,v 1.16 2011/07/01 19:11:34 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tsarm_machdep.c,v 1.15 2011/06/30 20:09:28 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: tsarm_machdep.c,v 1.16 2011/07/01 19:11:34 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -99,7 +99,7 @@ #include ddb/db_extern.h #include acorn32/include/bootconfig.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include arm/undefined.h Index: src/sys/arch/evbarm/tsarm/tskp.c diff -u src/sys/arch/evbarm/tsarm/tskp.c:1.7 src/sys/arch/evbarm/tsarm/tskp.c:1.8 --- src/sys/arch/evbarm/tsarm/tskp.c:1.7 Sat Mar 14 15:36:05 2009 +++ src/sys/arch/evbarm/tsarm/tskp.c Fri Jul 1 19:11:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tskp.c,v 1.7 2009/03/14 15:36:05 dsl Exp $ */ +/* $NetBSD: tskp.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tskp.c,v 1.7 2009/03/14 15:36:05 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: tskp.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -43,7 +43,7 @@ #include sys/callout.h #include sys/select.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include dev/wscons/wsconsio.h Index: src/sys/arch/evbarm/tsarm/tslcd.c diff -u
CVS commit: src/sys/arch/landisk
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:12:53 UTC 2011 Modified Files: src/sys/arch/landisk/dev: obio.c obiovar.h wdc_obio.c src/sys/arch/landisk/landisk: bus_dma.c machdep.c mainbus.c shpcic_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/landisk/dev/obio.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/dev/obiovar.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/landisk/dev/wdc_obio.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/landisk/landisk/bus_dma.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/landisk/landisk/machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/landisk/mainbus.c \ src/sys/arch/landisk/landisk/shpcic_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/landisk/dev/obio.c diff -u src/sys/arch/landisk/dev/obio.c:1.8 src/sys/arch/landisk/dev/obio.c:1.9 --- src/sys/arch/landisk/dev/obio.c:1.8 Sat Nov 7 07:27:45 2009 +++ src/sys/arch/landisk/dev/obio.c Fri Jul 1 19:12:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.8 2009/11/07 07:27:45 cegger Exp $ */ +/* $NetBSD: obio.c,v 1.9 2011/07/01 19:12:53 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.8 2009/11/07 07:27:45 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.9 2011/07/01 19:12:53 dyoung Exp $); #include btn_obio.h #include pwrsw_obio.h @@ -46,7 +46,7 @@ #include sh3/pmap.h #include sh3/pte.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/intr.h Index: src/sys/arch/landisk/dev/obiovar.h diff -u src/sys/arch/landisk/dev/obiovar.h:1.3 src/sys/arch/landisk/dev/obiovar.h:1.4 --- src/sys/arch/landisk/dev/obiovar.h:1.3 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/landisk/dev/obiovar.h Fri Jul 1 19:12:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obiovar.h,v 1.3 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: obiovar.h,v 1.4 2011/07/01 19:12:53 dyoung Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ #ifndef _LANDISK_OBIOVAR_H_ #define _LANDISK_OBIOVAR_H_ -#include machine/bus.h +#include sys/bus.h /* obio tag */ extern struct _bus_space obio_bus_io; Index: src/sys/arch/landisk/dev/wdc_obio.c diff -u src/sys/arch/landisk/dev/wdc_obio.c:1.4 src/sys/arch/landisk/dev/wdc_obio.c:1.5 --- src/sys/arch/landisk/dev/wdc_obio.c:1.4 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/landisk/dev/wdc_obio.c Fri Jul 1 19:12:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wdc_obio.c,v 1.4 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: wdc_obio.c,v 1.5 2011/07/01 19:12:53 dyoung Exp $ */ /*- * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: wdc_obio.c,v 1.4 2008/04/28 20:23:26 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: wdc_obio.c,v 1.5 2011/07/01 19:12:53 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -38,7 +38,7 @@ #include sys/device.h #include sys/malloc.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/ata/atavar.h Index: src/sys/arch/landisk/landisk/bus_dma.c diff -u src/sys/arch/landisk/landisk/bus_dma.c:1.13 src/sys/arch/landisk/landisk/bus_dma.c:1.14 --- src/sys/arch/landisk/landisk/bus_dma.c:1.13 Sat Nov 6 11:46:01 2010 +++ src/sys/arch/landisk/landisk/bus_dma.c Fri Jul 1 19:12:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.13 2010/11/06 11:46:01 uebayasi Exp $ */ +/* $NetBSD: bus_dma.c,v 1.14 2011/07/01 19:12:53 dyoung Exp $ */ /* * Copyright (c) 2005 NONAKA Kimihiro @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.13 2010/11/06 11:46:01 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.14 2011/07/01 19:12:53 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -41,7 +41,7 @@ #include machine/autoconf.h #define _LANDISK_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #if defined(DEBUG) defined(BUSDMA_DEBUG) int busdma_debug = 0; Index: src/sys/arch/landisk/landisk/machdep.c diff -u src/sys/arch/landisk/landisk/machdep.c:1.14 src/sys/arch/landisk/landisk/machdep.c:1.15 --- src/sys/arch/landisk/landisk/machdep.c:1.14 Tue Mar 2 17:28:08 2010 +++ src/sys/arch/landisk/landisk/machdep.c Fri Jul 1 19:12:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.14 2010/03/02 17:28:08 pooka Exp $ */ +/* $NetBSD: machdep.c,v 1.15 2011/07/01 19:12:53 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.14 2010/03/02 17:28:08 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.15 2011/07/01 19:12:53 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -101,7 +101,7 @@
CVS commit: src/sys/arch/sh3/dev
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:17:38 UTC 2011 Modified Files: src/sys/arch/sh3/dev: shpcic.c shpcicvar.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sh3/dev/shpcic.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sh3/dev/shpcicvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sh3/dev/shpcic.c diff -u src/sys/arch/sh3/dev/shpcic.c:1.14 src/sys/arch/sh3/dev/shpcic.c:1.15 --- src/sys/arch/sh3/dev/shpcic.c:1.14 Tue May 17 17:34:52 2011 +++ src/sys/arch/sh3/dev/shpcic.c Fri Jul 1 19:17:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: shpcic.c,v 1.14 2011/05/17 17:34:52 dyoung Exp $ */ +/* $NetBSD: shpcic.c,v 1.15 2011/07/01 19:17:38 dyoung Exp $ */ /* * Copyright (c) 2005 NONAKA Kimihiro @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: shpcic.c,v 1.14 2011/05/17 17:34:52 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: shpcic.c,v 1.15 2011/07/01 19:17:38 dyoung Exp $); #include opt_pci.h @@ -47,7 +47,7 @@ #include sh3/exception.h #include sh3/pcicreg.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/pci_machdep.h Index: src/sys/arch/sh3/dev/shpcicvar.h diff -u src/sys/arch/sh3/dev/shpcicvar.h:1.7 src/sys/arch/sh3/dev/shpcicvar.h:1.8 --- src/sys/arch/sh3/dev/shpcicvar.h:1.7 Sun Aug 2 00:06:44 2009 +++ src/sys/arch/sh3/dev/shpcicvar.h Fri Jul 1 19:17:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: shpcicvar.h,v 1.7 2009/08/02 00:06:44 nonaka Exp $ */ +/* $NetBSD: shpcicvar.h,v 1.8 2011/07/01 19:17:38 dyoung Exp $ */ /*- * Copyright (c) 2005 NONAKA Kimihiro @@ -29,7 +29,7 @@ #ifndef _SH3_SHPCICVAR_H_ #define _SH3_SHPCICVAR_H_ -#include machine/bus.h +#include sys/bus.h bus_space_tag_t shpcic_get_bus_io_tag(void); bus_space_tag_t shpcic_get_bus_mem_tag(void);
CVS commit: src/sys/arch/alpha
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:19:51 UTC 2011 Modified Files: src/sys/arch/alpha/pci: agp_machdep.c apecs_bus_io.c apecs_bus_mem.c apecs_dma.c cia_bwx_bus_io.c cia_bwx_bus_mem.c cia_dma.c cia_swiz_bus_io.c cia_swiz_bus_mem.c dwlpx_bus_io.c dwlpx_bus_mem.c dwlpx_dma.c irongate_bus_io.c irongate_bus_mem.c irongate_dma.c lca_bus_io.c lca_bus_mem.c lca_dma.c mcpcia_bus_io.c mcpcia_bus_mem.c mcpcia_dma.c pci_2100_a50.c pci_6600.c pci_axppci_33.c pci_sgmap_pte32.c pci_sgmap_pte64.c pci_up1000.c sio.c sio_pic.c tsp_bus_io.c tsp_bus_mem.c tsp_dma.c ttwoga_bus_io.c ttwoga_bus_mem.c ttwoga_dma.c src/sys/arch/alpha/sableio: com_sableio.c fdc_sableio.c lpt_sableio.c src/sys/arch/alpha/tc: ioasic.c mcclock_ioasic.c tc_bus_mem.c tc_dma.c tc_dma_3000_300.c tc_dma_3000_500.c tc_sgmap.c src/sys/arch/alpha/tlsb: gbusvar.h mcclock_tlsb.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/pci/agp_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/pci/apecs_bus_io.c \ src/sys/arch/alpha/pci/apecs_bus_mem.c \ src/sys/arch/alpha/pci/lca_bus_io.c src/sys/arch/alpha/pci/lca_bus_mem.c \ src/sys/arch/alpha/pci/tsp_bus_mem.c src/sys/arch/alpha/pci/tsp_dma.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/pci/apecs_dma.c \ src/sys/arch/alpha/pci/mcpcia_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/pci/cia_bwx_bus_io.c \ src/sys/arch/alpha/pci/cia_bwx_bus_mem.c \ src/sys/arch/alpha/pci/mcpcia_bus_io.c \ src/sys/arch/alpha/pci/mcpcia_bus_mem.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/alpha/pci/cia_dma.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/pci/cia_swiz_bus_io.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/pci/cia_swiz_bus_mem.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/pci/dwlpx_bus_io.c \ src/sys/arch/alpha/pci/dwlpx_bus_mem.c \ src/sys/arch/alpha/pci/pci_up1000.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/pci/dwlpx_dma.c \ src/sys/arch/alpha/pci/lca_dma.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/pci/irongate_bus_io.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/pci/irongate_bus_mem.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/pci/irongate_dma.c \ src/sys/arch/alpha/pci/ttwoga_dma.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/alpha/pci/pci_2100_a50.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/pci/pci_6600.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/alpha/pci/pci_axppci_33.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/pci/pci_sgmap_pte32.c \ src/sys/arch/alpha/pci/pci_sgmap_pte64.c \ src/sys/arch/alpha/pci/tsp_bus_io.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/alpha/pci/sio.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/alpha/pci/sio_pic.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/pci/ttwoga_bus_io.c \ src/sys/arch/alpha/pci/ttwoga_bus_mem.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/sableio/com_sableio.c \ src/sys/arch/alpha/sableio/fdc_sableio.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/sableio/lpt_sableio.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/tc/ioasic.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/tc/mcclock_ioasic.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/tc/tc_bus_mem.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/tc/tc_dma.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/tc/tc_dma_3000_300.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/tc/tc_dma_3000_500.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/tc/tc_sgmap.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/tlsb/gbusvar.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/tlsb/mcclock_tlsb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/pci/agp_machdep.c diff -u src/sys/arch/alpha/pci/agp_machdep.c:1.3 src/sys/arch/alpha/pci/agp_machdep.c:1.4 --- src/sys/arch/alpha/pci/agp_machdep.c:1.3 Sun Dec 11 12:16:17 2005 +++ src/sys/arch/alpha/pci/agp_machdep.c Fri Jul 1 19:19:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: agp_machdep.c,v 1.3 2005/12/11 12:16:17 christos Exp $ */ +/* $NetBSD: agp_machdep.c,v 1.4 2011/07/01 19:19:49 dyoung Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -36,13 +36,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agp_machdep.c,v 1.3 2005/12/11 12:16:17 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: agp_machdep.c,v 1.4 2011/07/01 19:19:49 dyoung Exp $); #include sys/types.h #include sys/device.h #include machine/alpha_cpu.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/alpha/pci/apecs_bus_io.c diff -u src/sys/arch/alpha/pci/apecs_bus_io.c:1.10 src/sys/arch/alpha/pci/apecs_bus_io.c:1.11 --- src/sys/arch/alpha/pci/apecs_bus_io.c:1.10 Wed Dec 15 01:27:18 2010 +++ src/sys/arch/alpha/pci/apecs_bus_io.c
CVS commit: src/sys/arch/alpha
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:22:35 UTC 2011 Modified Files: src/sys/arch/alpha/alpha: api_up1000.c dec_1000a.c dec_2100_a50.c dec_2100_a500.c dec_550.c dec_6600.c dec_alphabook1.c dec_eb164.c dec_eb66.c dec_kn20aa.c kgdb_machdep.c mcclock.c src/sys/arch/alpha/common: bus_dma.c comlogout.c sgmap_common.c sgmapvar.h src/sys/arch/alpha/isa: isadma_bounce.c isapnp_machdep.c mcclock_isa.c src/sys/arch/alpha/jensenio: com_jensenio.c jensenio_bus_intio.c jensenio_bus_io.c jensenio_bus_mem.c jensenio_dma.c lpt_jensenio.c mcclock_jensenio.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/alpha/api_up1000.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/alpha/dec_1000a.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/alpha/alpha/dec_2100_a50.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/alpha/alpha/dec_2100_a500.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/alpha/alpha/dec_550.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/alpha/dec_6600.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/alpha/dec_alphabook1.c cvs rdiff -u -r1.59 -r1.60 src/sys/arch/alpha/alpha/dec_eb164.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/alpha/dec_eb66.c cvs rdiff -u -r1.62 -r1.63 src/sys/arch/alpha/alpha/dec_kn20aa.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/alpha/kgdb_machdep.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/alpha/mcclock.c cvs rdiff -u -r1.67 -r1.68 src/sys/arch/alpha/common/bus_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/common/comlogout.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/common/sgmap_common.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/common/sgmapvar.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/isa/isadma_bounce.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/isa/isapnp_machdep.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/isa/mcclock_isa.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/jensenio/com_jensenio.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/jensenio/jensenio_bus_intio.c \ src/sys/arch/alpha/jensenio/jensenio_bus_io.c \ src/sys/arch/alpha/jensenio/jensenio_bus_mem.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/jensenio/jensenio_dma.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/jensenio/lpt_jensenio.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/jensenio/mcclock_jensenio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/api_up1000.c diff -u src/sys/arch/alpha/alpha/api_up1000.c:1.27 src/sys/arch/alpha/alpha/api_up1000.c:1.28 --- src/sys/arch/alpha/alpha/api_up1000.c:1.27 Tue Jun 14 15:34:21 2011 +++ src/sys/arch/alpha/alpha/api_up1000.c Fri Jul 1 19:22:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: api_up1000.c,v 1.27 2011/06/14 15:34:21 matt Exp $ */ +/* $NetBSD: api_up1000.c,v 1.28 2011/07/01 19:22:35 dyoung Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: api_up1000.c,v 1.27 2011/06/14 15:34:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: api_up1000.c,v 1.28 2011/07/01 19:22:35 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -47,7 +47,7 @@ #include machine/rpb.h #include machine/autoconf.h #include machine/cpuconf.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/comreg.h #include dev/ic/comvar.h Index: src/sys/arch/alpha/alpha/dec_1000a.c diff -u src/sys/arch/alpha/alpha/dec_1000a.c:1.30 src/sys/arch/alpha/alpha/dec_1000a.c:1.31 --- src/sys/arch/alpha/alpha/dec_1000a.c:1.30 Tue Jun 14 15:34:21 2011 +++ src/sys/arch/alpha/alpha/dec_1000a.c Fri Jul 1 19:22:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_1000a.c,v 1.30 2011/06/14 15:34:21 matt Exp $ */ +/* $NetBSD: dec_1000a.c,v 1.31 2011/07/01 19:22:35 dyoung Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: dec_1000a.c,v 1.30 2011/06/14 15:34:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: dec_1000a.c,v 1.31 2011/07/01 19:22:35 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -77,7 +77,7 @@ #include machine/rpb.h #include machine/autoconf.h #include machine/cpuconf.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/comreg.h #include dev/ic/comvar.h Index: src/sys/arch/alpha/alpha/dec_2100_a50.c diff -u src/sys/arch/alpha/alpha/dec_2100_a50.c:1.64 src/sys/arch/alpha/alpha/dec_2100_a50.c:1.65 --- src/sys/arch/alpha/alpha/dec_2100_a50.c:1.64 Tue Jun 14 15:34:21 2011 +++ src/sys/arch/alpha/alpha/dec_2100_a50.c Fri Jul 1 19:22:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_2100_a50.c,v 1.64 2011/06/14 15:34:21 matt Exp $ */ +/* $NetBSD: dec_2100_a50.c,v 1.65 2011/07/01 19:22:35 dyoung Exp $ */ /*
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:24:14 UTC 2011 Modified Files: src/sys/arch/amd64/amd64: fpu.c genassym.cf rbus_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/amd64/fpu.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/amd64/rbus_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/fpu.c diff -u src/sys/arch/amd64/amd64/fpu.c:1.34 src/sys/arch/amd64/amd64/fpu.c:1.35 --- src/sys/arch/amd64/amd64/fpu.c:1.34 Mon Mar 7 02:24:57 2011 +++ src/sys/arch/amd64/amd64/fpu.c Fri Jul 1 19:24:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.34 2011/03/07 02:24:57 cherry Exp $ */ +/* $NetBSD: fpu.c,v 1.35 2011/07/01 19:24:14 dyoung Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. All @@ -100,7 +100,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.34 2011/03/07 02:24:57 cherry Exp $); +__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.35 2011/07/01 19:24:14 dyoung Exp $); #include opt_multiprocessor.h @@ -114,7 +114,7 @@ #include sys/vmmeter.h #include sys/kernel.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/intr.h #include machine/cpufunc.h Index: src/sys/arch/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.47 src/sys/arch/amd64/amd64/genassym.cf:1.48 --- src/sys/arch/amd64/amd64/genassym.cf:1.47 Sun Jun 12 03:35:37 2011 +++ src/sys/arch/amd64/amd64/genassym.cf Fri Jul 1 19:24:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.47 2011/06/12 03:35:37 rmind Exp $ +# $NetBSD: genassym.cf,v 1.48 2011/07/01 19:24:14 dyoung Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -122,7 +122,7 @@ include xen/xen3-public/xen.h endif -include x86/bus.h +include sys/bus.h define LSRUN LSRUN define LSONPROC LSONPROC Index: src/sys/arch/amd64/amd64/rbus_machdep.c diff -u src/sys/arch/amd64/amd64/rbus_machdep.c:1.4 src/sys/arch/amd64/amd64/rbus_machdep.c:1.5 --- src/sys/arch/amd64/amd64/rbus_machdep.c:1.4 Mon Dec 20 00:25:24 2010 +++ src/sys/arch/amd64/amd64/rbus_machdep.c Fri Jul 1 19:24:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rbus_machdep.c,v 1.4 2010/12/20 00:25:24 matt Exp $ */ +/* $NetBSD: rbus_machdep.c,v 1.5 2011/07/01 19:24:14 dyoung Exp $ */ /* * Copyright (c) 1999 @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rbus_machdep.c,v 1.4 2010/12/20 00:25:24 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: rbus_machdep.c,v 1.5 2011/07/01 19:24:14 dyoung Exp $); #include opt_pcifixup.h @@ -36,7 +36,7 @@ #include sys/sysctl.h -#include machine/bus.h +#include sys/bus.h #include dev/cardbus/rbus.h #include sys/device.h
CVS commit: src/sys/arch/arc
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:25:42 UTC 2011 Modified Files: src/sys/arch/arc/dev: opms.c pccons.c src/sys/arch/arc/dti: arcsisabr.c tyneisabr.c src/sys/arch/arc/isa: isadma_bounce.c isapnp_machdep.c mcclock_isa.c opms_isa.c pccons_isa.c timer_isa.c src/sys/arch/arc/jazz: asc.c bus_dma_jazz.c com_jazzio.c fd.c fdc_jazzio.c if_sn_jazzio.c jazzdmatlb.c jazzio.c jazziovar.h jazzisabr.c lpt_jazzio.c mcclock_jazzio.c oosiop_jazzio.c opms_jazzio.c osiop_jazzio.c pccons_jazzio.c vga_jazzio.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arc/dev/opms.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arc/dev/pccons.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arc/dti/arcsisabr.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/dti/tyneisabr.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/isa/isadma_bounce.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arc/isa/isapnp_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/isa/mcclock_isa.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/isa/opms_isa.c \ src/sys/arch/arc/isa/pccons_isa.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/isa/timer_isa.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arc/jazz/asc.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arc/jazz/bus_dma_jazz.c \ src/sys/arch/arc/jazz/vga_jazzio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/jazz/com_jazzio.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arc/jazz/fd.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/jazz/fdc_jazzio.c \ src/sys/arch/arc/jazz/jazzdmatlb.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/jazz/if_sn_jazzio.c \ src/sys/arch/arc/jazz/jazzisabr.c src/sys/arch/arc/jazz/mcclock_jazzio.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arc/jazz/jazzio.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/jazz/jazziovar.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/jazz/lpt_jazzio.c \ src/sys/arch/arc/jazz/osiop_jazzio.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arc/jazz/oosiop_jazzio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/jazz/opms_jazzio.c \ src/sys/arch/arc/jazz/pccons_jazzio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arc/dev/opms.c diff -u src/sys/arch/arc/dev/opms.c:1.18 src/sys/arch/arc/dev/opms.c:1.19 --- src/sys/arch/arc/dev/opms.c:1.18 Fri Jun 13 08:27:38 2008 +++ src/sys/arch/arc/dev/opms.c Fri Jul 1 19:25:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: opms.c,v 1.18 2008/06/13 08:27:38 cegger Exp $ */ +/* $NetBSD: opms.c,v 1.19 2011/07/01 19:25:41 dyoung Exp $ */ /* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */ /* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */ @@ -80,7 +80,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: opms.c,v 1.18 2008/06/13 08:27:38 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: opms.c,v 1.19 2011/07/01 19:25:41 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -91,7 +91,7 @@ #include sys/proc.h #include sys/conf.h -#include machine/bus.h +#include sys/bus.h #include machine/kbdreg.h #include machine/mouse.h Index: src/sys/arch/arc/dev/pccons.c diff -u src/sys/arch/arc/dev/pccons.c:1.58 src/sys/arch/arc/dev/pccons.c:1.59 --- src/sys/arch/arc/dev/pccons.c:1.58 Sun Apr 24 16:26:53 2011 +++ src/sys/arch/arc/dev/pccons.c Fri Jul 1 19:25:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pccons.c,v 1.58 2011/04/24 16:26:53 rmind Exp $ */ +/* $NetBSD: pccons.c,v 1.59 2011/07/01 19:25:41 dyoung Exp $ */ /* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */ /* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */ @@ -80,7 +80,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pccons.c,v 1.58 2011/04/24 16:26:53 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: pccons.c,v 1.59 2011/07/01 19:25:41 dyoung Exp $); #include opt_ddb.h @@ -97,7 +97,7 @@ #include sys/proc.h #include sys/kauth.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/pcdisplay.h #include machine/pccons.h Index: src/sys/arch/arc/dti/arcsisabr.c diff -u src/sys/arch/arc/dti/arcsisabr.c:1.4 src/sys/arch/arc/dti/arcsisabr.c:1.5 --- src/sys/arch/arc/dti/arcsisabr.c:1.4 Sat Jul 5 08:46:25 2008 +++ src/sys/arch/arc/dti/arcsisabr.c Fri Jul 1 19:25:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: arcsisabr.c,v 1.4 2008/07/05 08:46:25 tsutsui Exp $ */ +/* $NetBSD: arcsisabr.c,v 1.5 2011/07/01 19:25:41 dyoung Exp $ */ /* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */ /* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */ @@ -75,14 +75,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arcsisabr.c,v 1.4 2008/07/05 08:46:25 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: arcsisabr.c,v 1.5 2011/07/01 19:25:41 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h
CVS commit: src/sys/arch/arc
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:28:00 UTC 2011 Modified Files: src/sys/arch/arc/arc: bus_dma.c bus_space_large.c bus_space_sparse.c c_jazz_eisa.c c_magnum.c c_nec_pci.c machdep.c p_dti_arcstation.c src/sys/arch/arc/pci: necpb.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arc/arc/bus_dma.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/arc/bus_space_large.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/arc/bus_space_sparse.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/arc/c_jazz_eisa.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arc/arc/c_magnum.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arc/arc/c_nec_pci.c cvs rdiff -u -r1.123 -r1.124 src/sys/arch/arc/arc/machdep.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arc/arc/p_dti_arcstation.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arc/pci/necpb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arc/arc/bus_dma.c diff -u src/sys/arch/arc/arc/bus_dma.c:1.32 src/sys/arch/arc/arc/bus_dma.c:1.33 --- src/sys/arch/arc/arc/bus_dma.c:1.32 Sun Feb 20 07:52:42 2011 +++ src/sys/arch/arc/arc/bus_dma.c Fri Jul 1 19:28:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.32 2011/02/20 07:52:42 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.33 2011/07/01 19:28:00 dyoung Exp $ */ /* NetBSD: bus_dma.c,v 1.20 2000/01/10 03:24:36 simonb Exp */ /*- @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.32 2011/02/20 07:52:42 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.33 2011/07/01 19:28:00 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -45,7 +45,7 @@ #include mips/cache.h #define _ARC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h paddr_t kvtophys(vaddr_t); /* XXX */ Index: src/sys/arch/arc/arc/bus_space_large.c diff -u src/sys/arch/arc/arc/bus_space_large.c:1.7 src/sys/arch/arc/arc/bus_space_large.c:1.8 --- src/sys/arch/arc/arc/bus_space_large.c:1.7 Mon Apr 28 20:23:13 2008 +++ src/sys/arch/arc/arc/bus_space_large.c Fri Jul 1 19:28:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space_large.c,v 1.7 2008/04/28 20:23:13 martin Exp $ */ +/* $NetBSD: bus_space_large.c,v 1.8 2011/07/01 19:28:00 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_space_large.c,v 1.7 2008/04/28 20:23:13 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_space_large.c,v 1.8 2011/07/01 19:28:00 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -57,7 +57,7 @@ #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h #include machine/wired_map.h static int arc_large_bus_space_compose_handle(bus_space_tag_t, bus_addr_t, Index: src/sys/arch/arc/arc/bus_space_sparse.c diff -u src/sys/arch/arc/arc/bus_space_sparse.c:1.17 src/sys/arch/arc/arc/bus_space_sparse.c:1.18 --- src/sys/arch/arc/arc/bus_space_sparse.c:1.17 Sun Feb 20 07:52:42 2011 +++ src/sys/arch/arc/arc/bus_space_sparse.c Fri Jul 1 19:28:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space_sparse.c,v 1.17 2011/02/20 07:52:42 matt Exp $ */ +/* $NetBSD: bus_space_sparse.c,v 1.18 2011/07/01 19:28:00 dyoung Exp $ */ /* NetBSD: bus_machdep.c,v 1.1 2000/01/26 18:48:00 drochner Exp */ /*- @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_space_sparse.c,v 1.17 2011/02/20 07:52:42 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_space_sparse.c,v 1.18 2011/07/01 19:28:00 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -51,7 +51,7 @@ #include mips/cpuregs.h #include mips/pte.h -#include machine/bus.h +#include sys/bus.h extern paddr_t kvtophys(vaddr_t); /* XXX */ Index: src/sys/arch/arc/arc/c_jazz_eisa.c diff -u src/sys/arch/arc/arc/c_jazz_eisa.c:1.12 src/sys/arch/arc/arc/c_jazz_eisa.c:1.13 --- src/sys/arch/arc/arc/c_jazz_eisa.c:1.12 Sun Dec 11 12:16:37 2005 +++ src/sys/arch/arc/arc/c_jazz_eisa.c Fri Jul 1 19:28:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: c_jazz_eisa.c,v 1.12 2005/12/11 12:16:37 christos Exp $ */ +/* $NetBSD: c_jazz_eisa.c,v 1.13 2011/07/01 19:28:00 dyoung Exp $ */ /* * Copyright (c) 1998 @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: c_jazz_eisa.c,v 1.12 2005/12/11 12:16:37 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: c_jazz_eisa.c,v 1.13 2011/07/01 19:28:00 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -40,7 +40,7 @@ #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/pio.h #include machine/platform.h Index: src/sys/arch/arc/arc/c_magnum.c diff -u src/sys/arch/arc/arc/c_magnum.c:1.21 src/sys/arch/arc/arc/c_magnum.c:1.22 --- src/sys/arch/arc/arc/c_magnum.c:1.21 Sun Feb 20 07:52:42 2011 +++ src/sys/arch/arc/arc/c_magnum.c Fri
CVS commit: src/sys/arch/arm
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:31:17 UTC 2011 Modified Files: src/sys/arch/arm/at91: at91_bus_dma.c at91_bus_space.c at91aic.c at91bus.c at91busvar.h at91cf.c at91dbgu.c at91emac.c at91ohci.c at91pdc.c at91pio.c at91pmc.c at91spi.c at91st.c at91tctmr.c at91twi.c at91usart.c src/sys/arch/arm/ep93xx: ep93xx_busdma.c ep93xx_intr.c ep93xx_space.c ep93xxvar.h epclk.c epcom.c epe.c epgpio.c epled.c epohci.c eppcic.c eprtc.c epsoc.c epsocvar.h epwdog.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91_bus_dma.c \ src/sys/arch/arm/at91/at91_bus_space.c src/sys/arch/arm/at91/at91busvar.h \ src/sys/arch/arm/at91/at91ohci.c src/sys/arch/arm/at91/at91pio.c \ src/sys/arch/arm/at91/at91pmc.c src/sys/arch/arm/at91/at91st.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/at91/at91aic.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/at91/at91bus.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91cf.c \ src/sys/arch/arm/at91/at91pdc.c src/sys/arch/arm/at91/at91spi.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/at91/at91dbgu.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/at91/at91emac.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/at91/at91tctmr.c \ src/sys/arch/arm/at91/at91twi.c src/sys/arch/arm/at91/at91usart.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ep93xx/ep93xx_busdma.c \ src/sys/arch/arm/ep93xx/ep93xxvar.h src/sys/arch/arm/ep93xx/epgpio.c \ src/sys/arch/arm/ep93xx/epsocvar.h src/sys/arch/arm/ep93xx/epwdog.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/ep93xx/ep93xx_intr.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ep93xx/ep93xx_space.c \ src/sys/arch/arm/ep93xx/epohci.c src/sys/arch/arm/ep93xx/eppcic.c \ src/sys/arch/arm/ep93xx/eprtc.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/ep93xx/epclk.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/ep93xx/epcom.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/ep93xx/epe.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ep93xx/epled.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/ep93xx/epsoc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/at91/at91_bus_dma.c diff -u src/sys/arch/arm/at91/at91_bus_dma.c:1.3 src/sys/arch/arm/at91/at91_bus_dma.c:1.4 --- src/sys/arch/arm/at91/at91_bus_dma.c:1.3 Fri Oct 23 00:39:29 2009 +++ src/sys/arch/arm/at91/at91_bus_dma.c Fri Jul 1 19:31:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: at91_bus_dma.c,v 1.3 2009/10/23 00:39:29 snj Exp $ */ +/* $NetBSD: at91_bus_dma.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */ /* * Copyright (c) 2004 Jesse Off @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: at91_bus_dma.c,v 1.3 2009/10/23 00:39:29 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: at91_bus_dma.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $); #include sys/param.h #include sys/types.h @@ -42,7 +42,7 @@ #include sys/extent.h #define _ARM32_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include arm/at91/at91var.h Index: src/sys/arch/arm/at91/at91_bus_space.c diff -u src/sys/arch/arm/at91/at91_bus_space.c:1.3 src/sys/arch/arm/at91/at91_bus_space.c:1.4 --- src/sys/arch/arm/at91/at91_bus_space.c:1.3 Fri Oct 23 06:53:12 2009 +++ src/sys/arch/arm/at91/at91_bus_space.c Fri Jul 1 19:31:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */ +/* $NetBSD: at91_bus_space.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */ /* * Based on ep93xx_space.c @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: at91_bus_space.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $); /* * bus_space I/O functions for ep93xx @@ -43,7 +43,7 @@ #include uvm/uvm.h -#include machine/bus.h +#include sys/bus.h #include arm/at91/at91var.h //#include arm/ep93xx/ep93xxreg.h Index: src/sys/arch/arm/at91/at91busvar.h diff -u src/sys/arch/arm/at91/at91busvar.h:1.3 src/sys/arch/arm/at91/at91busvar.h:1.4 --- src/sys/arch/arm/at91/at91busvar.h:1.3 Fri Oct 23 06:53:13 2009 +++ src/sys/arch/arm/at91/at91busvar.h Fri Jul 1 19:31:16 2011 @@ -1,5 +1,5 @@ -/* $Id: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ -/* $NetBSD: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ +/* $Id: at91busvar.h,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */ +/* $NetBSD: at91busvar.h,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -34,7 +34,7 @@ #include sys/device.h #include sys/queue.h -#include machine/bus.h +#include sys/bus.h #include arm/at91/at91piovar.h Index: src/sys/arch/arm/at91/at91ohci.c diff -u src/sys/arch/arm/at91/at91ohci.c:1.3 src/sys/arch/arm/at91/at91ohci.c:1.4 --- src/sys/arch/arm/at91/at91ohci.c:1.3 Sat Mar 14 15:36:01 2009 +++
CVS commit: src/sys/arch/arm
Module Name:src Committed By: dyoung Date: Fri Jul 1 19:32:28 UTC 2011 Modified Files: src/sys/arch/arm/footbridge: footbridge.c footbridge.h footbridge_com.c footbridge_com_io.c footbridge_io.c footbridge_pci.c footbridgevar.h src/sys/arch/arm/footbridge/isa: isa_io.c isa_machdep.c isadma_machdep.c isapnp_machdep.c src/sys/arch/arm/gemini: gemini_a4x_space.c gemini_com.c gemini_dma.c gemini_gmac.c gemini_gpio.c gemini_icu.c gemini_lpchc.c gemini_lpchcvar.h gemini_lpcvar.h gemini_obio.c gemini_pci.c gemini_space.c gemini_timer.c gemini_var.h gemini_wdt.c gemini_wdtvar.h if_gmc.c if_gpn.c lpc_com.c obio_lpchc.c obio_timer.c obio_wdc.c obio_wdt.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/footbridge/footbridge.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/footbridge/footbridge.h cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/footbridge/footbridge_com.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/footbridge/footbridge_com_io.c \ src/sys/arch/arm/footbridge/footbridgevar.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/footbridge/footbridge_io.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/footbridge/footbridge_pci.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/footbridge/isa/isa_io.c \ src/sys/arch/arm/footbridge/isa/isapnp_machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/footbridge/isa/isa_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/footbridge/isa/isadma_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/gemini/gemini_a4x_space.c \ src/sys/arch/arm/gemini/gemini_dma.c \ src/sys/arch/arm/gemini/gemini_lpchc.c \ src/sys/arch/arm/gemini/gemini_var.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/gemini/gemini_com.c \ src/sys/arch/arm/gemini/gemini_gpio.c \ src/sys/arch/arm/gemini/gemini_lpcvar.h \ src/sys/arch/arm/gemini/gemini_space.c \ src/sys/arch/arm/gemini/gemini_wdt.c src/sys/arch/arm/gemini/obio_lpchc.c \ src/sys/arch/arm/gemini/obio_wdc.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/gemini_gmac.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/gemini_icu.c \ src/sys/arch/arm/gemini/gemini_timer.c \ src/sys/arch/arm/gemini/obio_timer.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_lpchcvar.h \ src/sys/arch/arm/gemini/gemini_wdtvar.h src/sys/arch/arm/gemini/if_gmc.c \ src/sys/arch/arm/gemini/if_gpn.c src/sys/arch/arm/gemini/lpc_com.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/gemini/gemini_obio.c \ src/sys/arch/arm/gemini/gemini_pci.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/gemini/obio_wdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/footbridge/footbridge.c diff -u src/sys/arch/arm/footbridge/footbridge.c:1.24 src/sys/arch/arm/footbridge/footbridge.c:1.25 --- src/sys/arch/arm/footbridge/footbridge.c:1.24 Tue May 17 17:34:47 2011 +++ src/sys/arch/arm/footbridge/footbridge.c Fri Jul 1 19:32:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: footbridge.c,v 1.24 2011/05/17 17:34:47 dyoung Exp $ */ +/* $NetBSD: footbridge.c,v 1.25 2011/07/01 19:32:28 dyoung Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: footbridge.c,v 1.24 2011/05/17 17:34:47 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: footbridge.c,v 1.25 2011/07/01 19:32:28 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -47,7 +47,7 @@ #include dev/pci/pcivar.h #define _ARM32_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/bootconfig.h Index: src/sys/arch/arm/footbridge/footbridge.h diff -u src/sys/arch/arm/footbridge/footbridge.h:1.3 src/sys/arch/arm/footbridge/footbridge.h:1.4 --- src/sys/arch/arm/footbridge/footbridge.h:1.3 Sat Mar 14 14:45:55 2009 +++ src/sys/arch/arm/footbridge/footbridge.h Fri Jul 1 19:32:28 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: footbridge.h,v 1.3 2009/03/14 14:45:55 dsl Exp $ */ +/* $NetBSD: footbridge.h,v 1.4 2011/07/01 19:32:28 dyoung Exp $ */ #ifndef _FOOTBRIDGE_H_ #define _FOOTBRIDGE_H_ #include sys/termios.h -#include arm/bus.h +#include sys/bus.h void footbridge_pci_bs_tag_init(void); void footbridge_sa110_cc_setup(void); void footbridge_create_io_bs_tag(struct bus_space *, void *); Index: src/sys/arch/arm/footbridge/footbridge_com.c diff -u src/sys/arch/arm/footbridge/footbridge_com.c:1.33 src/sys/arch/arm/footbridge/footbridge_com.c:1.34 --- src/sys/arch/arm/footbridge/footbridge_com.c:1.33 Sun Apr 24 16:26:53 2011 +++ src/sys/arch/arm/footbridge/footbridge_com.c Fri Jul 1 19:32:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: footbridge_com.c,v 1.33 2011/04/24 16:26:53 rmind Exp $ */ +/* $NetBSD: footbridge_com.c,v 1.34 2011/07/01 19:32:28 dyoung Exp $
CVS commit: src/sys/arch/arm/iomd
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:26:36 UTC 2011 Modified Files: src/sys/arch/arm/iomd: iomd.c iomd_io.c iomdkbc.c iomdvar.h qms.c vidc20.c vidcvideo.c src/sys/arch/arm/iomd/console: consinit.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/iomd/iomd.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/iomd/iomd_io.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/iomd/iomdkbc.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/iomd/iomdvar.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/iomd/qms.c \ src/sys/arch/arm/iomd/vidc20.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/iomd/vidcvideo.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/iomd/console/consinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/iomd/iomd.c diff -u src/sys/arch/arm/iomd/iomd.c:1.16 src/sys/arch/arm/iomd/iomd.c:1.17 --- src/sys/arch/arm/iomd/iomd.c:1.16 Thu Jun 30 20:09:20 2011 +++ src/sys/arch/arm/iomd/iomd.c Fri Jul 1 20:26:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iomd.c,v 1.16 2011/06/30 20:09:20 wiz Exp $ */ +/* $NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $ */ /* * Copyright (c) 1996-1997 Mark Brinicombe. @@ -43,7 +43,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: iomd.c,v 1.16 2011/06/30 20:09:20 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -51,7 +51,7 @@ #include sys/conf.h #include sys/malloc.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/intr.h #include arm/iomd/iomdreg.h Index: src/sys/arch/arm/iomd/iomd_io.c diff -u src/sys/arch/arm/iomd/iomd_io.c:1.5 src/sys/arch/arm/iomd/iomd_io.c:1.6 --- src/sys/arch/arm/iomd/iomd_io.c:1.5 Sat Aug 5 18:22:57 2006 +++ src/sys/arch/arm/iomd/iomd_io.c Fri Jul 1 20:26:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iomd_io.c,v 1.5 2006/08/05 18:22:57 bjh21 Exp $ */ +/* $NetBSD: iomd_io.c,v 1.6 2011/07/01 20:26:35 dyoung Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -38,11 +38,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: iomd_io.c,v 1.5 2006/08/05 18:22:57 bjh21 Exp $); +__KERNEL_RCSID(0, $NetBSD: iomd_io.c,v 1.6 2011/07/01 20:26:35 dyoung Exp $); #include sys/param.h #include sys/systm.h -#include machine/bus.h +#include sys/bus.h /* Proto types for all the bus_space structure functions */ Index: src/sys/arch/arm/iomd/iomdkbc.c diff -u src/sys/arch/arm/iomd/iomdkbc.c:1.3 src/sys/arch/arm/iomd/iomdkbc.c:1.4 --- src/sys/arch/arm/iomd/iomdkbc.c:1.3 Sat Oct 21 22:45:03 2006 +++ src/sys/arch/arm/iomd/iomdkbc.c Fri Jul 1 20:26:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iomdkbc.c,v 1.3 2006/10/21 22:45:03 bjh21 Exp $ */ +/* $NetBSD: iomdkbc.c,v 1.4 2011/07/01 20:26:35 dyoung Exp $ */ /*- * Copyright (c) 2004 Ben Harris @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: iomdkbc.c,v 1.3 2006/10/21 22:45:03 bjh21 Exp $); +__KERNEL_RCSID(0, $NetBSD: iomdkbc.c,v 1.4 2011/07/01 20:26:35 dyoung Exp $); #include sys/param.h #include sys/device.h @@ -37,7 +37,7 @@ #include dev/pckbport/pckbportvar.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include arch/arm/iomd/iomdreg.h Index: src/sys/arch/arm/iomd/iomdvar.h diff -u src/sys/arch/arm/iomd/iomdvar.h:1.2 src/sys/arch/arm/iomd/iomdvar.h:1.3 --- src/sys/arch/arm/iomd/iomdvar.h:1.2 Fri Apr 19 01:04:39 2002 +++ src/sys/arch/arm/iomd/iomdvar.h Fri Jul 1 20:26:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iomdvar.h,v 1.2 2002/04/19 01:04:39 wiz Exp $ */ +/* $NetBSD: iomdvar.h,v 1.3 2011/07/01 20:26:35 dyoung Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -39,7 +39,7 @@ * Created : 02/02/97 */ -#include machine/bus.h +#include sys/bus.h /* * Attach args for iomd_clock device Index: src/sys/arch/arm/iomd/qms.c diff -u src/sys/arch/arm/iomd/qms.c:1.15 src/sys/arch/arm/iomd/qms.c:1.16 --- src/sys/arch/arm/iomd/qms.c:1.15 Sat May 10 15:31:04 2008 +++ src/sys/arch/arm/iomd/qms.c Fri Jul 1 20:26:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: qms.c,v 1.15 2008/05/10 15:31:04 martin Exp $ */ +/* $NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $ */ /*- * Copyright (c) 2001 Reinoud Zandijk @@ -41,7 +41,7 @@ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: qms.c,v 1.15 2008/05/10 15:31:04 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $); #include sys/callout.h #include sys/device.h @@ -56,7 +56,7 @@ #include sys/systm.h #include sys/select.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include arm/iomd/iomdvar.h Index: src/sys/arch/arm/iomd/vidc20.c diff -u src/sys/arch/arm/iomd/vidc20.c:1.15 src/sys/arch/arm/iomd/vidc20.c:1.16 ---
CVS commit: src/sys/arch/arm
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:27:50 UTC 2011 Modified Files: src/sys/arch/arm/imx: imx31_ahb.c imx31_aips.c imx31_clock.c imx31_gpio.c imx31_icu.c imx51_clock.c imx51_gpio.c imx51_iomux.c imx51_tzic.c imx_dma.c imx_pcic.c imx_space.c imxclock.c imxgpio.c src/sys/arch/arm/ixp12x0: ixp12x0.c ixp12x0_clk.c ixp12x0_com.c ixp12x0_intr.c ixp12x0_io.c ixp12x0_pci_dma.c ixp12x0var.h ixpsip.c ixpsipvar.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx31_ahb.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx31_aips.c \ src/sys/arch/arm/imx/imx_pcic.c src/sys/arch/arm/imx/imxclock.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx31_clock.c \ src/sys/arch/arm/imx/imx51_tzic.c src/sys/arch/arm/imx/imx_space.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx31_gpio.c \ src/sys/arch/arm/imx/imx31_icu.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx51_clock.c \ src/sys/arch/arm/imx/imx51_gpio.c src/sys/arch/arm/imx/imx51_iomux.c \ src/sys/arch/arm/imx/imx_dma.c src/sys/arch/arm/imx/imxgpio.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/ixp12x0/ixp12x0.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/ixp12x0/ixp12x0_clk.c \ src/sys/arch/arm/ixp12x0/ixp12x0_io.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/ixp12x0/ixp12x0_com.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ixp12x0/ixp12x0var.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/ixp12x0/ixpsip.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ixp12x0/ixpsipvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/imx/imx31_ahb.c diff -u src/sys/arch/arm/imx/imx31_ahb.c:1.4 src/sys/arch/arm/imx/imx31_ahb.c:1.5 --- src/sys/arch/arm/imx/imx31_ahb.c:1.4 Sat Nov 13 05:00:31 2010 +++ src/sys/arch/arm/imx/imx31_ahb.c Fri Jul 1 20:27:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $ */ +/* $NetBSD: imx31_ahb.c,v 1.5 2011/07/01 20:27:50 dyoung Exp $ */ /* * Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved. @@ -99,7 +99,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $Id: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $); +__KERNEL_RCSID(0, $Id: imx31_ahb.c,v 1.5 2011/07/01 20:27:50 dyoung Exp $); #include locators.h #include avic.h @@ -112,7 +112,7 @@ #include sys/reboot.h #include machine/cpu.h -#include machine/bus.h +#include sys/bus.h #include arm/cpufunc.h #include arm/mainbus/mainbus.h Index: src/sys/arch/arm/imx/imx31_aips.c diff -u src/sys/arch/arm/imx/imx31_aips.c:1.3 src/sys/arch/arm/imx/imx31_aips.c:1.4 --- src/sys/arch/arm/imx/imx31_aips.c:1.3 Fri May 2 22:00:29 2008 +++ src/sys/arch/arm/imx/imx31_aips.c Fri Jul 1 20:27:50 2011 @@ -1,7 +1,7 @@ -/* $Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */ +/* $Id: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */ /* derived from: */ -/* $NetBSD: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */ +/* $NetBSD: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */ /* * Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved. @@ -102,7 +102,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $); +__KERNEL_RCSID(0, $Id: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $); #include locators.h @@ -113,7 +113,7 @@ #include sys/reboot.h #include machine/cpu.h -#include machine/bus.h +#include sys/bus.h #include arm/cpufunc.h #include arm/mainbus/mainbus.h Index: src/sys/arch/arm/imx/imx_pcic.c diff -u src/sys/arch/arm/imx/imx_pcic.c:1.3 src/sys/arch/arm/imx/imx_pcic.c:1.4 --- src/sys/arch/arm/imx/imx_pcic.c:1.3 Mon Jun 30 00:46:41 2008 +++ src/sys/arch/arm/imx/imx_pcic.c Fri Jul 1 20:27:50 2011 @@ -1,4 +1,4 @@ -/* $Id: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $ */ +/* $Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */ /* * IMX CF interface to pcic/pcmcia @@ -6,7 +6,7 @@ * Sun Apr 1 21:42:37 PDT 2007 */ -/* $NetBSD: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $ */ +/* $NetBSD: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */ /* $OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $ */ /* @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $Id: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $); +__KERNEL_RCSID(0, $Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -37,7 +37,7 @@ #include uvm/uvm.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/pcmcia/pcmciareg.h Index: src/sys/arch/arm/imx/imxclock.c diff -u
CVS commit: src/sys/arch/arm
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:30:22 UTC 2011 Modified Files: src/sys/arch/arm/marvell: mvsoc_dma.c mvsoc_space.c mvsocrtc.c mvsocvar.h src/sys/arch/arm/mpcore: dic.c mpcore_a2x_space.c mpcore_a4x_space.c mpcore_clock.c mpcore_pmr.c mpcore_space.c src/sys/arch/arm/omap: obio_com.c obio_mputmr.c obio_ohci.c obio_wdt.c omap2430_intr.c omap2_gpio.c omap2_gpmc.c omap2_icu.c omap2_l3i.c omap2_mputmr.c omap2_nand.c omap2_obio.c omap2_prcm.c omap5912_intr.c omap_a2x_space.c omap_a4x_space.c omap_com.c omap_dma.c omap_emifs.c omap_gpio.c omap_intr.c omap_mputmr.c omap_nobyteacc_space.c omap_ocp.c omap_rtc.c omap_space.c omap_tipb.c omap_var.h omap_wdt.c omap_wdtvar.h omapfb.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/marvell/mvsoc_dma.c \ src/sys/arch/arm/marvell/mvsoc_space.c \ src/sys/arch/arm/marvell/mvsocrtc.c src/sys/arch/arm/marvell/mvsocvar.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/mpcore/dic.c \ src/sys/arch/arm/mpcore/mpcore_a2x_space.c \ src/sys/arch/arm/mpcore/mpcore_a4x_space.c \ src/sys/arch/arm/mpcore/mpcore_clock.c \ src/sys/arch/arm/mpcore/mpcore_pmr.c \ src/sys/arch/arm/mpcore/mpcore_space.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/obio_com.c \ src/sys/arch/arm/omap/omap2_mputmr.c src/sys/arch/arm/omap/omap2_nand.c \ src/sys/arch/arm/omap/omap_com.c src/sys/arch/arm/omap/omap_space.c \ src/sys/arch/arm/omap/omap_wdtvar.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/obio_mputmr.c \ src/sys/arch/arm/omap/obio_ohci.c src/sys/arch/arm/omap/obio_wdt.c \ src/sys/arch/arm/omap/omap5912_intr.c src/sys/arch/arm/omap/omap_emifs.c \ src/sys/arch/arm/omap/omap_ocp.c src/sys/arch/arm/omap/omap_rtc.c \ src/sys/arch/arm/omap/omap_tipb.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap2430_intr.c \ src/sys/arch/arm/omap/omap2_l3i.c src/sys/arch/arm/omap/omap_gpio.c \ src/sys/arch/arm/omap/omap_mputmr.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap2_gpio.c \ src/sys/arch/arm/omap/omap2_icu.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/omap/omap2_gpmc.c \ src/sys/arch/arm/omap/omap_intr.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omap2_obio.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omap2_prcm.c \ src/sys/arch/arm/omap/omap_a2x_space.c \ src/sys/arch/arm/omap/omap_a4x_space.c \ src/sys/arch/arm/omap/omap_nobyteacc_space.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap_dma.c \ src/sys/arch/arm/omap/omap_var.h src/sys/arch/arm/omap/omap_wdt.c \ src/sys/arch/arm/omap/omapfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/marvell/mvsoc_dma.c diff -u src/sys/arch/arm/marvell/mvsoc_dma.c:1.1 src/sys/arch/arm/marvell/mvsoc_dma.c:1.2 --- src/sys/arch/arm/marvell/mvsoc_dma.c:1.1 Sun Oct 3 05:49:24 2010 +++ src/sys/arch/arm/marvell/mvsoc_dma.c Fri Jul 1 20:30:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoc_dma.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $ */ +/* $NetBSD: mvsoc_dma.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */ /* * Copyright (c) 2004 Jesse Off @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvsoc_dma.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: mvsoc_dma.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $); #define _ARM32_BUS_DMA_PRIVATE @@ -46,7 +46,7 @@ #include sys/systm.h #include sys/extent.h -#include machine/bus.h +#include sys/bus.h #include arm/marvell/mvsocvar.h Index: src/sys/arch/arm/marvell/mvsoc_space.c diff -u src/sys/arch/arm/marvell/mvsoc_space.c:1.1 src/sys/arch/arm/marvell/mvsoc_space.c:1.2 --- src/sys/arch/arm/marvell/mvsoc_space.c:1.1 Sun Oct 3 05:49:24 2010 +++ src/sys/arch/arm/marvell/mvsoc_space.c Fri Jul 1 20:30:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoc_space.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $ */ +/* $NetBSD: mvsoc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvsoc_space.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: mvsoc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $); #include opt_mvsoc.h #include mvpex.h @@ -37,7 +37,7 @@ #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h #include arm/marvell/mvsocreg.h #include arm/marvell/mvsocvar.h Index: src/sys/arch/arm/marvell/mvsocrtc.c diff -u src/sys/arch/arm/marvell/mvsocrtc.c:1.1 src/sys/arch/arm/marvell/mvsocrtc.c:1.2 --- src/sys/arch/arm/marvell/mvsocrtc.c:1.1 Sat Mar 5 14:50:56 2011 +++ src/sys/arch/arm/marvell/mvsocrtc.c Fri Jul 1 20:30:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD:
CVS commit: src/sys/arch/arm
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:31:39 UTC 2011 Modified Files: src/sys/arch/arm/mainbus: mainbus.c mainbus.h mainbus_io.c src/sys/arch/arm/s3c2xx0: ohci_s3c24x0.c s3c2410.c s3c2410_extint.c s3c2410_intr.c s3c2410_spi.c s3c24x0_clk.c s3c24x0_lcd.c s3c24x0_lcd.h s3c2800.c s3c2800_clk.c s3c2800_intr.c s3c2800_pci.c s3c2xx0_busdma.c s3c2xx0_intr.c s3c2xx0_space.c s3c2xx0var.h sscom_s3c2410.c sscom_s3c2800.c sscom_var.h src/sys/arch/arm/sa11x0: sa.c sa11x0.c sa11x0_com.c sa11x0_io.c sa11x0_ost.c sa11x0_var.h sa11x1_pcic.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/mainbus/mainbus.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/mainbus/mainbus.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/mainbus/mainbus_io.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c \ src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c \ src/sys/arch/arm/s3c2xx0/sscom_var.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/s3c2xx0/s3c2410.c \ src/sys/arch/arm/s3c2xx0/s3c2410_extint.c \ src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/s3c2xx0/s3c2410_intr.c \ src/sys/arch/arm/s3c2xx0/s3c2800_intr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/s3c2xx0/s3c2410_spi.c \ src/sys/arch/arm/s3c2xx0/s3c2xx0var.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/s3c2xx0/s3c2800.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/s3c2xx0/s3c2800_clk.c \ src/sys/arch/arm/s3c2xx0/s3c2800_pci.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c \ src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/sa11x0/sa.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/sa11x0/sa11x0.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/sa11x0/sa11x0_com.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/sa11x0/sa11x0_io.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/sa11x0/sa11x0_ost.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/sa11x0/sa11x0_var.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/sa11x0/sa11x1_pcic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/mainbus/mainbus.c diff -u src/sys/arch/arm/mainbus/mainbus.c:1.17 src/sys/arch/arm/mainbus/mainbus.c:1.18 --- src/sys/arch/arm/mainbus/mainbus.c:1.17 Sun Jun 5 17:03:16 2011 +++ src/sys/arch/arm/mainbus/mainbus.c Fri Jul 1 20:31:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $ */ +/* $NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -54,7 +54,7 @@ #if defined(arm32) /* XXX */ #include machine/io.h #endif -#include machine/bus.h +#include sys/bus.h #include arm/mainbus/mainbus.h #include locators.h Index: src/sys/arch/arm/mainbus/mainbus.h diff -u src/sys/arch/arm/mainbus/mainbus.h:1.1 src/sys/arch/arm/mainbus/mainbus.h:1.2 --- src/sys/arch/arm/mainbus/mainbus.h:1.1 Sat Feb 24 19:38:02 2001 +++ src/sys/arch/arm/mainbus/mainbus.h Fri Jul 1 20:31:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.h,v 1.1 2001/02/24 19:38:02 reinoud Exp $ */ +/* $NetBSD: mainbus.h,v 1.2 2011/07/01 20:31:39 dyoung Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -41,7 +41,7 @@ * Created : 15/12/94 */ -#include machine/bus.h +#include sys/bus.h /* * mainbus driver attach arguments Index: src/sys/arch/arm/mainbus/mainbus_io.c diff -u src/sys/arch/arm/mainbus/mainbus_io.c:1.20 src/sys/arch/arm/mainbus/mainbus_io.c:1.21 --- src/sys/arch/arm/mainbus/mainbus_io.c:1.20 Sat Nov 7 07:27:41 2009 +++ src/sys/arch/arm/mainbus/mainbus_io.c Fri Jul 1 20:31:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus_io.c,v 1.20 2009/11/07 07:27:41 cegger Exp $ */ +/* $NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus_io.c,v 1.20 2009/11/07 07:27:41 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -45,7 +45,7 @@ #include uvm/uvm.h -#include machine/bus.h +#include sys/bus.h #include machine/pmap.h /* Proto types for all the bus_space structure functions */ Index:
CVS commit: src/sys/arch/atari
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:34:06 UTC 2011 Modified Files: src/sys/arch/atari/atari: be_bus.c bus.c le_bus.c mainbus.c src/sys/arch/atari/dev: hdfd.c wdc_mb.c src/sys/arch/atari/isa: fdcisa.c isa_dma.c isa_machdep.c isapnp_machdep.c src/sys/arch/atari/pci: pci_hades.c pci_machdep.c src/sys/arch/atari/vme: if_le_vme.c leo.c vme_machdep.c vmevar.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/atari/be_bus.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/atari/atari/bus.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/atari/atari/le_bus.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/atari/mainbus.c cvs rdiff -u -r1.74 -r1.75 src/sys/arch/atari/dev/hdfd.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/dev/wdc_mb.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/isa/fdcisa.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/isa/isa_dma.c \ src/sys/arch/atari/isa/isapnp_machdep.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/atari/isa/isa_machdep.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/atari/pci/pci_hades.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/atari/pci/pci_machdep.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/atari/vme/if_le_vme.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/atari/vme/leo.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/vme/vme_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/vme/vmevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/atari/atari/be_bus.c diff -u src/sys/arch/atari/atari/be_bus.c:1.14 src/sys/arch/atari/atari/be_bus.c:1.15 --- src/sys/arch/atari/atari/be_bus.c:1.14 Wed Mar 31 13:15:52 2010 +++ src/sys/arch/atari/atari/be_bus.c Fri Jul 1 20:34:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: be_bus.c,v 1.14 2010/03/31 13:15:52 tsutsui Exp $ */ +/* $NetBSD: be_bus.c,v 1.15 2011/07/01 20:34:05 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: be_bus.c,v 1.14 2010/03/31 13:15:52 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: be_bus.c,v 1.15 2011/07/01 20:34:05 dyoung Exp $); #include sys/types.h #include sys/param.h #include sys/systm.h #include sys/malloc.h #include machine/cpu.h -#include machine/bus.h +#include sys/bus.h /* * This file contains the common functions for using a big endian (linear) Index: src/sys/arch/atari/atari/bus.c diff -u src/sys/arch/atari/atari/bus.c:1.55 src/sys/arch/atari/atari/bus.c:1.56 --- src/sys/arch/atari/atari/bus.c:1.55 Sat Nov 6 11:46:00 2010 +++ src/sys/arch/atari/atari/bus.c Fri Jul 1 20:34:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.c,v 1.55 2010/11/06 11:46:00 uebayasi Exp $ */ +/* $NetBSD: bus.c,v 1.56 2011/07/01 20:34:05 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include opt_m68k_arch.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.55 2010/11/06 11:46:00 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.56 2011/07/01 20:34:05 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -47,7 +47,7 @@ #include machine/cpu.h #include m68k/cacheops.h #define _ATARI_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h int bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, Index: src/sys/arch/atari/atari/le_bus.c diff -u src/sys/arch/atari/atari/le_bus.c:1.17 src/sys/arch/atari/atari/le_bus.c:1.18 --- src/sys/arch/atari/atari/le_bus.c:1.17 Wed Mar 18 16:00:10 2009 +++ src/sys/arch/atari/atari/le_bus.c Fri Jul 1 20:34:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: le_bus.c,v 1.17 2009/03/18 16:00:10 cegger Exp $ */ +/* $NetBSD: le_bus.c,v 1.18 2011/07/01 20:34:05 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: le_bus.c,v 1.17 2009/03/18 16:00:10 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: le_bus.c,v 1.18 2011/07/01 20:34:05 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -38,7 +38,7 @@ #include sys/malloc.h #include sys/bswap.h #include machine/cpu.h -#include machine/bus.h +#include sys/bus.h /* * This file contains the common functions for using a litte endian (linear) Index: src/sys/arch/atari/atari/mainbus.c diff -u src/sys/arch/atari/atari/mainbus.c:1.10 src/sys/arch/atari/atari/mainbus.c:1.11 --- src/sys/arch/atari/atari/mainbus.c:1.10 Sun Mar 8 05:25:31 2009 +++ src/sys/arch/atari/atari/mainbus.c Fri Jul 1 20:34:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.10 2009/03/08 05:25:31 tsutsui Exp $ */ +/* $NetBSD: mainbus.c,v 1.11 2011/07/01 20:34:05 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.10
CVS commit: src/sys/arch/bebox
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:34:53 UTC 2011 Modified Files: src/sys/arch/bebox/bebox: cpu.c mainbus.c src/sys/arch/bebox/isa: mcclock_isa.c src/sys/arch/bebox/pci: pci_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/bebox/bebox/cpu.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/bebox/bebox/mainbus.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/bebox/isa/mcclock_isa.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/bebox/pci/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/bebox/bebox/cpu.c diff -u src/sys/arch/bebox/bebox/cpu.c:1.10 src/sys/arch/bebox/bebox/cpu.c:1.11 --- src/sys/arch/bebox/bebox/cpu.c:1.10 Fri Jun 3 00:16:27 2011 +++ src/sys/arch/bebox/bebox/cpu.c Fri Jul 1 20:34:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.10 2011/06/03 00:16:27 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.11 2011/07/01 20:34:52 dyoung Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.10 2011/06/03 00:16:27 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.11 2011/07/01 20:34:52 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h int cpumatch(device_t, cfdata_t, void *); Index: src/sys/arch/bebox/bebox/mainbus.c diff -u src/sys/arch/bebox/bebox/mainbus.c:1.26 src/sys/arch/bebox/bebox/mainbus.c:1.27 --- src/sys/arch/bebox/bebox/mainbus.c:1.26 Fri Jun 3 00:16:27 2011 +++ src/sys/arch/bebox/bebox/mainbus.c Fri Jul 1 20:34:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.26 2011/06/03 00:16:27 matt Exp $ */ +/* $NetBSD: mainbus.c,v 1.27 2011/07/01 20:34:53 dyoung Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.26 2011/06/03 00:16:27 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.27 2011/07/01 20:34:53 dyoung Exp $); #include sys/param.h #include sys/extent.h @@ -40,7 +40,7 @@ #include sys/malloc.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include pci.h #include opt_pci.h Index: src/sys/arch/bebox/isa/mcclock_isa.c diff -u src/sys/arch/bebox/isa/mcclock_isa.c:1.4 src/sys/arch/bebox/isa/mcclock_isa.c:1.5 --- src/sys/arch/bebox/isa/mcclock_isa.c:1.4 Sat Mar 29 05:42:45 2008 +++ src/sys/arch/bebox/isa/mcclock_isa.c Fri Jul 1 20:34:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock_isa.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $ */ +/* $NetBSD: mcclock_isa.c,v 1.5 2011/07/01 20:34:53 dyoung Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -117,7 +117,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mcclock_isa.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: mcclock_isa.c,v 1.5 2011/07/01 20:34:53 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -125,7 +125,7 @@ #include sys/device.h #include sys/time.h -#include machine/bus.h +#include sys/bus.h #include dev/clock_subr.h #include dev/isa/isareg.h Index: src/sys/arch/bebox/pci/pci_machdep.c diff -u src/sys/arch/bebox/pci/pci_machdep.c:1.20 src/sys/arch/bebox/pci/pci_machdep.c:1.21 --- src/sys/arch/bebox/pci/pci_machdep.c:1.20 Thu Jun 30 00:52:56 2011 +++ src/sys/arch/bebox/pci/pci_machdep.c Fri Jul 1 20:34:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.20 2011/06/30 00:52:56 matt Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.21 2011/07/01 20:34:53 dyoung Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.20 2011/06/30 00:52:56 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.21 2011/07/01 20:34:53 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -51,7 +51,7 @@ #include uvm/uvm_extern.h #define _POWERPC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include powerpc/pio.h
CVS commit: src/sys/arch/arm/xscale
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:32:51 UTC 2011 Modified Files: src/sys/arch/arm/xscale: becc.c becc_pci.c becc_space.c becc_timer.c i80312.c i80312_gpio.c i80312_i2c.c i80312_mem.c i80312_pci.c i80312_space.c i80312var.h i80321.c i80321_gpio.c i80321_i2c.c i80321_icu.c i80321_mcu.c i80321_pci.c i80321_space.c i80321_timer.c i80321_wdog.c iopi2c.c ixp425.c ixp425_a4x_space.c ixp425_com.c ixp425_if_npe.c ixp425_intr.c ixp425_ixme.c ixp425_npe.c ixp425_pci.c ixp425_pci_dma.c ixp425_pci_space.c ixp425_qmgr.c ixp425_sip.c ixp425_sipvar.h ixp425_space.c ixp425_timer.c ixp425_wdog.c ixp425var.h pxa2x0.c pxa2x0_a4x_space.c pxa2x0_ac97.c pxa2x0_apm.h pxa2x0_com.c pxa2x0_dma.c pxa2x0_dmac.c pxa2x0_gpio.c pxa2x0_i2s.c pxa2x0_i2s.h pxa2x0_intr.c pxa2x0_lcd.c pxa2x0_lcd.h pxa2x0_ohci.c pxa2x0_pcic.c pxa2x0_rtc.c pxa2x0_space.c pxa2x0_udc.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/becc.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/becc_pci.c \ src/sys/arch/arm/xscale/i80312_pci.c src/sys/arch/arm/xscale/i80312var.h \ src/sys/arch/arm/xscale/i80321_pci.c src/sys/arch/arm/xscale/pxa2x0_lcd.h \ src/sys/arch/arm/xscale/pxa2x0_space.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/becc_space.c \ src/sys/arch/arm/xscale/i80312_i2c.c src/sys/arch/arm/xscale/i80312_mem.c \ src/sys/arch/arm/xscale/ixp425_pci_dma.c \ src/sys/arch/arm/xscale/pxa2x0_a4x_space.c \ src/sys/arch/arm/xscale/pxa2x0_dma.c src/sys/arch/arm/xscale/pxa2x0_rtc.c \ src/sys/arch/arm/xscale/pxa2x0_udc.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/becc_timer.c \ src/sys/arch/arm/xscale/ixp425.c src/sys/arch/arm/xscale/pxa2x0_gpio.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/xscale/i80312.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/i80312_gpio.c \ src/sys/arch/arm/xscale/i80321_i2c.c src/sys/arch/arm/xscale/i80321_mcu.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/i80312_space.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/xscale/i80321.c \ src/sys/arch/arm/xscale/i80321_icu.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xscale/i80321_gpio.c \ src/sys/arch/arm/xscale/ixp425_a4x_space.c \ src/sys/arch/arm/xscale/ixp425_ixme.c \ src/sys/arch/arm/xscale/ixp425_wdog.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/xscale/i80321_space.c \ src/sys/arch/arm/xscale/ixp425var.h src/sys/arch/arm/xscale/pxa2x0_com.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/xscale/i80321_timer.c \ src/sys/arch/arm/xscale/ixp425_if_npe.c src/sys/arch/arm/xscale/pxa2x0.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/xscale/i80321_wdog.c \ src/sys/arch/arm/xscale/ixp425_pci_space.c \ src/sys/arch/arm/xscale/pxa2x0_ac97.c \ src/sys/arch/arm/xscale/pxa2x0_i2s.c \ src/sys/arch/arm/xscale/pxa2x0_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/xscale/iopi2c.c \ src/sys/arch/arm/xscale/ixp425_sipvar.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/xscale/ixp425_com.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/xscale/ixp425_intr.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/xscale/ixp425_npe.c \ src/sys/arch/arm/xscale/ixp425_space.c \ src/sys/arch/arm/xscale/pxa2x0_dmac.c \ src/sys/arch/arm/xscale/pxa2x0_ohci.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/xscale/ixp425_pci.c \ src/sys/arch/arm/xscale/ixp425_qmgr.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/xscale/ixp425_sip.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/xscale/ixp425_timer.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/xscale/pxa2x0_apm.h \ src/sys/arch/arm/xscale/pxa2x0_i2s.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/xscale/pxa2x0_intr.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/xscale/pxa2x0_lcd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/xscale/becc.c diff -u src/sys/arch/arm/xscale/becc.c:1.13 src/sys/arch/arm/xscale/becc.c:1.14 --- src/sys/arch/arm/xscale/becc.c:1.13 Tue May 17 17:34:48 2011 +++ src/sys/arch/arm/xscale/becc.c Fri Jul 1 20:32:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: becc.c,v 1.13 2011/05/17 17:34:48 dyoung Exp $ */ +/* $NetBSD: becc.c,v 1.14 2011/07/01 20:32:51 dyoung Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -41,14 +41,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: becc.c,v 1.13 2011/05/17 17:34:48 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: becc.c,v 1.14 2011/07/01 20:32:51 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #define _ARM32_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include arm/xscale/i80200reg.h #include arm/xscale/beccreg.h Index: src/sys/arch/arm/xscale/becc_pci.c diff -u
CVS commit: src/sys/arch/cats
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:35:31 UTC 2011 Modified Files: src/sys/arch/cats/cats: cats_machdep.c src/sys/arch/cats/pci: pcib.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/cats/cats/cats_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/cats/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.70 src/sys/arch/cats/cats/cats_machdep.c:1.71 --- src/sys/arch/cats/cats/cats_machdep.c:1.70 Thu Jun 30 20:09:21 2011 +++ src/sys/arch/cats/cats/cats_machdep.c Fri Jul 1 20:35:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.70 2011/06/30 20:09:21 wiz Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.71 2011/07/01 20:35:31 dyoung Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.70 2011/06/30 20:09:21 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.71 2011/07/01 20:35:31 dyoung Exp $); #include opt_ddb.h #include opt_modular.h @@ -68,7 +68,7 @@ #include machine/bootconfig.h #define _ARM32_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include machine/intr.h Index: src/sys/arch/cats/pci/pcib.c diff -u src/sys/arch/cats/pci/pcib.c:1.14 src/sys/arch/cats/pci/pcib.c:1.15 --- src/sys/arch/cats/pci/pcib.c:1.14 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/cats/pci/pcib.c Fri Jul 1 20:35:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: pcib.c,v 1.15 2011/07/01 20:35:31 dyoung Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -32,13 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.15 2011/07/01 20:35:31 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include dev/isa/isavar.h
CVS commit: src/sys/arch/cobalt
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:36:42 UTC 2011 Modified Files: src/sys/arch/cobalt/cobalt: console.c interrupt.c src/sys/arch/cobalt/dev: com_mainbus.c gt.c mcclock.c panel.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cobalt/cobalt/console.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/cobalt/cobalt/interrupt.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cobalt/dev/com_mainbus.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/cobalt/dev/gt.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cobalt/dev/mcclock.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/cobalt/dev/panel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cobalt/cobalt/console.c diff -u src/sys/arch/cobalt/cobalt/console.c:1.11 src/sys/arch/cobalt/cobalt/console.c:1.12 --- src/sys/arch/cobalt/cobalt/console.c:1.11 Thu Mar 27 15:21:46 2008 +++ src/sys/arch/cobalt/cobalt/console.c Fri Jul 1 20:36:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: console.c,v 1.11 2008/03/27 15:21:46 tsutsui Exp $ */ +/* $NetBSD: console.c,v 1.12 2011/07/01 20:36:42 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,14 +26,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: console.c,v 1.11 2008/03/27 15:21:46 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: console.c,v 1.12 2011/07/01 20:36:42 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include sys/conf.h -#include machine/bus.h +#include sys/bus.h #include machine/nvram.h #include machine/bootinfo.h Index: src/sys/arch/cobalt/cobalt/interrupt.c diff -u src/sys/arch/cobalt/cobalt/interrupt.c:1.6 src/sys/arch/cobalt/cobalt/interrupt.c:1.7 --- src/sys/arch/cobalt/cobalt/interrupt.c:1.6 Sun Feb 20 07:54:10 2011 +++ src/sys/arch/cobalt/cobalt/interrupt.c Fri Jul 1 20:36:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: interrupt.c,v 1.6 2011/02/20 07:54:10 matt Exp $ */ +/* $NetBSD: interrupt.c,v 1.7 2011/07/01 20:36:42 dyoung Exp $ */ /*- * Copyright (c) 2006 Izumi Tsutsui. All rights reserved. @@ -79,7 +79,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.6 2011/02/20 07:54:10 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.7 2011/07/01 20:36:42 dyoung Exp $); #define __INTR_PRIVATE @@ -89,7 +89,7 @@ #include sys/intr.h #include mips/mips3_clock.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/i8259reg.h #include dev/isa/isareg.h Index: src/sys/arch/cobalt/dev/com_mainbus.c diff -u src/sys/arch/cobalt/dev/com_mainbus.c:1.17 src/sys/arch/cobalt/dev/com_mainbus.c:1.18 --- src/sys/arch/cobalt/dev/com_mainbus.c:1.17 Thu Mar 27 15:21:46 2008 +++ src/sys/arch/cobalt/dev/com_mainbus.c Fri Jul 1 20:36:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_mainbus.c,v 1.17 2008/03/27 15:21:46 tsutsui Exp $ */ +/* $NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.17 2008/03/27 15:21:46 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -35,7 +35,7 @@ #include machine/autoconf.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/comreg.h #include dev/ic/comvar.h Index: src/sys/arch/cobalt/dev/gt.c diff -u src/sys/arch/cobalt/dev/gt.c:1.25 src/sys/arch/cobalt/dev/gt.c:1.26 --- src/sys/arch/cobalt/dev/gt.c:1.25 Tue May 17 17:34:48 2011 +++ src/sys/arch/cobalt/dev/gt.c Fri Jul 1 20:36:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gt.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $ */ +/* $NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gt.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $); #include opt_pci.h #include pci.h @@ -48,7 +48,7 @@ #include sys/extent.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include mips/cache.h Index: src/sys/arch/cobalt/dev/mcclock.c diff -u src/sys/arch/cobalt/dev/mcclock.c:1.4 src/sys/arch/cobalt/dev/mcclock.c:1.5 --- src/sys/arch/cobalt/dev/mcclock.c:1.4 Sat Mar 29 05:42:45 2008 +++ src/sys/arch/cobalt/dev/mcclock.c Fri Jul 1 20:36:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $ */ +/* $NetBSD: mcclock.c,v 1.5 2011/07/01 20:36:42 dyoung Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mcclock.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $);
CVS commit: src/sys/arch/cobalt/pci
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:37:08 UTC 2011 Modified Files: src/sys/arch/cobalt/pci: pchb.c pci_machdep.c pcib.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/cobalt/pci/pchb.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/cobalt/pci/pci_machdep.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cobalt/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cobalt/pci/pchb.c diff -u src/sys/arch/cobalt/pci/pchb.c:1.10 src/sys/arch/cobalt/pci/pchb.c:1.11 --- src/sys/arch/cobalt/pci/pchb.c:1.10 Fri May 9 10:59:55 2008 +++ src/sys/arch/cobalt/pci/pchb.c Fri Jul 1 20:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pchb.c,v 1.10 2008/05/09 10:59:55 tsutsui Exp $ */ +/* $NetBSD: pchb.c,v 1.11 2011/07/01 20:37:08 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,14 +26,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pchb.c,v 1.10 2008/05/09 10:59:55 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: pchb.c,v 1.11 2011/07/01 20:37:08 dyoung Exp $); #include sys/types.h #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h #include dev/pci/pcireg.h Index: src/sys/arch/cobalt/pci/pci_machdep.c diff -u src/sys/arch/cobalt/pci/pci_machdep.c:1.30 src/sys/arch/cobalt/pci/pci_machdep.c:1.31 --- src/sys/arch/cobalt/pci/pci_machdep.c:1.30 Tue May 3 09:15:20 2011 +++ src/sys/arch/cobalt/pci/pci_machdep.c Fri Jul 1 20:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.30 2011/05/03 09:15:20 tsutsui Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.31 2011/07/01 20:37:08 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.30 2011/05/03 09:15:20 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.31 2011/07/01 20:37:08 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -37,7 +37,7 @@ #include sys/extent.h #define _COBALT_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/pci/pcivar.h Index: src/sys/arch/cobalt/pci/pcib.c diff -u src/sys/arch/cobalt/pci/pcib.c:1.19 src/sys/arch/cobalt/pci/pcib.c:1.20 --- src/sys/arch/cobalt/pci/pcib.c:1.19 Fri May 9 10:59:55 2008 +++ src/sys/arch/cobalt/pci/pcib.c Fri Jul 1 20:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.19 2008/05/09 10:59:55 tsutsui Exp $ */ +/* $NetBSD: pcib.c,v 1.20 2011/07/01 20:37:08 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.19 2008/05/09 10:59:55 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.20 2011/07/01 20:37:08 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -35,7 +35,7 @@ #include sys/malloc.h #include machine/cpu.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include dev/pci/pcivar.h
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:39:35 UTC 2011 Modified Files: src/sys/arch/evbarm/gemini: gemini_machdep.c src/sys/arch/evbarm/gumstix: gumstix_machdep.c gumstixvar.h gxlcd.c gxmci.c gxpcic.c if_sm_gxio.c src/sys/arch/evbarm/hdl_g: btn_obio.c com_obio.c hdlg_machdep.c hdlg_pci.c i80321_mainbus.c obio.c obio_space.c src/sys/arch/evbarm/ifpga: ifpga_io.c ifpgavar.h plcom_ifpga.c src/sys/arch/evbarm/integrator: int_bus_dma.h integrator_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/gemini/gemini_machdep.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/gumstix/gumstix_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/gumstix/gumstixvar.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/gumstix/gxlcd.c \ src/sys/arch/evbarm/gumstix/gxmci.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/gumstix/gxpcic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/gumstix/if_sm_gxio.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/hdl_g/btn_obio.c \ src/sys/arch/evbarm/hdl_g/i80321_mainbus.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hdl_g/com_obio.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/hdl_g/hdlg_pci.c \ src/sys/arch/evbarm/hdl_g/obio.c src/sys/arch/evbarm/hdl_g/obio_space.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ifpga/ifpga_io.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/ifpga/ifpgavar.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/ifpga/plcom_ifpga.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/integrator/int_bus_dma.h cvs rdiff -u -r1.67 -r1.68 \ src/sys/arch/evbarm/integrator/integrator_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/gemini/gemini_machdep.c diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.17 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.18 --- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.17 Thu Jun 30 20:09:24 2011 +++ src/sys/arch/evbarm/gemini/gemini_machdep.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gemini_machdep.c,v 1.17 2011/06/30 20:09:24 wiz Exp $ */ +/* $NetBSD: gemini_machdep.c,v 1.18 2011/07/01 20:39:34 dyoung Exp $ */ /* adapted from: * NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp @@ -129,7 +129,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gemini_machdep.c,v 1.17 2011/06/30 20:09:24 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: gemini_machdep.c,v 1.18 2011/07/01 20:39:34 dyoung Exp $); #include opt_machdep.h #include opt_ddb.h @@ -166,7 +166,7 @@ #endif #include machine/bootconfig.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include arm/armreg.h Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.36 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.37 --- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.36 Thu Jun 30 20:09:24 2011 +++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gumstix_machdep.c,v 1.36 2011/06/30 20:09:24 wiz Exp $ */ +/* $NetBSD: gumstix_machdep.c,v 1.37 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation. * All rights reserved. @@ -165,7 +165,7 @@ #include machine/autoconf.h #include machine/bootconfig.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/db_machdep.h #include machine/frame.h Index: src/sys/arch/evbarm/gumstix/gumstixvar.h diff -u src/sys/arch/evbarm/gumstix/gumstixvar.h:1.5 src/sys/arch/evbarm/gumstix/gumstixvar.h:1.6 --- src/sys/arch/evbarm/gumstix/gumstixvar.h:1.5 Sun Nov 22 12:05:14 2009 +++ src/sys/arch/evbarm/gumstix/gumstixvar.h Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gumstixvar.h,v 1.5 2009/11/22 12:05:14 kiyohara Exp $ */ +/* $NetBSD: gumstixvar.h,v 1.6 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation. * All rights reserved. @@ -36,7 +36,7 @@ #include sys/conf.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/pxa2x0_gpio.h #include evbarm/gumstix/gumstixreg.h Index: src/sys/arch/evbarm/gumstix/gxlcd.c diff -u src/sys/arch/evbarm/gumstix/gxlcd.c:1.2 src/sys/arch/evbarm/gumstix/gxlcd.c:1.3 --- src/sys/arch/evbarm/gumstix/gxlcd.c:1.2 Sat Nov 21 08:33:50 2009 +++ src/sys/arch/evbarm/gumstix/gxlcd.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gxlcd.c,v 1.2 2009/11/21 08:33:50 kiyohara Exp $ */ +/* $NetBSD: gxlcd.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:41:17 UTC 2011 Modified Files: src/sys/arch/evbarm/imx31: imx31lk_machdep.c imx31lk_pcic.c src/sys/arch/evbarm/iq31244: iq31244_7seg.c iq31244_pci.c wdc_obio.c src/sys/arch/evbarm/iq80310: com_obio.c i80312_mainbus.c iq80310_7seg.c iq80310_intr.c iq80310_machdep.c iq80310_pci.c iq80310_timer.c obio.c obio_space.c src/sys/arch/evbarm/iq80321: com_obio.c i80321_mainbus.c iq80321_7seg.c iq80321_machdep.c iq80321_pci.c obio.c obio_space.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/imx31/imx31lk_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/imx31/imx31lk_pcic.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq31244/iq31244_7seg.c \ src/sys/arch/evbarm/iq31244/iq31244_pci.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/iq31244/wdc_obio.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/iq80310/com_obio.c \ src/sys/arch/evbarm/iq80310/i80312_mainbus.c \ src/sys/arch/evbarm/iq80310/obio_space.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/iq80310/iq80310_7seg.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/iq80310/iq80310_intr.c cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbarm/iq80310/iq80310_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/iq80310/iq80310_pci.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/iq80310/iq80310_timer.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/iq80310/obio.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/iq80321/com_obio.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/iq80321/i80321_mainbus.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/iq80321/iq80321_7seg.c \ src/sys/arch/evbarm/iq80321/iq80321_pci.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/iq80321/iq80321_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/iq80321/obio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/iq80321/obio_space.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.12 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.13 --- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.12 Thu Jun 30 20:09:24 2011 +++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Fri Jul 1 20:41:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: imx31lk_machdep.c,v 1.12 2011/06/30 20:09:24 wiz Exp $ */ +/* $NetBSD: imx31lk_machdep.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $ */ /* * Startup routines for the ZOOM iMX31 LITEKIT. @@ -110,7 +110,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: imx31lk_machdep.c,v 1.12 2011/06/30 20:09:24 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: imx31lk_machdep.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -144,7 +144,7 @@ #endif #include machine/bootconfig.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include arm/undefined.h Index: src/sys/arch/evbarm/imx31/imx31lk_pcic.c diff -u src/sys/arch/evbarm/imx31/imx31lk_pcic.c:1.3 src/sys/arch/evbarm/imx31/imx31lk_pcic.c:1.4 --- src/sys/arch/evbarm/imx31/imx31lk_pcic.c:1.3 Mon Jun 30 00:49:31 2008 +++ src/sys/arch/evbarm/imx31/imx31lk_pcic.c Fri Jul 1 20:41:16 2011 @@ -1,5 +1,5 @@ -/* $Id: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $ */ -/* $NetBSD: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $ */ +/* $Id: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $ */ +/* $NetBSD: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $ */ /* $OpenBSD: pxapcic.c,v 1.1 2005/07/01 23:51:55 uwe Exp $ */ /* @@ -19,14 +19,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $Id: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $); +__KERNEL_RCSID(0, $Id: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include uvm/uvm.h Index: src/sys/arch/evbarm/iq31244/iq31244_7seg.c diff -u src/sys/arch/evbarm/iq31244/iq31244_7seg.c:1.4 src/sys/arch/evbarm/iq31244/iq31244_7seg.c:1.5 --- src/sys/arch/evbarm/iq31244/iq31244_7seg.c:1.4 Sat Dec 24 20:06:59 2005 +++ src/sys/arch/evbarm/iq31244/iq31244_7seg.c Fri Jul 1 20:41:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iq31244_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $ */ +/* $NetBSD: iq31244_7seg.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,12 +40,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: iq31244_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $); +__KERNEL_RCSID(0, $NetBSD: iq31244_7seg.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $); #include sys/param.h #include sys/systm.h -#include machine/bus.h +#include sys/bus.h #include
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:42:38 UTC 2011 Modified Files: src/sys/arch/evbarm/ixdp425: ixdp425_led.c ixdp425_machdep.c ixdp425_mainbus.c ixdp425_pci.c src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c ixm1200_pci.c ixp12x0_mainbus.c ixpcom_ixm.c nappi_nppb.c nappi_nr.c src/sys/arch/evbarm/lubbock: if_sm_obio.c lubbock_lcd.c lubbock_machdep.c lubbock_pcic.c lubbock_var.h obio.c sacc_obio.c sm_obio_space.c src/sys/arch/evbarm/netwalker: netwalker_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/ixdp425/ixdp425_led.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/ixm1200/ixm1200_pci.c \ src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c \ src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c \ src/sys/arch/evbarm/ixm1200/nappi_nppb.c \ src/sys/arch/evbarm/ixm1200/nappi_nr.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/lubbock/if_sm_obio.c \ src/sys/arch/evbarm/lubbock/sm_obio_space.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/lubbock/lubbock_lcd.c \ src/sys/arch/evbarm/lubbock/sacc_obio.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/lubbock/lubbock_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/lubbock/lubbock_pcic.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/lubbock/lubbock_var.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/lubbock/obio.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/netwalker/netwalker_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/ixdp425/ixdp425_led.c diff -u src/sys/arch/evbarm/ixdp425/ixdp425_led.c:1.4 src/sys/arch/evbarm/ixdp425/ixdp425_led.c:1.5 --- src/sys/arch/evbarm/ixdp425/ixdp425_led.c:1.4 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/ixdp425/ixdp425_led.c Fri Jul 1 20:42:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixdp425_led.c,v 1.4 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: ixdp425_led.c,v 1.5 2011/07/01 20:42:36 dyoung Exp $ */ /* * Copyright (c) 2003 * Ichiro FUKUHARA ich...@ichiro.org. @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ixdp425_led.c,v 1.4 2009/10/21 14:15:51 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: ixdp425_led.c,v 1.5 2011/07/01 20:42:36 dyoung Exp $); /* * LED support for IXDP425 @@ -39,7 +39,7 @@ #include sys/kernel.h #include sys/systm.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/ixp425_sipvar.h #include arm/xscale/ixp425var.h Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.28 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.29 --- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.28 Thu Jun 30 20:09:25 2011 +++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Fri Jul 1 20:42:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixdp425_machdep.c,v 1.28 2011/06/30 20:09:25 wiz Exp $ */ +/* $NetBSD: ixdp425_machdep.c,v 1.29 2011/07/01 20:42:36 dyoung Exp $ */ /* * Copyright (c) 2003 * Ichiro FUKUHARA ich...@ichiro.org. @@ -64,7 +64,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ixdp425_machdep.c,v 1.28 2011/06/30 20:09:25 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: ixdp425_machdep.c,v 1.29 2011/07/01 20:42:36 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -90,7 +90,7 @@ #include ddb/db_extern.h #include machine/bootconfig.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include arm/undefined.h Index: src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c diff -u src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.6 src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.7 --- src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.6 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c Fri Jul 1 20:42:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixdp425_mainbus.c,v 1.6 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ixdp425_mainbus.c,v 1.6 2009/10/21 14:15:51 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $); /* * front-end for the ixp425 NetworkProcessor. @@ -39,7 +39,7 @@ #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/ixp425reg.h #include arm/xscale/ixp425var.h Index: src/sys/arch/evbarm/ixdp425/ixdp425_pci.c diff -u
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:44:21 UTC 2011 Modified Files: src/sys/arch/evbarm/mpcsa: mpcsa_machdep.c src/sys/arch/evbarm/npwr_fc: com_obio.c npwr_fc_machdep.c npwr_fc_pci.c src/sys/arch/evbarm/nslu2: nslu2_machdep.c src/sys/arch/evbarm/osk5912: if_sm_emifs.c osk5912_machdep.c src/sys/arch/evbarm/smdk2xx0: if_cs_smdk24x0.c smdk2410_kbd.c smdk2410_lcd.c smdk2410_machdep.c smdk2800_machdep.c smdk2800_pci.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/npwr_fc/com_obio.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/nslu2/nslu2_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/osk5912/if_sm_emifs.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/osk5912/osk5912_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c diff -u src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.5 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.6 --- src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.5 Thu Jun 30 20:09:26 2011 +++ src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Fri Jul 1 20:44:20 2011 @@ -1,5 +1,5 @@ -/* $Id: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $ */ -/* $NetBSD: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $ */ +/* $Id: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $ */ +/* $NetBSD: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -104,7 +104,7 @@ #define DRAM_BLOCKS 1 #include machine/bootconfig.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include arm/undefined.h Index: src/sys/arch/evbarm/npwr_fc/com_obio.c diff -u src/sys/arch/evbarm/npwr_fc/com_obio.c:1.4 src/sys/arch/evbarm/npwr_fc/com_obio.c:1.5 --- src/sys/arch/evbarm/npwr_fc/com_obio.c:1.4 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbarm/npwr_fc/com_obio.c Fri Jul 1 20:44:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:17 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include sys/termios.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/i80321var.h Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.15 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.16 --- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.15 Thu Jun 30 20:09:27 2011 +++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Fri Jul 1 20:44:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: npwr_fc_machdep.c,v 1.15 2011/06/30 20:09:27 wiz Exp $ */ +/* $NetBSD: npwr_fc_machdep.c,v 1.16 2011/07/01 20:44:20 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npwr_fc_machdep.c,v 1.15 2011/06/30 20:09:27 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: npwr_fc_machdep.c,v 1.16 2011/07/01 20:44:20 dyoung Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -99,7 +99,7 @@ #include ddb/db_extern.h #include machine/bootconfig.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include arm/undefined.h Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.2 src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.3 --- src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.2 Mon Apr 4 20:37:49 2011 +++ src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c Fri Jul 1 20:44:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: npwr_fc_pci.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $ */ +/* $NetBSD:
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:48:23 UTC 2011 Modified Files: src/sys/arch/iyonix/iyonix: com_obio.c i80321_mainbus.c iyonix_machdep.c iyonix_pci.c obio.c obio_space.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/com_obio.c \ src/sys/arch/iyonix/iyonix/obio.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/iyonix/iyonix/i80321_mainbus.c \ src/sys/arch/iyonix/iyonix/obio_space.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/iyonix/iyonix/iyonix_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/iyonix/iyonix/iyonix_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/iyonix/iyonix/com_obio.c diff -u src/sys/arch/iyonix/iyonix/com_obio.c:1.5 src/sys/arch/iyonix/iyonix/com_obio.c:1.6 --- src/sys/arch/iyonix/iyonix/com_obio.c:1.5 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/iyonix/iyonix/com_obio.c Fri Jul 1 20:48:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_obio.c,v 1.5 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.5 2008/04/28 20:23:26 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include sys/termios.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/i80321var.h Index: src/sys/arch/iyonix/iyonix/obio.c diff -u src/sys/arch/iyonix/iyonix/obio.c:1.5 src/sys/arch/iyonix/iyonix/obio.c:1.6 --- src/sys/arch/iyonix/iyonix/obio.c:1.5 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/iyonix/iyonix/obio.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: obio.c,v 1.6 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.6 2011/07/01 20:48:23 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/i80321reg.h Index: src/sys/arch/iyonix/iyonix/i80321_mainbus.c diff -u src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.4 src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.5 --- src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.4 Sun May 14 15:26:05 2006 +++ src/sys/arch/iyonix/iyonix/i80321_mainbus.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_mainbus.c,v 1.4 2006/05/14 15:26:05 gavan Exp $ */ +/* $NetBSD: i80321_mainbus.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -42,14 +42,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i80321_mainbus.c,v 1.4 2006/05/14 15:26:05 gavan Exp $); +__KERNEL_RCSID(0, $NetBSD: i80321_mainbus.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include iyonix/iyonix/iyonixreg.h #include iyonix/iyonix/iyonixvar.h Index: src/sys/arch/iyonix/iyonix/obio_space.c diff -u src/sys/arch/iyonix/iyonix/obio_space.c:1.4 src/sys/arch/iyonix/iyonix/obio_space.c:1.5 --- src/sys/arch/iyonix/iyonix/obio_space.c:1.4 Sat Nov 7 07:27:44 2009 +++ src/sys/arch/iyonix/iyonix/obio_space.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.4 2009/11/07 07:27:44 cegger Exp $ */ +/* $NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obio_space.c,v 1.4 2009/11/07 07:27:44 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $); #include sys/param.h #include sys/systm.h #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h /* Prototypes for all the bus_space structure functions */ bs_protos(obio); Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.17 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.18 --- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.17 Thu Jun 30 20:09:32 2011 +++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iyonix_machdep.c,v 1.17 2011/06/30 20:09:32 wiz Exp $ */ +/* $NetBSD: iyonix_machdep.c,v 1.18 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/arch/mips/bonito
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:48:48 UTC 2011 Modified Files: src/sys/arch/mips/bonito: bonito_pci.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/bonito/bonito_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/bonito/bonito_pci.c diff -u src/sys/arch/mips/bonito/bonito_pci.c:1.7 src/sys/arch/mips/bonito/bonito_pci.c:1.8 --- src/sys/arch/mips/bonito/bonito_pci.c:1.7 Sun Aug 9 04:09:55 2009 +++ src/sys/arch/mips/bonito/bonito_pci.c Fri Jul 1 20:48:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bonito_pci.c,v 1.7 2009/08/09 04:09:55 matt Exp $ */ +/* $NetBSD: bonito_pci.c,v 1.8 2011/07/01 20:48:47 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,13 +35,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bonito_pci.c,v 1.7 2009/08/09 04:09:55 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bonito_pci.c,v 1.8 2011/07/01 20:48:47 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/locore.h
CVS commit: src/sys/arch/mvmeppc
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:49:38 UTC 2011 Modified Files: src/sys/arch/mvmeppc/mvmeppc: cpu.c mainbus.c src/sys/arch/mvmeppc/pci: pci_machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvmeppc/mvmeppc/cpu.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvmeppc/mvmeppc/mainbus.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvmeppc/pci/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/mvmeppc/cpu.c diff -u src/sys/arch/mvmeppc/mvmeppc/cpu.c:1.9 src/sys/arch/mvmeppc/mvmeppc/cpu.c:1.10 --- src/sys/arch/mvmeppc/mvmeppc/cpu.c:1.9 Sun Jun 5 17:03:16 2011 +++ src/sys/arch/mvmeppc/mvmeppc/cpu.c Fri Jul 1 20:49:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/platform.h Index: src/sys/arch/mvmeppc/mvmeppc/mainbus.c diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.13 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.14 --- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.13 Sun Jun 5 17:03:16 2011 +++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c Fri Jul 1 20:49:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.13 2011/06/05 17:03:16 matt Exp $ */ +/* $NetBSD: mainbus.c,v 1.14 2011/07/01 20:49:38 dyoung Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.13 2011/06/05 17:03:16 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.14 2011/07/01 20:49:38 dyoung Exp $); #include sys/param.h #include sys/extent.h @@ -40,7 +40,7 @@ #include sys/malloc.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include pci.h #include opt_pci.h Index: src/sys/arch/mvmeppc/pci/pci_machdep.c diff -u src/sys/arch/mvmeppc/pci/pci_machdep.c:1.9 src/sys/arch/mvmeppc/pci/pci_machdep.c:1.10 --- src/sys/arch/mvmeppc/pci/pci_machdep.c:1.9 Thu Jun 30 00:52:58 2011 +++ src/sys/arch/mvmeppc/pci/pci_machdep.c Fri Jul 1 20:49:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.9 2011/06/30 00:52:58 matt Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.9 2011/06/30 00:52:58 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -49,7 +49,7 @@ #include sys/device.h #define _POWERPC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include machine/platform.h
CVS commit: src/sys/arch/mvmeppc/isa
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:50:00 UTC 2011 Modified Files: src/sys/arch/mvmeppc/isa: mkclock_isa.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvmeppc/isa/mkclock_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/isa/mkclock_isa.c diff -u src/sys/arch/mvmeppc/isa/mkclock_isa.c:1.13 src/sys/arch/mvmeppc/isa/mkclock_isa.c:1.14 --- src/sys/arch/mvmeppc/isa/mkclock_isa.c:1.13 Mon Apr 28 20:23:29 2008 +++ src/sys/arch/mvmeppc/isa/mkclock_isa.c Fri Jul 1 20:50:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mkclock_isa.c,v 1.13 2008/04/28 20:23:29 martin Exp $ */ +/* $NetBSD: mkclock_isa.c,v 1.14 2011/07/01 20:50:00 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -35,14 +35,14 @@ */ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: mkclock_isa.c,v 1.13 2008/04/28 20:23:29 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: mkclock_isa.c,v 1.14 2011/07/01 20:50:00 dyoung Exp $); #include sys/param.h #include sys/kernel.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include dev/clock_subr.h #include dev/ic/mk48txxreg.h
CVS commit: src/sys/arch/netwinder
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:50:34 UTC 2011 Modified Files: src/sys/arch/netwinder/netwinder: netwinder_machdep.c src/sys/arch/netwinder/pci: pcib.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 \ src/sys/arch/netwinder/netwinder/netwinder_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/netwinder/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.75 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.76 --- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.75 Thu Jun 30 20:09:34 2011 +++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Fri Jul 1 20:50:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: netwinder_machdep.c,v 1.75 2011/06/30 20:09:34 wiz Exp $ */ +/* $NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.75 2011/06/30 20:09:34 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $); #include opt_ddb.h #include opt_pmap_debug.h @@ -68,7 +68,7 @@ #include machine/bootconfig.h #define _ARM32_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include machine/intr.h Index: src/sys/arch/netwinder/pci/pcib.c diff -u src/sys/arch/netwinder/pci/pcib.c:1.14 src/sys/arch/netwinder/pci/pcib.c:1.15 --- src/sys/arch/netwinder/pci/pcib.c:1.14 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/netwinder/pci/pcib.c Fri Jul 1 20:50:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: pcib.c,v 1.15 2011/07/01 20:50:34 dyoung Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -32,13 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.15 2011/07/01 20:50:34 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include dev/isa/isavar.h
CVS commit: src/sys/arch/ofppc
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:51:15 UTC 2011 Modified Files: src/sys/arch/ofppc/isa: isa_machdep.c src/sys/arch/ofppc/ofppc: machdep.c src/sys/arch/ofppc/pci: gt_mainbus.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ofppc/isa/isa_machdep.c cvs rdiff -u -r1.114 -r1.115 src/sys/arch/ofppc/ofppc/machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ofppc/pci/gt_mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ofppc/isa/isa_machdep.c diff -u src/sys/arch/ofppc/isa/isa_machdep.c:1.5 src/sys/arch/ofppc/isa/isa_machdep.c:1.6 --- src/sys/arch/ofppc/isa/isa_machdep.c:1.5 Mon Apr 28 20:23:30 2008 +++ src/sys/arch/ofppc/isa/isa_machdep.c Fri Jul 1 20:51:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.c,v 1.5 2008/04/28 20:23:30 martin Exp $ */ +/* $NetBSD: isa_machdep.c,v 1.6 2011/07/01 20:51:14 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,11 +30,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.5 2008/04/28 20:23:30 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.6 2011/07/01 20:51:14 dyoung Exp $); #include sys/param.h -#include machine/bus.h +#include sys/bus.h #include machine/pio.h #include sys/extent.h Index: src/sys/arch/ofppc/ofppc/machdep.c diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.114 src/sys/arch/ofppc/ofppc/machdep.c:1.115 --- src/sys/arch/ofppc/ofppc/machdep.c:1.114 Sat Jun 18 08:08:29 2011 +++ src/sys/arch/ofppc/ofppc/machdep.c Fri Jul 1 20:51:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.114 2011/06/18 08:08:29 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.115 2011/07/01 20:51:14 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.114 2011/06/18 08:08:29 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.115 2011/07/01 20:51:14 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -48,7 +48,7 @@ #include machine/pmap.h #include machine/powerpc.h #include machine/trap.h -#include machine/bus.h +#include sys/bus.h #include machine/isa_machdep.h #include powerpc/spr.h Index: src/sys/arch/ofppc/pci/gt_mainbus.c diff -u src/sys/arch/ofppc/pci/gt_mainbus.c:1.3 src/sys/arch/ofppc/pci/gt_mainbus.c:1.4 --- src/sys/arch/ofppc/pci/gt_mainbus.c:1.3 Fri Dec 17 19:18:49 2010 +++ src/sys/arch/ofppc/pci/gt_mainbus.c Fri Jul 1 20:51:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gt_mainbus.c,v 1.3 2010/12/17 19:18:49 phx Exp $ */ +/* $NetBSD: gt_mainbus.c,v 1.4 2011/07/01 20:51:15 dyoung Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gt_mainbus.c,v 1.3 2010/12/17 19:18:49 phx Exp $); +__KERNEL_RCSID(0, $NetBSD: gt_mainbus.c,v 1.4 2011/07/01 20:51:15 dyoung Exp $); #include opt_pci.h #include opt_marvell.h @@ -43,7 +43,7 @@ #include sys/malloc.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/isa_machdep.h #include machine/pegasosreg.h
CVS commit: src/sys/arch/prep
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:52:02 UTC 2011 Modified Files: src/sys/arch/prep/eisa: eisa_machdep.c src/sys/arch/prep/prep: consinit.c cpu.c mainbus.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/prep/eisa/eisa_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/prep/prep/consinit.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/prep/prep/cpu.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/prep/prep/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/prep/eisa/eisa_machdep.c diff -u src/sys/arch/prep/eisa/eisa_machdep.c:1.3 src/sys/arch/prep/eisa/eisa_machdep.c:1.4 --- src/sys/arch/prep/eisa/eisa_machdep.c:1.3 Sat Jun 18 08:08:29 2011 +++ src/sys/arch/prep/eisa/eisa_machdep.c Fri Jul 1 20:52:02 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: eisa_machdep.c,v 1.3 2011/06/18 08:08:29 matt Exp $ */ +/* $NetBSD: eisa_machdep.c,v 1.4 2011/07/01 20:52:02 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.3 2011/06/18 08:08:29 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.4 2011/07/01 20:52:02 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -76,7 +76,7 @@ #include sys/extent.h #define _POWERPC_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/pio.h #include machine/intr.h Index: src/sys/arch/prep/prep/consinit.c diff -u src/sys/arch/prep/prep/consinit.c:1.6 src/sys/arch/prep/prep/consinit.c:1.7 --- src/sys/arch/prep/prep/consinit.c:1.6 Wed Oct 17 19:56:53 2007 +++ src/sys/arch/prep/prep/consinit.c Fri Jul 1 20:52:02 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.6 2007/10/17 19:56:53 garbled Exp $ */ +/* $NetBSD: consinit.c,v 1.7 2011/07/01 20:52:02 dyoung Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,13 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.6 2007/10/17 19:56:53 garbled Exp $); +__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.7 2011/07/01 20:52:02 dyoung Exp $); #include sys/param.h #include sys/systm.h #include machine/bootinfo.h -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/cons.h Index: src/sys/arch/prep/prep/cpu.c diff -u src/sys/arch/prep/prep/cpu.c:1.17 src/sys/arch/prep/prep/cpu.c:1.18 --- src/sys/arch/prep/prep/cpu.c:1.17 Wed Jun 29 06:13:09 2011 +++ src/sys/arch/prep/prep/cpu.c Fri Jul 1 20:52:02 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.17 2011/06/29 06:13:09 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.18 2011/07/01 20:52:02 dyoung Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.17 2011/06/29 06:13:09 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.18 2011/07/01 20:52:02 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/platform.h Index: src/sys/arch/prep/prep/mainbus.c diff -u src/sys/arch/prep/prep/mainbus.c:1.31 src/sys/arch/prep/prep/mainbus.c:1.32 --- src/sys/arch/prep/prep/mainbus.c:1.31 Sun Jun 5 17:03:17 2011 +++ src/sys/arch/prep/prep/mainbus.c Fri Jul 1 20:52:02 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.31 2011/06/05 17:03:17 matt Exp $ */ +/* $NetBSD: mainbus.c,v 1.32 2011/07/01 20:52:02 dyoung Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.31 2011/06/05 17:03:17 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.32 2011/07/01 20:52:02 dyoung Exp $); #include opt_pci.h #include opt_residual.h @@ -47,7 +47,7 @@ #include sys/malloc.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include machine/isa_machdep.h #include dev/pci/pcivar.h
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:58:39 UTC 2011 Modified Files: src/sys/arch/mips/mips: bus_dma.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/mips/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/bus_dma.c diff -u src/sys/arch/mips/mips/bus_dma.c:1.25 src/sys/arch/mips/mips/bus_dma.c:1.26 --- src/sys/arch/mips/mips/bus_dma.c:1.25 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/mips/bus_dma.c Fri Jul 1 20:58:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.25 2011/02/20 07:45:47 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.26 2011/07/01 20:58:39 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.25 2011/02/20 07:45:47 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.26 2011/07/01 20:58:39 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -51,7 +51,7 @@ #endif #define _MIPS_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/locore.h
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:59:39 UTC 2011 Modified Files: src/sys/arch/sparc64/include: autoconf.h z8530var.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc64/include/autoconf.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/include/z8530var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/include/autoconf.h diff -u src/sys/arch/sparc64/include/autoconf.h:1.29 src/sys/arch/sparc64/include/autoconf.h:1.30 --- src/sys/arch/sparc64/include/autoconf.h:1.29 Sat Mar 12 11:43:38 2011 +++ src/sys/arch/sparc64/include/autoconf.h Fri Jul 1 20:59:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.h,v 1.29 2011/03/12 11:43:38 nakayama Exp $ */ +/* $NetBSD: autoconf.h,v 1.30 2011/07/01 20:59:38 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ * Autoconfiguration information. */ -#include machine/bus.h +#include sys/bus.h #include machine/promlib.h /* This is used to map device classes to IPLs */ Index: src/sys/arch/sparc64/include/z8530var.h diff -u src/sys/arch/sparc64/include/z8530var.h:1.12 src/sys/arch/sparc64/include/z8530var.h:1.13 --- src/sys/arch/sparc64/include/z8530var.h:1.12 Sat Mar 29 19:15:35 2008 +++ src/sys/arch/sparc64/include/z8530var.h Fri Jul 1 20:59:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: z8530var.h,v 1.12 2008/03/29 19:15:35 tsutsui Exp $ */ +/* $NetBSD: z8530var.h,v 1.13 2011/07/01 20:59:39 dyoung Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ * @(#)zsvar.h 8.1 (Berkeley) 6/11/93 */ -#include machine/bus.h +#include sys/bus.h #include dev/ic/z8530sc.h #include kbd.h /* NKBD */
CVS commit: src/sys/arch/sgimips/include
Module Name:src
Committed By: dyoung
Date: Fri Jul 1 21:00:21 UTC 2011
Modified Files:
src/sys/arch/sgimips/include: autoconf.h z8530var.h
Log Message:
#include sys/bus.h instead of machine/bus.h.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/include/autoconf.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/include/z8530var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sgimips/include/autoconf.h
diff -u src/sys/arch/sgimips/include/autoconf.h:1.10 src/sys/arch/sgimips/include/autoconf.h:1.11
--- src/sys/arch/sgimips/include/autoconf.h:1.10 Wed Oct 17 19:57:04 2007
+++ src/sys/arch/sgimips/include/autoconf.h Fri Jul 1 21:00:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.10 2007/10/17 19:57:04 garbled Exp $ */
+/* $NetBSD: autoconf.h,v 1.11 2011/07/01 21:00:21 dyoung Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include machine/bus.h
+#include sys/bus.h
struct mainbus_attach_args {
char *ma_name;
Index: src/sys/arch/sgimips/include/z8530var.h
diff -u src/sys/arch/sgimips/include/z8530var.h:1.9 src/sys/arch/sgimips/include/z8530var.h:1.10
--- src/sys/arch/sgimips/include/z8530var.h:1.9 Sat Mar 29 19:15:35 2008
+++ src/sys/arch/sgimips/include/z8530var.h Fri Jul 1 21:00:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530var.h,v 1.9 2008/03/29 19:15:35 tsutsui Exp $ */
+/* $NetBSD: z8530var.h,v 1.10 2011/07/01 21:00:21 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -83,7 +83,7 @@
* @(#)zsvar.h 8.1 (Berkeley) 6/11/93
*/
-#include machine/bus.h
+#include sys/bus.h
#include dev/ic/z8530sc.h
struct zs_channel {
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:57:45 UTC 2011 Modified Files: src/sys/arch/arm/arm32: bus_dma.c pmap.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/arm32/bus_dma.c cvs rdiff -u -r1.223 -r1.224 src/sys/arch/arm/arm32/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/bus_dma.c diff -u src/sys/arch/arm/arm32/bus_dma.c:1.53 src/sys/arch/arm/arm32/bus_dma.c:1.54 --- src/sys/arch/arm/arm32/bus_dma.c:1.53 Sat Nov 6 11:46:00 2010 +++ src/sys/arch/arm/arm32/bus_dma.c Fri Jul 1 20:57:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.53 2010/11/06 11:46:00 uebayasi Exp $ */ +/* $NetBSD: bus_dma.c,v 1.54 2011/07/01 20:57:45 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #define _ARM32_BUS_DMA_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.53 2010/11/06 11:46:00 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.54 2011/07/01 20:57:45 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -50,7 +50,7 @@ #include uvm/uvm.h -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include arm/cpufunc.h Index: src/sys/arch/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.223 src/sys/arch/arm/arm32/pmap.c:1.224 --- src/sys/arch/arm/arm32/pmap.c:1.223 Thu Jun 30 20:09:19 2011 +++ src/sys/arch/arm/arm32/pmap.c Fri Jul 1 20:57:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.223 2011/06/30 20:09:19 wiz Exp $ */ +/* $NetBSD: pmap.c,v 1.224 2011/07/01 20:57:45 dyoung Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -205,13 +205,13 @@ #include uvm/uvm.h -#include machine/bus.h +#include sys/bus.h #include machine/pmap.h #include machine/pcb.h #include machine/param.h #include arm/arm32/katelib.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.223 2011/06/30 20:09:19 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.224 2011/07/01 20:57:45 dyoung Exp $); #ifdef PMAP_DEBUG
CVS commit: src/sys/arch/sparc/include
Module Name:src
Committed By: dyoung
Date: Fri Jul 1 21:00:57 UTC 2011
Modified Files:
src/sys/arch/sparc/include: autoconf.h z8530var.h
Log Message:
#include sys/bus.h instead of machine/bus.h.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc/include/autoconf.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/include/z8530var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/autoconf.h
diff -u src/sys/arch/sparc/include/autoconf.h:1.46 src/sys/arch/sparc/include/autoconf.h:1.47
--- src/sys/arch/sparc/include/autoconf.h:1.46 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/include/autoconf.h Fri Jul 1 21:00:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.46 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: autoconf.h,v 1.47 2011/07/01 21:00:57 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
* Autoconfiguration information.
*/
-#include machine/bus.h
+#include sys/bus.h
#include machine/bsd_openprom.h
#include machine/promlib.h
#include dev/sbus/sbusvar.h
Index: src/sys/arch/sparc/include/z8530var.h
diff -u src/sys/arch/sparc/include/z8530var.h:1.10 src/sys/arch/sparc/include/z8530var.h:1.11
--- src/sys/arch/sparc/include/z8530var.h:1.10 Sat Jun 26 16:10:00 2010
+++ src/sys/arch/sparc/include/z8530var.h Fri Jul 1 21:00:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530var.h,v 1.10 2010/06/26 16:10:00 tsutsui Exp $ */
+/* $NetBSD: z8530var.h,v 1.11 2011/07/01 21:00:57 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@
* @(#)zsvar.h 8.1 (Berkeley) 6/11/93
*/
-#include machine/bus.h
+#include sys/bus.h
#include dev/ic/z8530sc.h
struct zsc_softc {
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: dyoung Date: Fri Jul 1 21:01:30 UTC 2011 Modified Files: src/sys/arch/powerpc/include: isa_machdep.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/include/isa_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/isa_machdep.h diff -u src/sys/arch/powerpc/include/isa_machdep.h:1.7 src/sys/arch/powerpc/include/isa_machdep.h:1.8 --- src/sys/arch/powerpc/include/isa_machdep.h:1.7 Fri Jun 17 19:03:00 2011 +++ src/sys/arch/powerpc/include/isa_machdep.h Fri Jul 1 21:01:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.7 2011/06/17 19:03:00 matt Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.8 2011/07/01 21:01:30 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ #ifndef _POWERPC_ISA_MACHDEP_H_ #define _POWERPC_ISA_MACHDEP_H_ -#include machine/bus.h +#include sys/bus.h #include dev/isa/isadmavar.h /*
CVS commit: src/sys/arch
Module Name:src
Committed By: dyoung
Date: Fri Jul 1 21:02:16 UTC 2011
Modified Files:
src/sys/arch/algor/include: autoconf.h
src/sys/arch/cobalt/include: autoconf.h
src/sys/arch/hp700/include: autoconf.h
src/sys/arch/macppc/include: autoconf.h
src/sys/arch/ofppc/include: autoconf.h
Log Message:
#include sys/bus.h instead of machine/bus.h.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/include/autoconf.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/cobalt/include/autoconf.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/include/autoconf.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/macppc/include/autoconf.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ofppc/include/autoconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/algor/include/autoconf.h
diff -u src/sys/arch/algor/include/autoconf.h:1.5 src/sys/arch/algor/include/autoconf.h:1.6
--- src/sys/arch/algor/include/autoconf.h:1.5 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.5 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.6 2011/07/01 21:02:15 dyoung Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -30,7 +30,7 @@
#ifndef _ALGOR_AUTOCONF_H_
#define _ALGOR_AUTOCONF_H_
-#include machine/bus.h
+#include sys/bus.h
/*
* Machine-dependent structures for autoconfiguration
Index: src/sys/arch/cobalt/include/autoconf.h
diff -u src/sys/arch/cobalt/include/autoconf.h:1.5 src/sys/arch/cobalt/include/autoconf.h:1.6
--- src/sys/arch/cobalt/include/autoconf.h:1.5 Thu Dec 17 15:29:47 2009
+++ src/sys/arch/cobalt/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.5 2009/12/17 15:29:47 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.6 2011/07/01 21:02:15 dyoung Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
-#include machine/bus.h
+#include sys/bus.h
struct mainbus_attach_args {
const char *ma_name;
Index: src/sys/arch/hp700/include/autoconf.h
diff -u src/sys/arch/hp700/include/autoconf.h:1.18 src/sys/arch/hp700/include/autoconf.h:1.19
--- src/sys/arch/hp700/include/autoconf.h:1.18 Thu Jan 20 19:47:40 2011
+++ src/sys/arch/hp700/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.18 2011/01/20 19:47:40 skrll Exp $ */
+/* $NetBSD: autoconf.h,v 1.19 2011/07/01 21:02:15 dyoung Exp $ */
/* $OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $ */
@@ -30,7 +30,7 @@
#include sys/device.h
-#include machine/bus.h
+#include sys/bus.h
#include machine/pdc.h
/* 16 should be enough for anyone */
Index: src/sys/arch/macppc/include/autoconf.h
diff -u src/sys/arch/macppc/include/autoconf.h:1.17 src/sys/arch/macppc/include/autoconf.h:1.18
--- src/sys/arch/macppc/include/autoconf.h:1.17 Thu Jun 30 00:52:57 2011
+++ src/sys/arch/macppc/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.17 2011/06/30 00:52:57 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.18 2011/07/01 21:02:15 dyoung Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -34,7 +34,7 @@
#ifndef _MACHINE_AUTOCONF_H_
#define _MACHINE_AUTOCONF_H_
-#include machine/bus.h /* for bus_space_tag_t */
+#include sys/bus.h /* for bus_space_tag_t */
struct confargs {
const char *ca_name;
Index: src/sys/arch/ofppc/include/autoconf.h
diff -u src/sys/arch/ofppc/include/autoconf.h:1.14 src/sys/arch/ofppc/include/autoconf.h:1.15
--- src/sys/arch/ofppc/include/autoconf.h:1.14 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/ofppc/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: autoconf.h,v 1.14 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.15 2011/07/01 21:02:15 dyoung Exp $ */
#ifndef _OFPPC_AUTOCONF_H_
#define _OFPPC_AUTOCONF_H_
-#include machine/bus.h
+#include sys/bus.h
struct confargs {
const char *ca_name;
CVS commit: src/sys/arch
Module Name:src Committed By: dyoung Date: Fri Jul 1 21:16:40 UTC 2011 Modified Files: src/sys/arch/arm/include: isa_machdep.h src/sys/arch/atari/include: isa_machdep.h Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/isa_machdep.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/atari/include/isa_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/isa_machdep.h diff -u src/sys/arch/arm/include/isa_machdep.h:1.7 src/sys/arch/arm/include/isa_machdep.h:1.8 --- src/sys/arch/arm/include/isa_machdep.h:1.7 Wed Aug 19 15:01:07 2009 +++ src/sys/arch/arm/include/isa_machdep.h Fri Jul 1 21:16:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:07 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.8 2011/07/01 21:16:40 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #ifndef _ARM32_ISA_MACHDEP_H_ #define _ARM32_ISA_MACHDEP_H_ -#include machine/bus.h +#include sys/bus.h #include dev/isa/isadmavar.h /* Index: src/sys/arch/atari/include/isa_machdep.h diff -u src/sys/arch/atari/include/isa_machdep.h:1.15 src/sys/arch/atari/include/isa_machdep.h:1.16 --- src/sys/arch/atari/include/isa_machdep.h:1.15 Tue Oct 20 19:10:11 2009 +++ src/sys/arch/atari/include/isa_machdep.h Fri Jul 1 21:16:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.15 2009/10/20 19:10:11 snj Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.16 2011/07/01 21:16:40 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #ifndef _ATARI_ISA_MACHDEP_H_ #define _ATARI_ISA_MACHDEP_H_ -#include machine/bus.h +#include sys/bus.h #include machine/intr.h #include dev/isa/isadmavar.h
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: dyoung Date: Fri Jul 1 22:08:22 UTC 2011 Modified Files: src/sys/arch/mips/include: locore.h Log Message: Don't #include opt_cputype.h unless _KERNEL_OPT is #defined. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/mips/include/locore.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/locore.h diff -u src/sys/arch/mips/include/locore.h:1.90 src/sys/arch/mips/include/locore.h:1.91 --- src/sys/arch/mips/include/locore.h:1.90 Fri Apr 29 22:05:16 2011 +++ src/sys/arch/mips/include/locore.h Fri Jul 1 22:08:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.90 2011/04/29 22:05:16 matt Exp $ */ +/* $NetBSD: locore.h,v 1.91 2011/07/01 22:08:22 dyoung Exp $ */ /* * This file should not be included by MI code!!! @@ -28,7 +28,7 @@ #ifndef _MIPS_LOCORE_H #define _MIPS_LOCORE_H -#ifndef _LKM +#if !defined(_LKM) defined(_KERNEL_OPT) #include opt_cputype.h #endif
CVS commit: src/sys/arch
Module Name:src Committed By: dyoung Date: Fri Jul 1 22:10:31 UTC 2011 Modified Files: src/sys/arch/algor/conf: P5064 src/sys/arch/evbmips/conf: ALCHEMY XLSATX Log Message: Increase SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbmips/conf/ALCHEMY cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/conf/XLSATX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.65 src/sys/arch/algor/conf/P5064:1.66 --- src/sys/arch/algor/conf/P5064:1.65 Thu Jun 30 20:09:17 2011 +++ src/sys/arch/algor/conf/P5064 Fri Jul 1 22:10:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.65 2011/06/30 20:09:17 wiz Exp $ +# $NetBSD: P5064,v 1.66 2011/07/01 22:10:31 dyoung Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.65 $ +#ident P5064-$Revision: 1.66 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=461000 +options SYMTAB_SPACE=462000 # File systems file-system FFS # Fast file system Index: src/sys/arch/evbmips/conf/ALCHEMY diff -u src/sys/arch/evbmips/conf/ALCHEMY:1.35 src/sys/arch/evbmips/conf/ALCHEMY:1.36 --- src/sys/arch/evbmips/conf/ALCHEMY:1.35 Thu Jun 30 20:09:29 2011 +++ src/sys/arch/evbmips/conf/ALCHEMY Fri Jul 1 22:10:31 2011 @@ -1,11 +1,11 @@ -# $NetBSD: ALCHEMY,v 1.35 2011/06/30 20:09:29 wiz Exp $ +# $NetBSD: ALCHEMY,v 1.36 2011/07/01 22:10:31 dyoung Exp $ # # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500, # DBAu1000 and DBAu1500 evaluation boards. include arch/evbmips/conf/std.alchemy -#ident ALCHEMY-$Revision: 1.35 $ +#ident ALCHEMY-$Revision: 1.36 $ maxusers 32 @@ -45,7 +45,7 @@ options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=48 # size for embedded symbol table +options SYMTAB_SPACE=481000 # size for embedded symbol table # Compatibility options #options COMPAT_43 # compatibility with 4.3BSD binaries Index: src/sys/arch/evbmips/conf/XLSATX diff -u src/sys/arch/evbmips/conf/XLSATX:1.5 src/sys/arch/evbmips/conf/XLSATX:1.6 --- src/sys/arch/evbmips/conf/XLSATX:1.5 Thu Jun 30 20:09:29 2011 +++ src/sys/arch/evbmips/conf/XLSATX Fri Jul 1 22:10:31 2011 @@ -1,8 +1,8 @@ -# $NetBSD: XLSATX,v 1.5 2011/06/30 20:09:29 wiz Exp $ +# $NetBSD: XLSATX,v 1.6 2011/07/01 22:10:31 dyoung Exp $ include arch/evbmips/conf/std.rmixl -#ident XLSATX-$Revision: 1.5 $ +#ident XLSATX-$Revision: 1.6 $ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -41,7 +41,7 @@ options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=50 # size for embedded symbol table +options SYMTAB_SPACE=503000 # size for embedded symbol table #options DDB_COMMANDONENTER=trace;show registers options DB_MAX_LINE=-1
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: mrg Date: Fri Jul 1 22:23:19 UTC 2011 Modified Files: src/distrib/sets/lists/base: mi Log Message: new gcc 4.5 g++ dirs are for everyone, not just gcc 4.5 users. fixes build problems. To generate a diff of this commit: cvs rdiff -u -r1.942 -r1.943 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.942 src/distrib/sets/lists/base/mi:1.943 --- src/distrib/sets/lists/base/mi:1.942 Fri Jul 1 02:10:08 2011 +++ src/distrib/sets/lists/base/mi Fri Jul 1 22:23:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.942 2011/07/01 02:10:08 mrg Exp $ +# $NetBSD: mi,v 1.943 2011/07/01 22:23:19 mrg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -805,14 +805,14 @@ ./usr/include/g++base-cxx-usr ./usr/include/g++/backward base-cxx-usr ./usr/include/g++/bitsbase-cxx-usr -./usr/include/g++/debugbase-cxx-usr gcc=45 +./usr/include/g++/debugbase-cxx-usr ./usr/include/g++/decimal base-cxx-usr ./usr/include/g++/extbase-cxx-usr ./usr/include/g++/genbase-obsolete obsolete -./usr/include/g++/parallel base-cxx-usr gcc=45 +./usr/include/g++/parallel base-cxx-usr ./usr/include/g++/stdbase-obsolete obsolete ./usr/include/g++/tr1base-cxx-usr -./usr/include/g++/tr1_impl base-cxx-usr gcc=45 +./usr/include/g++/tr1_impl base-cxx-usr ./usr/include/gcc-4.1base-c-usr ./usr/include/gcc-4.5base-c-usr ./usr/include/gssapibase-c-usr
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: dyoung Date: Fri Jul 1 22:28:07 UTC 2011 Modified Files: src/sys/arch/algor/conf: P6032 Log Message: Increase SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.58 src/sys/arch/algor/conf/P6032:1.59 --- src/sys/arch/algor/conf/P6032:1.58 Thu Jun 30 20:09:17 2011 +++ src/sys/arch/algor/conf/P6032 Fri Jul 1 22:28:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.58 2011/06/30 20:09:17 wiz Exp $ +# $NetBSD: P6032,v 1.59 2011/07/01 22:28:07 dyoung Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.58 $ +#ident P6032-$Revision: 1.59 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=42 +options SYMTAB_SPACE=421000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Fri Jul 1 23:47:10 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: fixup.c
Log Message:
Change assert to panic.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/powerpc/fixup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/fixup.c
diff -u src/sys/arch/powerpc/powerpc/fixup.c:1.4 src/sys/arch/powerpc/powerpc/fixup.c:1.5
--- src/sys/arch/powerpc/powerpc/fixup.c:1.4 Wed Jun 15 15:18:20 2011
+++ src/sys/arch/powerpc/powerpc/fixup.c Fri Jul 1 23:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fixup.c,v 1.4 2011/06/15 15:18:20 matt Exp $ */
+/* $NetBSD: fixup.c,v 1.5 2011/07/01 23:47:09 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fixup.c,v 1.4 2011/06/15 15:18:20 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: fixup.c,v 1.5 2011/07/01 23:47:09 matt Exp $);
#include sys/param.h
#include sys/types.h
@@ -177,7 +177,11 @@
case OPC_branch_19: {
KASSERT(r_lr == -1 || i.i_int == 0x4e800421);
KASSERT(r_lr != -1 || i.i_int == 0x4e800420);
-KASSERT(ctr != 0);
+if (ctr == 0) {
+ panic(%s: jump at %p to %p would
+ branch to 0, __func__, insnp,
+ insnp + instr.i_i.i_li);
+}
fixup.jfi_real = fixup_addr2offset(ctr);
break;
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Jul 1 23:48:21 UTC 2011 Modified Files: src/sys/dev/usb: ehci.c Log Message: use an unsigned type for unsigned calcations. avoid GCC 4.5 warnings. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ehci.c diff -u src/sys/dev/usb/ehci.c:1.180 src/sys/dev/usb/ehci.c:1.181 --- src/sys/dev/usb/ehci.c:1.180 Thu Jun 30 20:09:40 2011 +++ src/sys/dev/usb/ehci.c Fri Jul 1 23:48:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.180 2011/06/30 20:09:40 wiz Exp $ */ +/* $NetBSD: ehci.c,v 1.181 2011/07/01 23:48:20 mrg Exp $ */ /* * Copyright (c) 2004-2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.180 2011/06/30 20:09:40 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.181 2011/07/01 23:48:20 mrg Exp $); #include ohci.h #include uhci.h @@ -3988,7 +3988,7 @@ if (page_offs = dma_buf-block-size) break; - long long page = DMAADDR(dma_buf, page_offs); + unsigned long long page = DMAADDR(dma_buf, page_offs); page = EHCI_PAGE(page); itd-itd.itd_bufr[j] = htole32(EHCI_ITD_SET_BPTR(page));
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: matt Date: Sat Jul 2 00:22:06 UTC 2011 Modified Files: src/sys/arch/powerpc/oea: ofwoea_machdep.c Log Message: Select pmap style before calling oea_init. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/ofwoea_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/oea/ofwoea_machdep.c diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.22 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.23 --- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.22 Mon Jun 20 06:21:45 2011 +++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Sat Jul 2 00:22:06 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofwoea_machdep.c,v 1.22 2011/06/20 06:21:45 matt Exp $ */ +/* $NetBSD: ofwoea_machdep.c,v 1.23 2011/07/02 00:22:06 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ofwoea_machdep.c,v 1.22 2011/06/20 06:21:45 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ofwoea_machdep.c,v 1.23 2011/07/02 00:22:06 matt Exp $); #include opt_ppcarch.h #include opt_compat_netbsd.h @@ -189,6 +189,13 @@ } #endif +#if defined (PPC_OEA64_BRIDGE) defined (PPC_OEA) + if (oeacpufeat OEACPU_64_BRIDGE) + pmap_setup64bridge(); + else + pmap_setup32(); +#endif + oea_init(pic_ext_intr); ofmaplen = save_ofmap(NULL, 0); @@ -209,12 +216,6 @@ uvm_setpagesize(); -#if defined (PPC_OEA64_BRIDGE) defined (PPC_OEA) - if (oeacpufeat OEACPU_64_BRIDGE) - pmap_setup64bridge(); - else - pmap_setup32(); -#endif pmap_bootstrap(startkernel, endkernel); /* as far as I can tell, the pmap_setup_seg0 stuff is horribly broken */
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Sat Jul 2 00:38:30 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: vm_machdep.c
Log Message:
Default to normal uvm_uarea_alloc if we can't allocate one ourselves.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/powerpc/powerpc/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.90 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.91
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.90 Mon Jun 20 05:50:39 2011
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Sat Jul 2 00:38:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.90 2011/06/20 05:50:39 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.91 2011/07/02 00:38:29 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.90 2011/06/20 05:50:39 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.91 2011/07/02 00:38:29 matt Exp $);
#include opt_altivec.h
#include opt_multiprocessor.h
@@ -298,7 +298,7 @@
error = uvm_pglistalloc(USPACE, 0, ptoa(physmem), 0, 0, pglist, 1, 1);
if (error) {
if (!system)
- return NULL;
+ return (void *)uvm_uarea_alloc();
panic(%s: uvm_pglistalloc failed: %d, __func__, error);
}
@@ -315,7 +315,7 @@
return (void *)(uintptr_t)PMAP_MAP_POOLPAGE(pa);
#else
- return NULL;
+ return (void *)uvm_uarea_alloc();
#endif
}
CVS commit: src/sys/fs/v7fs
Module Name:src
Committed By: uch
Date: Sat Jul 2 01:05:38 UTC 2011
Modified Files:
src/sys/fs/v7fs: v7fs_vfsops.c
Log Message:
Set missing error number
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/v7fs/v7fs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/v7fs/v7fs_vfsops.c
diff -u src/sys/fs/v7fs/v7fs_vfsops.c:1.1 src/sys/fs/v7fs/v7fs_vfsops.c:1.2
--- src/sys/fs/v7fs/v7fs_vfsops.c:1.1 Mon Jun 27 11:52:25 2011
+++ src/sys/fs/v7fs/v7fs_vfsops.c Sat Jul 2 01:05:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_vfsops.c,v 1.1 2011/06/27 11:52:25 uch Exp $ */
+/* $NetBSD: v7fs_vfsops.c,v 1.2 2011/07/02 01:05:38 uch Exp $ */
/*-
* Copyright (c) 2004, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: v7fs_vfsops.c,v 1.1 2011/06/27 11:52:25 uch Exp $);
+__KERNEL_RCSID(0, $NetBSD: v7fs_vfsops.c,v 1.2 2011/07/02 01:05:38 uch Exp $);
#if defined _KERNEL_OPT
#include opt_v7fs.h
#endif
@@ -73,7 +73,7 @@
static int v7fs_mountfs(struct vnode *, struct mount *, int);
static int v7fs_openfs(struct vnode *, struct mount *, struct lwp *);
static void v7fs_closefs(struct vnode *, struct mount *);
-static bool is_v7fs_partition(struct vnode *);
+static int is_v7fs_partition(struct vnode *);
static enum vtype v7fs_mode_to_vtype(v7fs_mode_t mode);
int
@@ -185,7 +185,7 @@
mp-mnt_op-vfs_name, mp, l);
}
-static bool
+static int
is_v7fs_partition(struct vnode *devvp)
{
struct partinfo dpart;
@@ -193,12 +193,12 @@
if ((error = VOP_IOCTL(devvp, DIOCGPART, dpart, FREAD, NOCRED)) != 0) {
DPRINTF(VOP_IOCTL=%d\n, error);
- return false;
+ return error;
}
DPRINTF(fstype=%d dtype=%d bsize=%d\n, dpart.part-p_fstype,
dpart.disklab-d_type, dpart.disklab-d_secsize);
- return dpart.part-p_fstype == FS_V7;
+ return (dpart.part-p_fstype == FS_V7) ? 0 : EINVAL;
}
static int
@@ -224,8 +224,9 @@
}
/* Get partition information */
- if (!is_v7fs_partition(devvp))
+ if ((error = is_v7fs_partition(devvp))) {
goto close_exit;
+ }
return 0; /* lock held */
@@ -576,8 +577,8 @@
DPRINTF();
/* On mountroot, devvp (rootdev) is opened by vfs_mountroot */
- if (!is_v7fs_partition (rootvp))
- return EINVAL;
+ if ((error = is_v7fs_partition (rootvp)))
+ return error;
if ((error = vfs_rootmountalloc(MOUNT_V7FS, root_device, mp))) {
DPRINTF(mountalloc error=%d\n, error);
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src
Committed By: mrg
Date: Sat Jul 2 02:38:31 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: t-netbsd
Log Message:
revert previous; we need this.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.3 src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.4
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.3 Fri Jul 1 04:05:22 2011
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd Sat Jul 2 02:38:31 2011
@@ -20,6 +20,28 @@
LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/tramp.asm
+LIB2FUNCS_STATIC_EXTRA = crtsavfpr.S crtresfpr.S \
+ crtsavgpr.S crtresgpr.S \
+ crtresxfpr.S crtresxgpr.S
+
+crtsavfpr.S: $(srcdir)/config/rs6000/crtsavfpr.asm
+ cat $(srcdir)/config/rs6000/crtsavfpr.asm crtsavfpr.S
+
+crtresfpr.S: $(srcdir)/config/rs6000/crtresfpr.asm
+ cat $(srcdir)/config/rs6000/crtresfpr.asm crtresfpr.S
+
+crtsavgpr.S: $(srcdir)/config/rs6000/crtsavgpr.asm
+ cat $(srcdir)/config/rs6000/crtsavgpr.asm crtsavgpr.S
+
+crtresgpr.S: $(srcdir)/config/rs6000/crtresgpr.asm
+ cat $(srcdir)/config/rs6000/crtresgpr.asm crtresgpr.S
+
+crtresxfpr.S: $(srcdir)/config/rs6000/crtresxfpr.asm
+ cat $(srcdir)/config/rs6000/crtresxfpr.asm crtresxfpr.S
+
+crtresxgpr.S: $(srcdir)/config/rs6000/crtresxgpr.asm
+ cat $(srcdir)/config/rs6000/crtresxgpr.asm crtresxgpr.S
+
# It is important that crtbegin.o, etc., aren't surprised by stuff in .sdata.
CRTSTUFF_T_CFLAGS += -msdata=none
CRTSTUFF_T_CFLAGS_S += -msdata=none
@@ -42,6 +64,24 @@
MULTILIB_MATCHES = ${MULTILIB_MATCHES_FLOAT}
LIBGCC = stmp-multilib
+
+$(T)crtsavfpr$(objext): crtsavfpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtsavfpr.S -o $(T)crtsavfpr$(objext)
+
+$(T)crtresfpr$(objext): crtresfpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresfpr.S -o $(T)crtresfpr$(objext)
+
+$(T)crtsavgpr$(objext): crtsavgpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtsavgpr.S -o $(T)crtsavgpr$(objext)
+
+$(T)crtresgpr$(objext): crtresgpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresgpr.S -o $(T)crtresgpr$(objext)
+
+$(T)crtresxfpr$(objext): crtresxfpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresxfpr.S -o $(T)crtresxfpr$(objext)
+
+$(T)crtresxgpr$(objext): crtresxgpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresxgpr.S -o $(T)crtresxgpr$(objext)
INSTALL_LIBGCC = install-multilib
EXTRA_MULTILIB_PARTS = crtbegin$(objext) crtend$(objext) \
crtbeginS$(objext) crtendS$(objext) crtbeginT$(objext)
CVS commit: src/sys/lib/libkern/arch/powerpc
Module Name:src
Committed By: matt
Date: Sat Jul 2 03:35:04 UTC 2011
Modified Files:
src/sys/lib/libkern/arch/powerpc: Makefile.inc
Added Files:
src/sys/lib/libkern/arch/powerpc: gprsavrest.S
Log Message:
Add the _restgpr* and _savegpr* entries that GCC 4.5 wants. This file is
designed to support the other GCC 4.5 variants that may be required.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libkern/arch/powerpc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/lib/libkern/arch/powerpc/gprsavrest.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/arch/powerpc/Makefile.inc
diff -u src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.30 src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.31
--- src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.30 Mon Jan 17 08:23:57 2011
+++ src/sys/lib/libkern/arch/powerpc/Makefile.inc Sat Jul 2 03:35:03 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.30 2011/01/17 08:23:57 matt Exp $
+# $NetBSD: Makefile.inc,v 1.31 2011/07/02 03:35:03 matt Exp $
SRCS+= bswap16.c bswap32.c
SRCS+= htonl.c htons.c ntohl.c ntohs.c
SRCS+= syncicache.c
SRCS+= ffs.S memset.S strlen.S
+SRCS+= gprsavrest.S
# Disable the asm versions on evbppc because they break the Explora
.if ${MACHINE} == evbppc
Added files:
Index: src/sys/lib/libkern/arch/powerpc/gprsavrest.S
diff -u /dev/null src/sys/lib/libkern/arch/powerpc/gprsavrest.S:1.1
--- /dev/null Sat Jul 2 03:35:04 2011
+++ src/sys/lib/libkern/arch/powerpc/gprsavrest.S Sat Jul 2 03:35:03 2011
@@ -0,0 +1,127 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include powerpc/asm.h
+
+__RCSID($NetBSD: gprsavrest.S,v 1.1 2011/07/02 03:35:03 matt Exp $)
+
+#ifndef RESTGPR
+#define RESTGPR(n) RESTOREXGPR(_restgpr_,n,_x)
+#define RESTGPR_END(n) RESTOREXGPR_END(_restgpr,n,_x)
+#define SAVEGPR(n) SAVEXGPR(_savegpr_,n,)
+#define SAVEGPR_END(n) SAVEXGPR_END(_savegpr,n,)
+#endif
+
+#define RESTOREXGPR(a,n,b) \
+ .hidden a##n##b; ENTRY_NOPROFILE(a##n##b); lwz n,(-4*(32-n))(11)
+#define RESTOREXGPR_END(a,n,b) \
+ .size a##n##b,.-a##n##b
+#define SAVEXGPR(a,n,b) \
+ .hidden a##n##b; ENTRY_NOPROFILE(a##n##b); stw n,(-4*(32-n))(11)
+#define SAVEXGPR_END(a,n,b) \
+ .size a##n##b,.-a##n##b
+
+ RESTGPR(14)
+ RESTGPR(15)
+ RESTGPR(16)
+ RESTGPR(17)
+ RESTGPR(18)
+ RESTGPR(19)
+ RESTGPR(20)
+ RESTGPR(21)
+ RESTGPR(22)
+ RESTGPR(23)
+ RESTGPR(24)
+ RESTGPR(25)
+ RESTGPR(26)
+ RESTGPR(27)
+ RESTGPR(28)
+ RESTGPR(29)
+ RESTGPR(30)
+ lwz 0,4(11)
+ RESTGPR(31)
+ mtlr 0
+ mr 1,11
+ blr
+ RESTGPR_END(14)
+ RESTGPR_END(15)
+ RESTGPR_END(16)
+ RESTGPR_END(17)
+ RESTGPR_END(18)
+ RESTGPR_END(19)
+ RESTGPR_END(20)
+ RESTGPR_END(21)
+ RESTGPR_END(22)
+ RESTGPR_END(23)
+ RESTGPR_END(24)
+ RESTGPR_END(25)
+ RESTGPR_END(26)
+ RESTGPR_END(27)
+ RESTGPR_END(28)
+ RESTGPR_END(29)
+ RESTGPR_END(30)
+ RESTGPR_END(31)
+
+ SAVEGPR(14)
+ SAVEGPR(15)
+ SAVEGPR(16)
+ SAVEGPR(17)
+ SAVEGPR(18)
+ SAVEGPR(19)
+ SAVEGPR(20)
+ SAVEGPR(21)
+ SAVEGPR(22)
+ SAVEGPR(23)
+ SAVEGPR(24)
+ SAVEGPR(25)
+ SAVEGPR(26)
+ SAVEGPR(27)
+ SAVEGPR(28)
+ SAVEGPR(29)
+ SAVEGPR(30)
+ SAVEGPR(31)
+ blr
+ SAVEGPR_END(14)
+ SAVEGPR_END(15)
+ SAVEGPR_END(16)
+ SAVEGPR_END(17)
+ SAVEGPR_END(18)
+ SAVEGPR_END(19)
+ SAVEGPR_END(20)
+ SAVEGPR_END(21)
+ SAVEGPR_END(22)
+ SAVEGPR_END(23)
+ SAVEGPR_END(24)
+ SAVEGPR_END(25)
+ SAVEGPR_END(26)
+ SAVEGPR_END(27)
+ SAVEGPR_END(28)
+ SAVEGPR_END(29)
