Module Name: src
Committed By: dyoung
Date: Sun Jul 17 23:46:50 UTC 2011
Modified Files:
src/sys/arch/arm/include: types.h
src/sys/arch/cats/include: Makefile types.h
src/sys/arch/evbarm/include: Makefile types.h
src/sys/arch/iyonix/include: Makefile types.h
src/sys/arch/netwinder/include: types.h
Removed Files:
src/sys/arch/arm/include: bus.h
src/sys/arch/cats/include: bus.h
src/sys/arch/evbarm/include: bus.h
src/sys/arch/iyonix/include: bus.h
src/sys/arch/netwinder/include: bus.h
Log Message:
On ARM-ish ports having PCI support, use new-style <sys/bus.h>. Do not
install <machine/bus.h>. Remove various <machine/bus.h> sources.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r0 src/sys/arch/arm/include/bus.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/include/types.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cats/include/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/cats/include/bus.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cats/include/types.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/include/bus.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/include/types.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/iyonix/include/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/arch/iyonix/include/bus.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/iyonix/include/types.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/netwinder/include/bus.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/netwinder/include/types.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/types.h
diff -u src/sys/arch/arm/include/types.h:1.19 src/sys/arch/arm/include/types.h:1.20
--- src/sys/arch/arm/include/types.h:1.19 Thu Apr 7 10:20:29 2011
+++ src/sys/arch/arm/include/types.h Sun Jul 17 23:46:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.19 2011/04/07 10:20:29 matt Exp $ */
+/* $NetBSD: types.h,v 1.20 2011/07/17 23:46:49 dyoung Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -82,6 +82,7 @@
#define __SIMPLELOCK_UNLOCKED 0
#define __HAVE_SYSCALL_INTERN
+#define __HAVE_NEW_STYLE_BUS_H
#define __HAVE_MINIMAL_EMUL
#define __HAVE_CPU_DATA_FIRST
#define __HAVE___LWP_GETPRIVATE_FAST
Index: src/sys/arch/cats/include/Makefile
diff -u src/sys/arch/cats/include/Makefile:1.23 src/sys/arch/cats/include/Makefile:1.24
--- src/sys/arch/cats/include/Makefile:1.23 Sun Jul 17 20:54:38 2011
+++ src/sys/arch/cats/include/Makefile Sun Jul 17 23:46:49 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2011/07/17 20:54:38 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2011/07/17 23:46:49 dyoung Exp $
INCSDIR= /usr/include/cats
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/cats/include/types.h
diff -u src/sys/arch/cats/include/types.h:1.11 src/sys/arch/cats/include/types.h:1.12
--- src/sys/arch/cats/include/types.h:1.11 Sun Jan 20 18:09:05 2008
+++ src/sys/arch/cats/include/types.h Sun Jul 17 23:46:49 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: types.h,v 1.11 2008/01/20 18:09:05 joerg Exp $ */
+/* $NetBSD: types.h,v 1.12 2011/07/17 23:46:49 dyoung Exp $ */
#ifndef _ARM32_TYPES_H_
#define _ARM32_TYPES_H_
#include <arm/arm32/types.h>
-#define __HAVE_DEVICE_REGISTER
+#define __HAVE_NEW_STYLE_BUS_H
#endif
Index: src/sys/arch/evbarm/include/Makefile
diff -u src/sys/arch/evbarm/include/Makefile:1.16 src/sys/arch/evbarm/include/Makefile:1.17
--- src/sys/arch/evbarm/include/Makefile:1.16 Sun Jul 17 20:54:39 2011
+++ src/sys/arch/evbarm/include/Makefile Sun Jul 17 23:46:49 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2011/07/17 20:54:39 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2011/07/17 23:46:49 dyoung Exp $
INCSDIR= /usr/include/evbarm
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/evbarm/include/types.h
diff -u src/sys/arch/evbarm/include/types.h:1.10 src/sys/arch/evbarm/include/types.h:1.11
--- src/sys/arch/evbarm/include/types.h:1.10 Sun Jan 20 18:09:05 2008
+++ src/sys/arch/evbarm/include/types.h Sun Jul 17 23:46:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.10 2008/01/20 18:09:05 joerg Exp $ */
+/* $NetBSD: types.h,v 1.11 2011/07/17 23:46:49 dyoung Exp $ */
#ifndef _EVBARM_TYPES_H_
#define _EVBARM_TYPES_H_
@@ -7,6 +7,6 @@
#ifndef __OLD_INTERRUPT_CODE /* XXX */
#endif
-#define __HAVE_DEVICE_REGISTER
+#define __HAVE_NEW_STYLE_BUS_H
#endif
Index: src/sys/arch/iyonix/include/Makefile
diff -u src/sys/arch/iyonix/include/Makefile:1.6 src/sys/arch/iyonix/include/Makefile:1.7
--- src/sys/arch/iyonix/include/Makefile:1.6 Sun Jul 17 20:54:42 2011
+++ src/sys/arch/iyonix/include/Makefile Sun Jul 17 23:46:49 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2011/07/17 20:54:42 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/07/17 23:46:49 dyoung Exp $
INCSDIR= /usr/include/iyonix
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/iyonix/include/types.h
diff -u src/sys/arch/iyonix/include/types.h:1.8 src/sys/arch/iyonix/include/types.h:1.9
--- src/sys/arch/iyonix/include/types.h:1.8 Sun Jan 20 18:09:07 2008
+++ src/sys/arch/iyonix/include/types.h Sun Jul 17 23:46:49 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: types.h,v 1.8 2008/01/20 18:09:07 joerg Exp $ */
+/* $NetBSD: types.h,v 1.9 2011/07/17 23:46:49 dyoung Exp $ */
#ifndef _IYONIX_TYPES_H_
#define _IYONIX_TYPES_H_
#include <arm/arm32/types.h>
-#define __HAVE_DEVICE_REGISTER
+#define __HAVE_NEW_STYLE_BUS_H
#endif
Index: src/sys/arch/netwinder/include/types.h
diff -u src/sys/arch/netwinder/include/types.h:1.10 src/sys/arch/netwinder/include/types.h:1.11
--- src/sys/arch/netwinder/include/types.h:1.10 Sun Jan 20 18:09:08 2008
+++ src/sys/arch/netwinder/include/types.h Sun Jul 17 23:46:49 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: types.h,v 1.10 2008/01/20 18:09:08 joerg Exp $ */
+/* $NetBSD: types.h,v 1.11 2011/07/17 23:46:49 dyoung Exp $ */
#ifndef _ARM32_TYPES_H_
#define _ARM32_TYPES_H_
#include <arm/arm32/types.h>
-#define __HAVE_DEVICE_REGISTER
+#define __HAVE_NEW_STYLE_BUS_H
#endif
