Module Name: src
Committed By: he
Date: Sat Aug 20 06:00:15 UTC 2011
Modified Files:
src/sys/sys: bus.h
Log Message:
Put back bus_space_handle_is_equal() and bus_space_is_equal() in
the non-__HAVE_NEW_STYLE_BUS_H case, since bus_proto.h isn't and
can't be included in that case. Restores buildable state for
ports which don't (yet) define __HAVE_NEW_STYLE_BUS_H. Also add
comments to preprocessing directives spaced far apart.
OK'ed by dyoung@
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/bus.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/sys/bus.h
diff -u src/sys/sys/bus.h:1.7 src/sys/sys/bus.h:1.8
--- src/sys/sys/bus.h:1.7 Wed Aug 17 14:52:09 2011
+++ src/sys/sys/bus.h Sat Aug 20 06:00:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.7 2011/08/17 14:52:09 dyoung Exp $ */
+/* $NetBSD: bus.h,v 1.8 2011/08/20 06:00:14 he Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -159,8 +159,15 @@
#include <sys/bus_proto.h>
#include <machine/bus_funcs.h>
-#else
+
+#else /* !__HAVE_NEW_STYLE_BUS_H */
+
#include <machine/bus.h>
-#endif
+
+bool bus_space_is_equal(bus_space_tag_t, bus_space_tag_t);
+bool bus_space_handle_is_equal(bus_space_tag_t, bus_space_handle_t,
+ bus_space_handle_t);
+
+#endif /* __HAVE_NEW_STYLE_BUS_H */
#endif /* _SYS_BUS_H_ */
