summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2003-03-08 05:05:41 +0000
committerEric Anholt <anholt@freebsd.org>2003-03-08 05:05:41 +0000
commit638d45d2a0f5101e0b10a4f2761f9e25d2872055 (patch)
treefc89ec8a45489bbb418959424bdd53661d0b8383
parentbf4b8ba753807eac22e7b14a5581c3c883d9473c (diff)
Make dma_addr_t an unsigned long not a uint32, don't try to use memrange
functions on FreeBSD non-x86, and remove a dead define.
-rw-r--r--bsd-core/drm_os_freebsd.h7
-rw-r--r--bsd-core/drm_os_netbsd.h1
-rw-r--r--bsd/drm_os_freebsd.h7
-rw-r--r--bsd/drm_os_netbsd.h1
4 files changed, 10 insertions, 6 deletions
diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index b458ed68..c9a39287 100644
--- a/bsd-core/drm_os_freebsd.h
+++ b/bsd-core/drm_os_freebsd.h
@@ -45,7 +45,11 @@
#define __REALLY_HAVE_AGP __HAVE_AGP
#endif
+#ifdef __i386__
#define __REALLY_HAVE_MTRR (__HAVE_MTRR)
+#else
+#define __REALLY_HAVE_MTRR 0
+#endif
#define __REALLY_HAVE_SG (__HAVE_SG)
#if __REALLY_HAVE_AGP
@@ -211,10 +215,9 @@ typedef struct drm_chipinfo
#define cpu_to_le32(x) (x) /* FIXME */
-typedef u_int32_t dma_addr_t;
+typedef unsigned long dma_addr_t;
typedef u_int32_t atomic_t;
typedef u_int32_t cycles_t;
-typedef u_int32_t spinlock_t;
typedef u_int32_t u32;
typedef u_int16_t u16;
typedef u_int8_t u8;
diff --git a/bsd-core/drm_os_netbsd.h b/bsd-core/drm_os_netbsd.h
index 30ca5e92..5551f172 100644
--- a/bsd-core/drm_os_netbsd.h
+++ b/bsd-core/drm_os_netbsd.h
@@ -183,7 +183,6 @@ typedef struct drm_chipinfo
typedef u_int32_t dma_addr_t;
typedef volatile long atomic_t;
typedef u_int32_t cycles_t;
-typedef u_int32_t spinlock_t;
typedef u_int32_t u32;
typedef u_int16_t u16;
typedef u_int8_t u8;
diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h
index b458ed68..c9a39287 100644
--- a/bsd/drm_os_freebsd.h
+++ b/bsd/drm_os_freebsd.h
@@ -45,7 +45,11 @@
#define __REALLY_HAVE_AGP __HAVE_AGP
#endif
+#ifdef __i386__
#define __REALLY_HAVE_MTRR (__HAVE_MTRR)
+#else
+#define __REALLY_HAVE_MTRR 0
+#endif
#define __REALLY_HAVE_SG (__HAVE_SG)
#if __REALLY_HAVE_AGP
@@ -211,10 +215,9 @@ typedef struct drm_chipinfo
#define cpu_to_le32(x) (x) /* FIXME */
-typedef u_int32_t dma_addr_t;
+typedef unsigned long dma_addr_t;
typedef u_int32_t atomic_t;
typedef u_int32_t cycles_t;
-typedef u_int32_t spinlock_t;
typedef u_int32_t u32;
typedef u_int16_t u16;
typedef u_int8_t u8;
diff --git a/bsd/drm_os_netbsd.h b/bsd/drm_os_netbsd.h
index 30ca5e92..5551f172 100644
--- a/bsd/drm_os_netbsd.h
+++ b/bsd/drm_os_netbsd.h
@@ -183,7 +183,6 @@ typedef struct drm_chipinfo
typedef u_int32_t dma_addr_t;
typedef volatile long atomic_t;
typedef u_int32_t cycles_t;
-typedef u_int32_t spinlock_t;
typedef u_int32_t u32;
typedef u_int16_t u16;
typedef u_int8_t u8;