From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 15 Feb 2011 16:24:32 +0000 (+0100)
Subject: v4l_id: kill the v4l1 ioctl
X-Git-Tag: 174~254
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ace8a43ac2cbbd4d6f5c29fc461c3caa8f8545b;p=systemd

v4l_id: kill the v4l1 ioctl

Recent kernels do not have v4l1 anymore.
---

diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c
index d530a6d3..f3fc648b 100644
--- a/extras/v4l_id/v4l_id.c
+++ b/extras/v4l_id/v4l_id.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <linux/videodev.h>
 #include <linux/videodev2.h>
 
 int main (int argc, char *argv[])
@@ -82,19 +81,6 @@ int main (int argc, char *argv[])
 		if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
 			printf("radio:");
 		printf("\n");
-	} else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
-		printf("ID_V4L_VERSION=1\n");
-		printf("ID_V4L_PRODUCT=%s\n", v1cap.name);
-		printf("ID_V4L_CAPABILITIES=:");
-		if ((v1cap.type & VID_TYPE_CAPTURE) > 0)
-			printf("capture:");
-		if ((v1cap.type & VID_TYPE_OVERLAY) > 0)
-			printf("video_overlay:");
-		if (v1cap.audios > 0)
-			printf("audio:");
-		if ((v1cap.type & VID_TYPE_TUNER) > 0)
-			printf("tuner:");
-		printf("\n");
 	}
 
 	close (fd);