Support for building DRM module on OpenBSD (Wilbern Cobb, Matthieu Herrb).

    (resync with XFree86 trunk)

diff --git a/bsd/drm.h b/bsd/drm.h
index abe2ac3..df2fa24 100644 (file)
--- a/bsd/drm.h
+++ b/bsd/drm.h
@@ -45,7 +45,7 @@
 #define DRM_IOC_WRITE          _IOC_WRITE
 #define DRM_IOC_READWRITE      _IOC_READ|_IOC_WRITE
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #if defined(__FreeBSD__) && defined(XFree86Server)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl

diff --git a/linux/drm.h b/linux/drm.h
index d1d6694..f987c42 100644 (file)
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -44,7 +44,7 @@
 #define DRM_IOC_WRITE          _IOC_WRITE
 #define DRM_IOC_READWRITE      _IOC_READ|_IOC_WRITE
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #if defined(__FreeBSD__) && defined(XFree86Server)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
@@ -79,7 +79,11 @@
 #endif
 
 #if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
+#ifdef __OpenBSD__
+#define DRM_MAJOR       81
+#else
 #define DRM_MAJOR       226
+#endif
 #define DRM_MAX_MINOR   15
 #endif
 #define DRM_NAME       "drm"     /* Name in kernel, /dev, and /proc        */

diff --git a/shared-core/drm.h b/shared-core/drm.h
index d1d6694..f987c42 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -44,7 +44,7 @@
 #define DRM_IOC_WRITE          _IOC_WRITE
 #define DRM_IOC_READWRITE      _IOC_READ|_IOC_WRITE
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #if defined(__FreeBSD__) && defined(XFree86Server)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
@@ -79,7 +79,11 @@
 #endif
 
 #if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
+#ifdef __OpenBSD__
+#define DRM_MAJOR       81
+#else
 #define DRM_MAJOR       226
+#endif
 #define DRM_MAX_MINOR   15
 #endif
 #define DRM_NAME       "drm"     /* Name in kernel, /dev, and /proc        */

diff --git a/shared/drm.h b/shared/drm.h
index d1d6694..f987c42 100644 (file)
--- a/shared/drm.h
+++ b/shared/drm.h
@@ -44,7 +44,7 @@
 #define DRM_IOC_WRITE          _IOC_WRITE
 #define DRM_IOC_READWRITE      _IOC_READ|_IOC_WRITE
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #if defined(__FreeBSD__) && defined(XFree86Server)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
@@ -79,7 +79,11 @@
 #endif
 
 #if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
+#ifdef __OpenBSD__
+#define DRM_MAJOR       81
+#else
 #define DRM_MAJOR       226
+#endif
 #define DRM_MAX_MINOR   15
 #endif
 #define DRM_NAME       "drm"     /* Name in kernel, /dev, and /proc        */