svn commit: r199599 - projects/mips/sys/mips/include

[Warner Losh]

Author: imp
Date: Fri Nov 20 16:32:26 2009
New Revision: 199599
URL: http://svn.freebsd.org/changeset/base/199599

Log:
  Another kludge for 64-bit bus_addr_t with 32-bit pointers...

Modified:
  projects/mips/sys/mips/include/_bus.h

Modified: projects/mips/sys/mips/include/_bus.h
==============================================================================
--- projects/mips/sys/mips/include/_bus.h	Fri Nov 20 16:30:35 2009	(r199598)
+++ projects/mips/sys/mips/include/_bus.h	Fri Nov 20 16:32:26 2009	(r199599)
@@ -34,12 +34,17 @@
 /*
  * Bus address and size types
  */
+#include "opt_cputype.h" 
+#if !(defined(TARGET_OCTEON) || defined(ISA_MIPS32))
 typedef uintptr_t bus_addr_t;
+#else
+typedef uint64_t bus_addr_t;
+#endif
 typedef uintptr_t bus_size_t;
 
 /*
  * Access methods for bus resources and address space.
  */
 typedef struct bus_space *bus_space_tag_t;
-typedef u_long bus_space_handle_t;
+typedef bus_addr_t bus_space_handle_t;
 #endif /* MIPS_INCLUDE__BUS_H */