From c5a9680ee7cddac4b7a7d05447209dcd5a4cfce3 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 16 Jun 2009 18:41:05 +0200 Subject: [PATCH] v4l_id: move from udev-extras --- configure.ac | 1 + extras/Makefile.am | 3 +- extras/gudev/docs/.gitignore | 2 +- extras/v4l_id/.gitignore | 1 + .../v4l_id/70-v4l.rules | 3 + extras/v4l_id/Makefile.am | 9 ++ extras/v4l_id/v4l_id.c | 101 ++++++++++++++++++ rules/Makefile.am | 1 - 8 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 extras/v4l_id/.gitignore rename rules/rules.d/60-persistent-v4l.rules => extras/v4l_id/70-v4l.rules (90%) create mode 100644 extras/v4l_id/Makefile.am create mode 100644 extras/v4l_id/v4l_id.c diff --git a/configure.ac b/configure.ac index b4d00e842..960a552e8 100644 --- a/configure.ac +++ b/configure.ac @@ -106,6 +106,7 @@ AC_CONFIG_FILES([ extras/rule_generator/Makefile extras/scsi_id/Makefile extras/usb_id/Makefile + extras/v4l_id/Makefile extras/udev-acl/Makefile extras/gudev/Makefile extras/gudev/gudev-1.0.pc diff --git a/extras/Makefile.am b/extras/Makefile.am index 629b70e38..9528e8afa 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -11,7 +11,8 @@ SUBDIRS = \ fstab_import \ rule_generator \ scsi_id \ - usb_id + usb_id \ + v4l_id if ENABLE_EXTRAS SUBDIRS += \ diff --git a/extras/gudev/docs/.gitignore b/extras/gudev/docs/.gitignore index a471783ca..1ac5f7f30 100644 --- a/extras/gudev/docs/.gitignore +++ b/extras/gudev/docs/.gitignore @@ -3,12 +3,12 @@ gudev-decl.txt gudev-overrides.txt gudev-undeclared.txt gudev-undocumented.txt +gudev-unused.txt gudev.args gudev.hierarchy gudev.interfaces gudev.prerequisites gudev.signals -gudev.unused html.stamp html/* xml/* diff --git a/extras/v4l_id/.gitignore b/extras/v4l_id/.gitignore new file mode 100644 index 000000000..dffced9f0 --- /dev/null +++ b/extras/v4l_id/.gitignore @@ -0,0 +1 @@ +v4l_id diff --git a/rules/rules.d/60-persistent-v4l.rules b/extras/v4l_id/70-v4l.rules similarity index 90% rename from rules/rules.d/60-persistent-v4l.rules rename to extras/v4l_id/70-v4l.rules index 8415cd059..a342a7194 100644 --- a/rules/rules.d/60-persistent-v4l.rules +++ b/extras/v4l_id/70-v4l.rules @@ -2,6 +2,9 @@ ACTION!="add|change", GOTO="persistent_v4l_end" SUBSYSTEM!="video4linux", GOTO="persistent_v4l_end" +ENV{MAJOR}=="", GOTO="persistent_v4l_end" + +IMPORT{program}="v4l_id $tempnode" SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" KERNEL=="video*", ENV{ID_SERIAL}=="?*", SYMLINK+="v4l/by-id/$env{ID_BUS}-$env{ID_SERIAL}-video-index$attr{index}" diff --git a/extras/v4l_id/Makefile.am b/extras/v4l_id/Makefile.am new file mode 100644 index 000000000..6ff9fcd63 --- /dev/null +++ b/extras/v4l_id/Makefile.am @@ -0,0 +1,9 @@ +include $(top_srcdir)/Makefile.am.inc + +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = v4l_id + +udevrulesdir = $(udev_prefix)/lib/udev/rules.d +dist_udevrules_DATA = 70-v4l.rules + +v4l_id_SOURCES = v4l_id.c diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c new file mode 100644 index 000000000..59b4f2f73 --- /dev/null +++ b/extras/v4l_id/v4l_id.c @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2009 Kay Sievers + * Copyright (c) 2009 Filippo Argiolas + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details: + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int main (int argc, char *argv[]) +{ + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + {} + }; + int fd; + char *device; + struct video_capability v1cap; + struct v4l2_capability v2cap; + + while (1) { + int option; + + option = getopt_long(argc, argv, "h", options, NULL); + if (option == -1) + break; + + switch (option) { + case 'h': + printf("Usage: v4l_id [--help] \n\n"); + default: + return 1; + } + } + device = argv[optind]; + + if (device == NULL) + return 2; + fd = open (device, O_RDONLY); + if (fd < 0) + return 3; + + if (ioctl (fd, VIDIOC_QUERYCAP, &v2cap) == 0) { + printf("ID_V4L_VERSION=2\n"); + printf("ID_V4L_PRODUCT=%s\n", v2cap.card); + printf("ID_V4L_CAPABILITIES=:"); + if ((v2cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0) + printf("capture:"); + if ((v2cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) > 0) + printf("video_output:"); + if ((v2cap.capabilities & V4L2_CAP_VIDEO_OVERLAY) > 0) + printf("video_overlay:"); + if ((v2cap.capabilities & V4L2_CAP_AUDIO) > 0) + printf("audio:"); + if ((v2cap.capabilities & V4L2_CAP_TUNER) > 0) + printf("tuner:"); + 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); + return 0; +} diff --git a/rules/Makefile.am b/rules/Makefile.am index 7f3cd5982..6f1744fdb 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -7,7 +7,6 @@ dist_udevrules_DATA = \ rules.d/60-persistent-storage-tape.rules \ rules.d/60-persistent-serial.rules \ rules.d/60-persistent-input.rules \ - rules.d/60-persistent-v4l.rules \ rules.d/80-drivers.rules \ rules.d/95-udev-late.rules -- 2.30.2