[PATCH libdrm 1/9] tests/dristat: don't include C files

Emil Velikov emil.l.velikov at gmail.com
Sun Mar 22 15:03:37 PDT 2015


Remove the hack of including C files, by reworking the only requirement
drmOpenMinor() to an open(buf...). After all we do know the exact name
of the device we're going to open, so might as well use it. Replace
hard-coded 16 with DRM_MAX_MINOR while we're here.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 tests/dristat.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/dristat.c b/tests/dristat.c
index cca4b03..cc23e16 100644
--- a/tests/dristat.c
+++ b/tests/dristat.c
@@ -31,13 +31,14 @@
 # include <config.h>
 #endif
 
+#include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include "xf86drm.h"
-#include "xf86drmRandom.c"
-#include "xf86drmHash.c"
-#include "xf86drm.c"
 
 #define DRM_VERSION 0x00000001
 #define DRM_MEMORY  0x00000002
@@ -267,9 +268,9 @@ int main(int argc, char **argv)
 	    return 1;
 	}
 
-    for (i = 0; i < 16; i++) if (!minor || i == minor) {
+    for (i = 0; i < DRM_MAX_MINOR; i++) if (!minor || i == minor) {
 	sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, i);
-	fd = drmOpenMinor(i, 1, DRM_NODE_PRIMARY);
+	fd = open(buf, O_RDWR, 0);
 	if (fd >= 0) {
 	    printf("%s\n", buf);
 	    if (mask & DRM_BUSID)   getbusid(fd);
-- 
2.3.1



More information about the dri-devel mailing list