summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c4
-rw-r--r--linux/drivers/media/video/s2255drv.c3
-rw-r--r--linux/drivers/media/video/usbvision/usbvision-video.c3
-rw-r--r--linux/drivers/media/video/uvc/uvc_v4l2.c4
-rw-r--r--v4l2-apps/util/Makefile10
-rw-r--r--v4l2-apps/util/v4l2_sysfs_path.c191
6 files changed, 206 insertions, 9 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 58a16fe8f..50c3af538 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -1360,7 +1360,7 @@ static int vidioc_querycap(struct file *file, void *priv,
strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));
- strlcpy(cap->bus_info, dev_name(&dev->udev->dev), sizeof(cap->bus_info));
+ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
cap->version = EM28XX_VERSION_CODE;
@@ -1548,7 +1548,7 @@ static int radio_querycap(struct file *file, void *priv,
strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));
- strlcpy(cap->bus_info, dev_name(&dev->udev->dev), sizeof(cap->bus_info));
+ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
cap->version = EM28XX_VERSION_CODE;
cap->capabilities = V4L2_CAP_TUNER;
diff --git a/linux/drivers/media/video/s2255drv.c b/linux/drivers/media/video/s2255drv.c
index ffa2928b2..edfac2f9e 100644
--- a/linux/drivers/media/video/s2255drv.c
+++ b/linux/drivers/media/video/s2255drv.c
@@ -847,8 +847,7 @@ static int vidioc_querycap(struct file *file, void *priv,
struct s2255_dev *dev = fh->dev;
strlcpy(cap->driver, "s2255", sizeof(cap->driver));
strlcpy(cap->card, "s2255", sizeof(cap->card));
- strlcpy(cap->bus_info, dev_name(&dev->udev->dev),
- sizeof(cap->bus_info));
+ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
cap->version = S2255_VERSION;
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
return 0;
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c
index 47d672da5..334c77d91 100644
--- a/linux/drivers/media/video/usbvision/usbvision-video.c
+++ b/linux/drivers/media/video/usbvision/usbvision-video.c
@@ -526,8 +526,7 @@ static int vidioc_querycap (struct file *file, void *priv,
strlcpy(vc->card,
usbvision_device_data[usbvision->DevModel].ModelString,
sizeof(vc->card));
- strlcpy(vc->bus_info, dev_name(&usbvision->dev->dev),
- sizeof(vc->bus_info));
+ usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info));
vc->version = USBVISION_DRIVER_VERSION;
vc->capabilities = V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_AUDIO |
diff --git a/linux/drivers/media/video/uvc/uvc_v4l2.c b/linux/drivers/media/video/uvc/uvc_v4l2.c
index 9130349f4..0baa59f61 100644
--- a/linux/drivers/media/video/uvc/uvc_v4l2.c
+++ b/linux/drivers/media/video/uvc/uvc_v4l2.c
@@ -494,8 +494,8 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
memset(cap, 0, sizeof *cap);
strlcpy(cap->driver, "uvcvideo", sizeof cap->driver);
strlcpy(cap->card, vdev->name, sizeof cap->card);
- strlcpy(cap->bus_info, video->dev->udev->bus->bus_name,
- sizeof cap->bus_info);
+ usb_make_path(video->dev->udev,
+ cap->bus_info, sizeof(cap->bus_info));
cap->version = DRIVER_VERSION_NUMBER;
if (video->streaming->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
diff --git a/v4l2-apps/util/Makefile b/v4l2-apps/util/Makefile
index b80de190b..f2c4c0a38 100644
--- a/v4l2-apps/util/Makefile
+++ b/v4l2-apps/util/Makefile
@@ -7,7 +7,7 @@ endif
CPPFLAGS += -I../include -D_GNU_SOURCE
LDFLAGS += -lm
-binaries = v4l2-ctl v4l2-dbg v4l2-compliance ivtv-ctl cx18-ctl
+binaries = v4l2-ctl v4l2-dbg v4l2-compliance ivtv-ctl cx18-ctl v4l2_sysfs_path
ifeq ($(prefix),)
prefix = /usr
@@ -34,6 +34,14 @@ v4l2-dbg: v4l2-dbg.o v4l2-chipids.o
v4l2-dbg.o: v4l2-dbg.h v4l2-dbg-bttv.h v4l2-dbg-em28xx.h v4l2-dbg-saa7134.h
+v4l2_sysfs_path.o: v4l2_sysfs_path.c ../lib/v4l2_driver.h
+
+v4l2_sysfs_path: v4l2_sysfs_path.o ../lib/libv4l2.a
+ $(CC) $^ -o $@ -lsysfs
+
+../lib/libv4l2.a:
+ $(MAKE) -C ../lib libv4l2.a
+
install:
mkdir -p $(prefix)/bin
cp $(binaries) $(prefix)/bin
diff --git a/v4l2-apps/util/v4l2_sysfs_path.c b/v4l2-apps/util/v4l2_sysfs_path.c
new file mode 100644
index 000000000..2fe89b6c7
--- /dev/null
+++ b/v4l2-apps/util/v4l2_sysfs_path.c
@@ -0,0 +1,191 @@
+/*
+ Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@redhat.com>
+ 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 version 2 of the License.
+
+ The sysfs logic were adapted from a C++/Boost snippet code sent by
+
+ 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "../lib/v4l2_driver.h"
+#include <sysfs/libsysfs.h>
+#include <errno.h>
+#include <malloc.h>
+#include <stdio.h>
+#include <string.h>
+#include <dirent.h>
+
+#define USB_ID "usb-"
+#define PCI_ID "PCI:"
+#define PCIe_ID "PCIe:"
+
+char *obtain_bus_sysfs_path(char *bus_info)
+{
+ struct sysfs_device *pcictl = NULL;
+ struct sysfs_bus *bus = NULL;
+ struct sysfs_device *busdev = NULL;
+ struct dlist *busdevs = NULL;
+ struct sysfs_device *pdev = NULL;
+ char *tmp = NULL, *busname, *buspath;
+ int pci;
+
+ if (!strncmp(bus_info, USB_ID, strlen(USB_ID))) {
+ bus_info += strlen(USB_ID);
+ pci = 0;
+ } else if (!strncmp(bus_info, PCI_ID, strlen(PCI_ID))) {
+ bus_info += strlen(PCI_ID);
+ pci = 1;
+ } else if (!strncmp(bus_info, PCIe_ID, strlen(PCIe_ID))) {
+ bus_info += strlen(PCIe_ID);
+ pci = 1;
+ } else
+ return NULL;
+
+ busname = strtok(bus_info, "-");
+ if (!busname)
+ return NULL;
+
+ buspath = strtok(NULL, "-");
+ if (!buspath && !pci)
+ return NULL;
+
+ /* open bus host controller */
+ pcictl = sysfs_open_device("pci", busname);
+ if (!pcictl)
+ goto err;
+
+ /* We have all we need for PCI devices */
+ if (pci) {
+ char *name;
+
+ asprintf(&name, "%s", pcictl->path);
+ return name;
+ }
+
+ /* find matching usb bus */
+ bus = sysfs_open_bus("usb");
+ if (!bus)
+ goto err;
+
+ busdevs = sysfs_get_bus_devices(bus);
+ if (!busdevs)
+ goto err;
+
+ dlist_for_each_data(busdevs, busdev, struct sysfs_device) {
+ /* compare pathes of bus host controller and
+ parent of enumerated bus devices */
+
+ pdev = sysfs_get_device_parent(busdev);
+ if (!pdev)
+ continue;
+
+ if (!strcmp(pcictl->path, pdev->path))
+ break;
+ }
+
+ if (!pdev)
+ goto err;
+
+ sysfs_close_device(pcictl);
+ pcictl = NULL;
+
+ /* assemble bus device path */
+ if (busdev) {
+ struct sysfs_attribute *busnumattr;
+ unsigned int busnum;
+ char *name;
+
+ busnumattr = sysfs_get_device_attr(busdev, "busnum");
+ if (!busnumattr)
+ goto err;
+
+ tmp = malloc(busnumattr->len + 1);
+ strncpy(tmp, busnumattr->value, busnumattr->len);
+ tmp[busnumattr->len] = '\0';
+
+ if (sscanf(tmp, "%u", &busnum) != 1)
+ goto err;
+
+ asprintf(&name, "%s/%d-%s", busdev->path,
+ busnum, buspath);
+
+ free(tmp);
+ sysfs_close_bus(bus);
+
+ return name;
+ }
+
+err:
+ if (tmp)
+ free(tmp);
+ if (bus)
+ sysfs_close_bus(bus);
+ if (pcictl)
+ sysfs_close_device(pcictl);
+
+ return NULL;
+}
+
+void get_sysfs(char *fname)
+{
+ struct v4l2_driver drv;
+ char *path;
+ if (v4l2_open(fname, 0, &drv) < 0) {
+ perror(fname);
+ return;
+ }
+
+ printf("device = %s\n", fname);
+ printf("bus info = %s\n", drv.cap.bus_info);
+ path = obtain_bus_sysfs_path((char *)drv.cap.bus_info);
+ if (path) {
+ printf("sysfs path = %s\n\n", path);
+ free(path);
+ }
+
+ v4l2_close(&drv);
+}
+
+void read_dir(char *dirname)
+{
+ DIR *dir;
+ struct dirent *entry;
+ const char *vid = "video";
+ const char *rad = "radio";
+ char *p, name[512];
+
+ dir = opendir(dirname);
+ if (!dir)
+ return;
+
+ strcpy(name, dirname);
+ strcat(name, "/");
+ p = name + strlen(name);
+
+ entry = readdir(dir);
+ while (entry) {
+ if (!strncmp(entry->d_name, vid, strlen(vid)) ||
+ !strncmp(entry->d_name, rad, strlen(rad))) {
+ strcpy(p, entry->d_name);
+
+ get_sysfs(name);
+ }
+ entry = readdir(dir);
+ }
+ closedir(dir);
+}
+
+int main(void)
+{
+ read_dir("/dev");
+ return 0;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 19:29:19 +0000