[media] uvcvideo: Add debugfs support
Create a debugfs entry per UVC stream. This will be used to export stream statistics. Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> [mchehab@redhat.com: add incude <linux/module.h> to avoid compilation breakage] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
c4d99f89e2
commit
edbaa39842
|
@ -1,5 +1,5 @@
|
|||
uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
|
||||
uvc_status.o uvc_isight.o
|
||||
uvc_status.o uvc_isight.o uvc_debugfs.o
|
||||
ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
|
||||
uvcvideo-objs += uvc_entity.o
|
||||
endif
|
||||
|
|
|
@ -0,0 +1,77 @@
|
|||
/*
|
||||
* uvc_debugfs.c -- USB Video Class driver - Debugging support
|
||||
*
|
||||
* Copyright (C) 2011
|
||||
* Laurent Pinchart (laurent.pinchart@ideasonboard.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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/usb.h>
|
||||
|
||||
#include "uvcvideo.h"
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* Global and stream initialization/cleanup
|
||||
*/
|
||||
|
||||
static struct dentry *uvc_debugfs_root_dir;
|
||||
|
||||
int uvc_debugfs_init_stream(struct uvc_streaming *stream)
|
||||
{
|
||||
struct usb_device *udev = stream->dev->udev;
|
||||
struct dentry *dent;
|
||||
char dir_name[32];
|
||||
|
||||
if (uvc_debugfs_root_dir == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
sprintf(dir_name, "%u-%u", udev->bus->busnum, udev->devnum);
|
||||
|
||||
dent = debugfs_create_dir(dir_name, uvc_debugfs_root_dir);
|
||||
if (IS_ERR_OR_NULL(dent)) {
|
||||
uvc_printk(KERN_INFO, "Unable to create debugfs %s directory.\n",
|
||||
dir_name);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
stream->debugfs_dir = dent;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream)
|
||||
{
|
||||
if (stream->debugfs_dir == NULL)
|
||||
return;
|
||||
|
||||
debugfs_remove_recursive(stream->debugfs_dir);
|
||||
stream->debugfs_dir = NULL;
|
||||
}
|
||||
|
||||
int uvc_debugfs_init(void)
|
||||
{
|
||||
struct dentry *dir;
|
||||
|
||||
dir = debugfs_create_dir("uvcvideo", usb_debug_root);
|
||||
if (IS_ERR_OR_NULL(dir)) {
|
||||
uvc_printk(KERN_INFO, "Unable to create debugfs directory\n");
|
||||
return -ENODATA;
|
||||
}
|
||||
|
||||
uvc_debugfs_root_dir = dir;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void uvc_debugfs_cleanup(void)
|
||||
{
|
||||
if (uvc_debugfs_root_dir != NULL)
|
||||
debugfs_remove_recursive(uvc_debugfs_root_dir);
|
||||
}
|
|
@ -1675,6 +1675,8 @@ static void uvc_unregister_video(struct uvc_device *dev)
|
|||
|
||||
video_unregister_device(stream->vdev);
|
||||
stream->vdev = NULL;
|
||||
|
||||
uvc_debugfs_cleanup_stream(stream);
|
||||
}
|
||||
|
||||
/* Decrement the stream count and call uvc_delete explicitly if there
|
||||
|
@ -1700,6 +1702,8 @@ static int uvc_register_video(struct uvc_device *dev,
|
|||
return ret;
|
||||
}
|
||||
|
||||
uvc_debugfs_init_stream(stream);
|
||||
|
||||
/* Register the device with V4L. */
|
||||
vdev = video_device_alloc();
|
||||
if (vdev == NULL) {
|
||||
|
@ -2405,17 +2409,24 @@ struct uvc_driver uvc_driver = {
|
|||
|
||||
static int __init uvc_init(void)
|
||||
{
|
||||
int result;
|
||||
int ret;
|
||||
|
||||
result = usb_register(&uvc_driver.driver);
|
||||
if (result == 0)
|
||||
printk(KERN_INFO DRIVER_DESC " (" DRIVER_VERSION ")\n");
|
||||
return result;
|
||||
uvc_debugfs_init();
|
||||
|
||||
ret = usb_register(&uvc_driver.driver);
|
||||
if (ret < 0) {
|
||||
uvc_debugfs_cleanup();
|
||||
return ret;
|
||||
}
|
||||
|
||||
printk(KERN_INFO DRIVER_DESC " (" DRIVER_VERSION ")\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit uvc_cleanup(void)
|
||||
{
|
||||
usb_deregister(&uvc_driver.driver);
|
||||
uvc_debugfs_cleanup();
|
||||
}
|
||||
|
||||
module_init(uvc_init);
|
||||
|
|
|
@ -403,6 +403,9 @@ struct uvc_streaming {
|
|||
|
||||
__u32 sequence;
|
||||
__u8 last_fid;
|
||||
|
||||
/* debugfs */
|
||||
struct dentry *debugfs_dir;
|
||||
};
|
||||
|
||||
enum uvc_device_state {
|
||||
|
@ -606,4 +609,10 @@ extern struct usb_host_endpoint *uvc_find_endpoint(
|
|||
void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream,
|
||||
struct uvc_buffer *buf);
|
||||
|
||||
/* debugfs */
|
||||
int uvc_debugfs_init(void);
|
||||
void uvc_debugfs_cleanup(void);
|
||||
int uvc_debugfs_init_stream(struct uvc_streaming *stream);
|
||||
void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream);
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue