aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Noland2009-11-25 15:09:24 -0600
committerRobert Noland2009-11-25 15:09:24 -0600
commit6f66de982ad6ee6967ec61a7399e600bdd9e5887 (patch)
tree1290fde13cf642b2d988c513cb8f3d15f395f72a
parent9558f6377ffee680d6bec0808bc113b3139b0d5f (diff)
downloadexternal-libdrm-6f66de982ad6ee6967ec61a7399e600bdd9e5887.tar.gz
external-libdrm-6f66de982ad6ee6967ec61a7399e600bdd9e5887.tar.xz
external-libdrm-6f66de982ad6ee6967ec61a7399e600bdd9e5887.zip
Correctly set DRM_MAX_MINOR for all platforms.
DRM_MAJOR is platform specific, but not used outside of xf86drm.c that I can find.
-rw-r--r--xf86drm.c4
-rw-r--r--xf86drm.h6
2 files changed, 4 insertions, 6 deletions
diff --git a/xf86drm.c b/xf86drm.c
index 364fe17d..06d645dd 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -75,10 +75,6 @@
75#define DRM_MAJOR 226 /* Linux */ 75#define DRM_MAJOR 226 /* Linux */
76#endif 76#endif
77 77
78#ifndef DRM_MAX_MINOR
79#define DRM_MAX_MINOR 16
80#endif
81
82/* 78/*
83 * This definition needs to be changed on some systems if dev_t is a structure. 79 * This definition needs to be changed on some systems if dev_t is a structure.
84 * If there is a header file we can get it from, there would be best. 80 * If there is a header file we can get it from, there would be best.
diff --git a/xf86drm.h b/xf86drm.h
index 9944d32f..496d95d8 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -39,6 +39,10 @@
39#include <stdint.h> 39#include <stdint.h>
40#include <drm.h> 40#include <drm.h>
41 41
42#ifndef DRM_MAX_MINOR
43#define DRM_MAX_MINOR 16
44#endif
45
42#if defined(__linux__) 46#if defined(__linux__)
43 47
44#define DRM_IOCTL_NR(n) _IOC_NR(n) 48#define DRM_IOCTL_NR(n) _IOC_NR(n)
@@ -47,8 +51,6 @@
47#define DRM_IOC_WRITE _IOC_WRITE 51#define DRM_IOC_WRITE _IOC_WRITE
48#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE 52#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
49#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) 53#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
50#define DRM_MAJOR 226
51#define DRM_MAX_MINOR 15
52 54
53#else /* One of the *BSDs */ 55#else /* One of the *BSDs */
54 56