Skip to content

L
linux
Commit c5f48367 authored by Thierry MERLE's avatar Thierry MERLE Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (5644): Usbvision: video_ioctl2 conversion 

The ioctl entry point, a big switch/case, is splitted in little 
functions. 

These functions are set as callbacks for the video_ioctl2 video4linux 
facility.

This improves the driver memory consumption and enables the v4l1 
compatibility as a side effect.
Signed-off-by: default avatarThierry MERLE <thierry.merle@free.fr>
Acked-by: default avatarDwaine P. Garden <dwainegarden@rogers.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ea1f83ce
Show whitespace changes
Inline Side-by-side
Showing with 787 additions and 686 deletions
drivers/media/video/usbvision/usbvision-core.c
View file @ c5f48367
...@@ -1831,10 +1831,10 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width, ...@@ -1831,10 +1831,10 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width,
frameRate = FRAMERATE_MAX; frameRate = FRAMERATE_MAX;
} }
if (usbvision->tvnorm->id & V4L2_STD_625_50) { if (usbvision->tvnormId & V4L2_STD_625_50) {
frameDrop = frameRate * 32 / 25 - 1; frameDrop = frameRate * 32 / 25 - 1;
} }
else if (usbvision->tvnorm->id & V4L2_STD_525_60) { else if (usbvision->tvnormId & V4L2_STD_525_60) {
frameDrop = frameRate * 32 / 30 - 1; frameDrop = frameRate * 32 / 30 - 1;
} }
...@@ -2067,7 +2067,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision) ...@@ -2067,7 +2067,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
} }
if (usbvision->tvnorm->id & V4L2_STD_PAL) { if (usbvision->tvnormId & V4L2_STD_PAL) {
value[0] = 0xC0; value[0] = 0xC0;
value[1] = 0x02; //0x02C0 -> 704 Input video line length value[1] = 0x02; //0x02C0 -> 704 Input video line length
value[2] = 0x20; value[2] = 0x20;
...@@ -2076,7 +2076,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision) ...@@ -2076,7 +2076,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
value[5] = 0x00; //0x0060 -> 96 Input video h offset value[5] = 0x00; //0x0060 -> 96 Input video h offset
value[6] = 0x16; value[6] = 0x16;
value[7] = 0x00; //0x0016 -> 22 Input video v offset value[7] = 0x00; //0x0016 -> 22 Input video v offset
} else if (usbvision->tvnorm->id & V4L2_STD_SECAM) { } else if (usbvision->tvnormId & V4L2_STD_SECAM) {
value[0] = 0xC0; value[0] = 0xC0;
value[1] = 0x02; //0x02C0 -> 704 Input video line length value[1] = 0x02; //0x02C0 -> 704 Input video line length
value[2] = 0x20; value[2] = 0x20;
......
drivers/media/video/usbvision/usbvision-video.c
View file @ c5f48367
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
* - use submit_urb for all setup packets * - use submit_urb for all setup packets
* - Fix memory settings for nt1004. It is 4 times as big as the * - Fix memory settings for nt1004. It is 4 times as big as the
* nt1003 memory. * nt1003 memory.
* - Add audio on endpoint 3 for nt1004 chip. Seems impossible, needs a codec interface. Which one? * - Add audio on endpoint 3 for nt1004 chip.
* Seems impossible, needs a codec interface. Which one?
* - Clean up the driver. * - Clean up the driver.
* - optimization for performance. * - optimization for performance.
* - Add Videotext capability (VBI). Working on it..... * - Add Videotext capability (VBI). Working on it.....
...@@ -77,7 +78,8 @@ ...@@ -77,7 +78,8 @@
#include "usbvision.h" #include "usbvision.h"
#include "usbvision-cards.h" #include "usbvision-cards.h"
#define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>, Dwaine Garden <DwaineGarden@rogers.com>" #define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>,\
Dwaine Garden <DwaineGarden@rogers.com>"
#define DRIVER_NAME "usbvision" #define DRIVER_NAME "usbvision"
#define DRIVER_ALIAS "USBVision" #define DRIVER_ALIAS "USBVision"
#define DRIVER_DESC "USBVision USB Video Device Driver for Linux" #define DRIVER_DESC "USBVision USB Video Device Driver for Linux"
...@@ -85,20 +87,25 @@ ...@@ -85,20 +87,25 @@
#define USBVISION_DRIVER_VERSION_MAJOR 0 #define USBVISION_DRIVER_VERSION_MAJOR 0
#define USBVISION_DRIVER_VERSION_MINOR 9 #define USBVISION_DRIVER_VERSION_MINOR 9
#define USBVISION_DRIVER_VERSION_PATCHLEVEL 9 #define USBVISION_DRIVER_VERSION_PATCHLEVEL 9
#define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,USBVISION_DRIVER_VERSION_MINOR,USBVISION_DRIVER_VERSION_PATCHLEVEL) #define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,\
#define USBVISION_VERSION_STRING __stringify(USBVISION_DRIVER_VERSION_MAJOR) "." __stringify(USBVISION_DRIVER_VERSION_MINOR) "." __stringify(USBVISION_DRIVER_VERSION_PATCHLEVEL) USBVISION_DRIVER_VERSION_MINOR,\
USBVISION_DRIVER_VERSION_PATCHLEVEL)
#define USBVISION_VERSION_STRING __stringify(USBVISION_DRIVER_VERSION_MAJOR)\
"." __stringify(USBVISION_DRIVER_VERSION_MINOR)\
"." __stringify(USBVISION_DRIVER_VERSION_PATCHLEVEL)
#define ENABLE_HEXDUMP 0 /* Enable if you need it */ #define ENABLE_HEXDUMP 0 /* Enable if you need it */
#ifdef USBVISION_DEBUG #ifdef USBVISION_DEBUG
#define PDEBUG(level, fmt, args...) \ #define PDEBUG(level, fmt, args...) \
if (video_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args) if (video_debug & (level)) \
info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ ,\
## args)
#else #else
#define PDEBUG(level, fmt, args...) do {} while(0) #define PDEBUG(level, fmt, args...) do {} while(0)
#endif #endif
#define DBG_IOCTL 1<<0
#define DBG_IO 1<<1 #define DBG_IO 1<<1
#define DBG_PROBE 1<<2 #define DBG_PROBE 1<<2
#define DBG_MMAP 1<<3 #define DBG_MMAP 1<<3
...@@ -108,7 +115,8 @@ ...@@ -108,7 +115,8 @@
#define goto2next(str) while(*str!=' ') str++; while(*str==' ') str++; #define goto2next(str) while(*str!=' ') str++; while(*str==' ') str++;
static int usbvision_nr = 0; // sequential number of usbvision device /* sequential number of usbvision device */
static int usbvision_nr = 0;
static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = { static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = {
{ 1, 1, 8, V4L2_PIX_FMT_GREY , "GREY" }, { 1, 1, 8, V4L2_PIX_FMT_GREY , "GREY" },
...@@ -121,54 +129,54 @@ static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = { ...@@ -121,54 +129,54 @@ static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = {
{ 1, 2, 16, V4L2_PIX_FMT_YUV422P , "YUV422P" } { 1, 2, 16, V4L2_PIX_FMT_YUV422P , "YUV422P" }
}; };
/* supported tv norms */ /* Function prototypes */
static struct usbvision_tvnorm tvnorms[] = {
{
.name = "PAL",
.id = V4L2_STD_PAL,
}, {
.name = "NTSC",
.id = V4L2_STD_NTSC,
}, {
.name = "SECAM",
.id = V4L2_STD_SECAM,
}, {
.name = "PAL-M",
.id = V4L2_STD_PAL_M,
}
};
#define TVNORMS ARRAY_SIZE(tvnorms)
// Function prototypes
static void usbvision_release(struct usb_usbvision *usbvision); static void usbvision_release(struct usb_usbvision *usbvision);
// Default initalization of device driver parameters /* Default initalization of device driver parameters */
static int isocMode = ISOC_MODE_COMPRESS; // Set the default format for ISOC endpoint /* Set the default format for ISOC endpoint */
static int video_debug = 0; // Set the default Debug Mode of the device driver static int isocMode = ISOC_MODE_COMPRESS;
static int PowerOnAtOpen = 1; // Set the default device to power on at startup /* Set the default Debug Mode of the device driver */
static int video_nr = -1; // Sequential Number of Video Device static int video_debug = 0;
static int radio_nr = -1; // Sequential Number of Radio Device /* Set the default device to power on at startup */
static int vbi_nr = -1; // Sequential Number of VBI Device static int PowerOnAtOpen = 1;
/* Sequential Number of Video Device */
// Grab parameters for the device driver static int video_nr = -1;
/* Sequential Number of Radio Device */
#if defined(module_param) // Showing parameters under SYSFS static int radio_nr = -1;
/* Sequential Number of VBI Device */
static int vbi_nr = -1;
/* Grab parameters for the device driver */
/* Showing parameters under SYSFS */
#if defined(module_param)
module_param(isocMode, int, 0444); module_param(isocMode, int, 0444);
module_param(video_debug, int, 0444); module_param(video_debug, int, 0444);
module_param(PowerOnAtOpen, int, 0444); module_param(PowerOnAtOpen, int, 0444);
module_param(video_nr, int, 0444); module_param(video_nr, int, 0444);
module_param(radio_nr, int, 0444); module_param(radio_nr, int, 0444);
module_param(vbi_nr, int, 0444); module_param(vbi_nr, int, 0444);
#else // Old Style #else
/* Old Style */
MODULE_PARAM(isocMode, "i"); MODULE_PARAM(isocMode, "i");
MODULE_PARM(video_debug, "i"); // Grab the Debug Mode of the device driver /* Grab the Debug Mode of the device driver */
MODULE_PARM(adjustCompression, "i"); // Grab the compression to be adaptive MODULE_PARM(video_debug, "i");
MODULE_PARM(PowerOnAtOpen, "i"); // Grab the device to power on at startup /* Grab the compression to be adaptive */
MODULE_PARM(SwitchSVideoInput, "i"); // To help people with Black and White output with using s-video input. Some cables and input device are wired differently. MODULE_PARM(adjustCompression, "i");
MODULE_PARM(video_nr, "i"); // video_nr option allows to specify a certain /dev/videoX device (like /dev/video0 or /dev/video1 ...) /* Grab the device to power on at startup */
MODULE_PARM(radio_nr, "i"); // radio_nr option allows to specify a certain /dev/radioX device (like /dev/radio0 or /dev/radio1 ...) MODULE_PARM(PowerOnAtOpen, "i");
MODULE_PARM(vbi_nr, "i"); // vbi_nr option allows to specify a certain /dev/vbiX device (like /dev/vbi0 or /dev/vbi1 ...) /* To help people with Black and White output with using s-video input.
Some cables and input device are wired differently. */
MODULE_PARM(SwitchSVideoInput, "i");
/* video_nr option allows to specify a certain /dev/videoX device
(like /dev/video0 or /dev/video1 ...) */
MODULE_PARM(video_nr, "i");
/* radio_nr option allows to specify a certain /dev/radioX device
(like /dev/radio0 or /dev/radio1 ...) */
MODULE_PARM(radio_nr, "i");
/* vbi_nr option allows to specify a certain /dev/vbiX device
(like /dev/vbi0 or /dev/vbi1 ...) */
MODULE_PARM(vbi_nr, "i");
#endif #endif
MODULE_PARM_DESC(isocMode, " Set the default format for ISOC endpoint. Default: 0x60 (Compression On)"); MODULE_PARM_DESC(isocMode, " Set the default format for ISOC endpoint. Default: 0x60 (Compression On)");
...@@ -187,19 +195,21 @@ MODULE_VERSION(USBVISION_VERSION_STRING); ...@@ -187,19 +195,21 @@ MODULE_VERSION(USBVISION_VERSION_STRING);
MODULE_ALIAS(DRIVER_ALIAS); MODULE_ALIAS(DRIVER_ALIAS);
/****************************************************************************************/ /*****************************************************************************/
/* SYSFS Code - Copied from the stv680.c usb module. */ /* SYSFS Code - Copied from the stv680.c usb module. */
/* Device information is located at /sys/class/video4linux/video0 */ /* Device information is located at /sys/class/video4linux/video0 */
/* Device parameters information is located at /sys/module/usbvision */ /* Device parameters information is located at /sys/module/usbvision */
/* Device USB Information is located at /sys/bus/usb/drivers/USBVision Video Grabber */ /* Device USB Information is located at */
/****************************************************************************************/ /* /sys/bus/usb/drivers/USBVision Video Grabber */
/*****************************************************************************/
#define YES_NO(x) ((x) ? "Yes" : "No") #define YES_NO(x) ((x) ? "Yes" : "No")
static inline struct usb_usbvision *cd_to_usbvision(struct class_device *cd) static inline struct usb_usbvision *cd_to_usbvision(struct class_device *cd)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
return video_get_drvdata(vdev); return video_get_drvdata(vdev);
} }
...@@ -211,15 +221,18 @@ static CLASS_DEVICE_ATTR(version, S_IRUGO, show_version, NULL); ...@@ -211,15 +221,18 @@ static CLASS_DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
static ssize_t show_model(struct class_device *cd, char *buf) static ssize_t show_model(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
return sprintf(buf, "%s\n", usbvision_device_data[usbvision->DevModel].ModelString); return sprintf(buf, "%s\n",
usbvision_device_data[usbvision->DevModel].ModelString);
} }
static CLASS_DEVICE_ATTR(model, S_IRUGO, show_model, NULL); static CLASS_DEVICE_ATTR(model, S_IRUGO, show_model, NULL);
static ssize_t show_hue(struct class_device *cd, char *buf) static ssize_t show_hue(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
struct v4l2_control ctrl; struct v4l2_control ctrl;
ctrl.id = V4L2_CID_HUE; ctrl.id = V4L2_CID_HUE;
...@@ -232,7 +245,8 @@ static CLASS_DEVICE_ATTR(hue, S_IRUGO, show_hue, NULL); ...@@ -232,7 +245,8 @@ static CLASS_DEVICE_ATTR(hue, S_IRUGO, show_hue, NULL);
static ssize_t show_contrast(struct class_device *cd, char *buf) static ssize_t show_contrast(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
struct v4l2_control ctrl; struct v4l2_control ctrl;
ctrl.id = V4L2_CID_CONTRAST; ctrl.id = V4L2_CID_CONTRAST;
...@@ -245,7 +259,8 @@ static CLASS_DEVICE_ATTR(contrast, S_IRUGO, show_contrast, NULL); ...@@ -245,7 +259,8 @@ static CLASS_DEVICE_ATTR(contrast, S_IRUGO, show_contrast, NULL);
static ssize_t show_brightness(struct class_device *cd, char *buf) static ssize_t show_brightness(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
struct v4l2_control ctrl; struct v4l2_control ctrl;
ctrl.id = V4L2_CID_BRIGHTNESS; ctrl.id = V4L2_CID_BRIGHTNESS;
...@@ -258,7 +273,8 @@ static CLASS_DEVICE_ATTR(brightness, S_IRUGO, show_brightness, NULL); ...@@ -258,7 +273,8 @@ static CLASS_DEVICE_ATTR(brightness, S_IRUGO, show_brightness, NULL);
static ssize_t show_saturation(struct class_device *cd, char *buf) static ssize_t show_saturation(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
struct v4l2_control ctrl; struct v4l2_control ctrl;
ctrl.id = V4L2_CID_SATURATION; ctrl.id = V4L2_CID_SATURATION;
...@@ -271,23 +287,28 @@ static CLASS_DEVICE_ATTR(saturation, S_IRUGO, show_saturation, NULL); ...@@ -271,23 +287,28 @@ static CLASS_DEVICE_ATTR(saturation, S_IRUGO, show_saturation, NULL);
static ssize_t show_streaming(struct class_device *cd, char *buf) static ssize_t show_streaming(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
return sprintf(buf, "%s\n", YES_NO(usbvision->streaming==Stream_On?1:0)); return sprintf(buf, "%s\n",
YES_NO(usbvision->streaming==Stream_On?1:0));
} }
static CLASS_DEVICE_ATTR(streaming, S_IRUGO, show_streaming, NULL); static CLASS_DEVICE_ATTR(streaming, S_IRUGO, show_streaming, NULL);
static ssize_t show_compression(struct class_device *cd, char *buf) static ssize_t show_compression(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
return sprintf(buf, "%s\n", YES_NO(usbvision->isocMode==ISOC_MODE_COMPRESS)); return sprintf(buf, "%s\n",
YES_NO(usbvision->isocMode==ISOC_MODE_COMPRESS));
} }
static CLASS_DEVICE_ATTR(compression, S_IRUGO, show_compression, NULL); static CLASS_DEVICE_ATTR(compression, S_IRUGO, show_compression, NULL);
static ssize_t show_device_bridge(struct class_device *cd, char *buf) static ssize_t show_device_bridge(struct class_device *cd, char *buf)
{ {
struct video_device *vdev = container_of(cd, struct video_device, class_dev); struct video_device *vdev =
container_of(cd, struct video_device, class_dev);
struct usb_usbvision *usbvision = video_get_drvdata(vdev); struct usb_usbvision *usbvision = video_get_drvdata(vdev);
return sprintf(buf, "%d\n", usbvision->bridgeType); return sprintf(buf, "%d\n", usbvision->bridgeType);
} }
...@@ -376,7 +397,8 @@ static void usbvision_remove_sysfs(struct video_device *vdev) ...@@ -376,7 +397,8 @@ static void usbvision_remove_sysfs(struct video_device *vdev)
static int usbvision_v4l2_open(struct inode *inode, struct file *file) static int usbvision_v4l2_open(struct inode *inode, struct file *file)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev); struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int errCode = 0; int errCode = 0;
PDEBUG(DBG_IO, "open"); PDEBUG(DBG_IO, "open");
...@@ -390,7 +412,8 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) ...@@ -390,7 +412,8 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
/* Allocate memory for the scratch ring buffer */ /* Allocate memory for the scratch ring buffer */
errCode = usbvision_scratch_alloc(usbvision); errCode = usbvision_scratch_alloc(usbvision);
if (isocMode==ISOC_MODE_COMPRESS) { if (isocMode==ISOC_MODE_COMPRESS) {
/* Allocate intermediate decompression buffers only if needed */ /* Allocate intermediate decompression buffers
only if needed */
errCode = usbvision_decompress_alloc(usbvision); errCode = usbvision_decompress_alloc(usbvision);
} }
if (errCode) { if (errCode) {
...@@ -421,11 +444,10 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) ...@@ -421,11 +444,10 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
if (!errCode) { if (!errCode) {
usbvision_begin_streaming(usbvision); usbvision_begin_streaming(usbvision);
errCode = usbvision_init_isoc(usbvision); errCode = usbvision_init_isoc(usbvision);
/* device needs to be initialized before isoc transfer */ /* device must be initialized before isoc transfer */
usbvision_muxsel(usbvision,0); usbvision_muxsel(usbvision,0);
usbvision->user++; usbvision->user++;
} } else {
else {
if (PowerOnAtOpen) { if (PowerOnAtOpen) {
usbvision_i2c_unregister(usbvision); usbvision_i2c_unregister(usbvision);
usbvision_power_off(usbvision); usbvision_power_off(usbvision);
...@@ -456,7 +478,8 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) ...@@ -456,7 +478,8 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
static int usbvision_v4l2_close(struct inode *inode, struct file *file) static int usbvision_v4l2_close(struct inode *inode, struct file *file)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev); struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
PDEBUG(DBG_IO, "close"); PDEBUG(DBG_IO, "close");
down(&usbvision->lock); down(&usbvision->lock);
...@@ -473,7 +496,8 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file) ...@@ -473,7 +496,8 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
usbvision->user--; usbvision->user--;
if (PowerOnAtOpen) { if (PowerOnAtOpen) {
/* power off in a little while to avoid off/on every close/open short sequences */ /* power off in a little while
to avoid off/on every close/open short sequences */
usbvision_set_powerOffTimer(usbvision); usbvision_set_powerOffTimer(usbvision);
usbvision->initialized = 0; usbvision->initialized = 0;
} }
...@@ -498,55 +522,58 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file) ...@@ -498,55 +522,58 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
* This is part of Video 4 Linux API. The procedure handles ioctl() calls. * This is part of Video 4 Linux API. The procedure handles ioctl() calls.
* *
*/ */
static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, #ifdef CONFIG_VIDEO_ADV_DEBUG
unsigned int cmd, void *arg) static int vidioc_g_register (struct file *file, void *priv,
struct v4l2_register *reg)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev); struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
if (!USBVISION_IS_OPERATIONAL(usbvision))
return -EFAULT;
switch (cmd) {
#ifdef CONFIG_VIDEO_ADV_DEBUG
/* ioctls to allow direct acces to the NT100x registers */
case VIDIOC_DBG_G_REGISTER:
case VIDIOC_DBG_S_REGISTER:
{
struct v4l2_register *reg = arg;
int errCode; int errCode;
if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
return -EINVAL; return -EINVAL;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
/* NT100x has a 8-bit register space */ /* NT100x has a 8-bit register space */
if (cmd == VIDIOC_DBG_G_REGISTER)
errCode = usbvision_read_reg(usbvision, reg->reg&0xff); errCode = usbvision_read_reg(usbvision, reg->reg&0xff);
else
errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
if (errCode < 0) { if (errCode < 0) {
err("%s: VIDIOC_DBG_%c_REGISTER failed: error %d", __FUNCTION__, err("%s: VIDIOC_DBG_G_REGISTER failed: error %d",
cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S', errCode); __FUNCTION__, errCode);
return errCode; return errCode;
} }
if (cmd == VIDIOC_DBG_S_REGISTER)
reg->val = (u8)errCode;
PDEBUG(DBG_IOCTL, "VIDIOC_DBG_%c_REGISTER reg=0x%02X, value=0x%02X",
cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S',
(unsigned int)reg->reg, (unsigned int)reg->val);
return 0; return 0;
}
static int vidioc_s_register (struct file *file, void *priv,
struct v4l2_register *reg)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int errCode;
if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
return -EINVAL;
/* NT100x has a 8-bit register space */
reg->val = (u8)usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
if (reg->val < 0) {
err("%s: VIDIOC_DBG_S_REGISTER failed: error %d",
__FUNCTION__, errCode);
return errCode;
} }
return 0;
}
#endif #endif
case VIDIOC_QUERYCAP:
{
struct v4l2_capability *vc=arg;
memset(vc, 0, sizeof(*vc)); static int vidioc_querycap (struct file *file, void *priv,
struct v4l2_capability *vc)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
strlcpy(vc->driver, "USBVision", sizeof(vc->driver)); strlcpy(vc->driver, "USBVision", sizeof(vc->driver));
strlcpy(vc->card, usbvision_device_data[usbvision->DevModel].ModelString, strlcpy(vc->card,
usbvision_device_data[usbvision->DevModel].ModelString,
sizeof(vc->card)); sizeof(vc->card));
strlcpy(vc->bus_info, usbvision->dev->dev.bus_id, strlcpy(vc->bus_info, usbvision->dev->dev.bus_id,
sizeof(vc->bus_info)); sizeof(vc->bus_info));
...@@ -556,41 +583,43 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -556,41 +583,43 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
V4L2_CAP_READWRITE | V4L2_CAP_READWRITE |
V4L2_CAP_STREAMING | V4L2_CAP_STREAMING |
(usbvision->have_tuner ? V4L2_CAP_TUNER : 0); (usbvision->have_tuner ? V4L2_CAP_TUNER : 0);
PDEBUG(DBG_IOCTL, "VIDIOC_QUERYCAP");
return 0; return 0;
} }
case VIDIOC_ENUMINPUT:
{ static int vidioc_enum_input (struct file *file, void *priv,
struct v4l2_input *vi = arg; struct v4l2_input *vi)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int chan; int chan;
if ((vi->index >= usbvision->video_inputs) || (vi->index < 0) ) if ((vi->index >= usbvision->video_inputs) || (vi->index < 0) )
return -EINVAL; return -EINVAL;
if (usbvision->have_tuner) { if (usbvision->have_tuner) {
chan = vi->index; chan = vi->index;
} else {
chan = vi->index + 1; /*skip Television string*/
} }
else { /* Determine the requested input characteristics
chan = vi->index + 1; //skip Television string specific for each usbvision card model */
}
switch(chan) { switch(chan) {
case 0: case 0:
if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) { if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
strcpy(vi->name, "White Video Input"); strcpy(vi->name, "White Video Input");
} } else {
else {
strcpy(vi->name, "Television"); strcpy(vi->name, "Television");
vi->type = V4L2_INPUT_TYPE_TUNER; vi->type = V4L2_INPUT_TYPE_TUNER;
vi->audioset = 1; vi->audioset = 1;
vi->tuner = chan; vi->tuner = chan;
vi->std = V4L2_STD_PAL | V4L2_STD_NTSC | V4L2_STD_SECAM; vi->std = USBVISION_NORMS;
} }
break; break;
case 1: case 1:
vi->type = V4L2_INPUT_TYPE_CAMERA; vi->type = V4L2_INPUT_TYPE_CAMERA;
if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) { if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
strcpy(vi->name, "Green Video Input"); strcpy(vi->name, "Green Video Input");
} } else {
else {
strcpy(vi->name, "Composite Video Input"); strcpy(vi->name, "Composite Video Input");
} }
vi->std = V4L2_STD_PAL; vi->std = V4L2_STD_PAL;
...@@ -599,8 +628,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -599,8 +628,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
vi->type = V4L2_INPUT_TYPE_CAMERA; vi->type = V4L2_INPUT_TYPE_CAMERA;
if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) { if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
strcpy(vi->name, "Yellow Video Input"); strcpy(vi->name, "Yellow Video Input");
} } else {
else {
strcpy(vi->name, "S-Video Input"); strcpy(vi->name, "S-Video Input");
} }
vi->std = V4L2_STD_PAL; vi->std = V4L2_STD_PAL;
...@@ -611,104 +639,81 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -611,104 +639,81 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
vi->std = V4L2_STD_PAL; vi->std = V4L2_STD_PAL;
break; break;
} }
PDEBUG(DBG_IOCTL, "VIDIOC_ENUMINPUT name=%s:%d tuners=%d type=%d norm=%x",
vi->name, vi->index, vi->tuner,vi->type,(int)vi->std);
return 0; return 0;
} }
case VIDIOC_ENUMSTD:
{ static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)
struct v4l2_standard *e = arg; {
unsigned int i; struct video_device *dev = video_devdata(file);
int ret; struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
i = e->index;
if (i >= TVNORMS)
return -EINVAL;
ret = v4l2_video_std_construct(e, tvnorms[e->index].id,
tvnorms[e->index].name);
e->index = i;
if (ret < 0)
return ret;
return 0;
}
case VIDIOC_G_INPUT:
{
int *input = arg;
*input = usbvision->ctl_input; *input = usbvision->ctl_input;
return 0; return 0;
} }
case VIDIOC_S_INPUT:
{ static int vidioc_s_input (struct file *file, void *priv, unsigned int input)
int *input = arg; {
if ((*input >= usbvision->video_inputs) || (*input < 0) ) struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
if ((input >= usbvision->video_inputs) || (input < 0) )
return -EINVAL; return -EINVAL;
usbvision->ctl_input = *input; usbvision->ctl_input = input;
down(&usbvision->lock); down(&usbvision->lock);
usbvision_muxsel(usbvision, usbvision->ctl_input); usbvision_muxsel(usbvision, usbvision->ctl_input);
usbvision_set_input(usbvision); usbvision_set_input(usbvision);
usbvision_set_output(usbvision, usbvision->curwidth, usbvision->curheight); usbvision_set_output(usbvision,
usbvision->curwidth,
usbvision->curheight);
up(&usbvision->lock); up(&usbvision->lock);
return 0; return 0;
} }
case VIDIOC_G_STD:
{
v4l2_std_id *id = arg;
*id = usbvision->tvnorm->id;
PDEBUG(DBG_IOCTL, "VIDIOC_G_STD std_id=%s", usbvision->tvnorm->name);
return 0;
}
case VIDIOC_S_STD:
{
v4l2_std_id *id = arg;
unsigned int i;
for (i = 0; i < TVNORMS; i++) static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
if (*id == tvnorms[i].id) {
break; struct video_device *dev = video_devdata(file);
if (i == TVNORMS) struct usb_usbvision *usbvision =
for (i = 0; i < TVNORMS; i++) (struct usb_usbvision *) video_get_drvdata(dev);
if (*id & tvnorms[i].id) usbvision->tvnormId=*id;
break;
if (i == TVNORMS)
return -EINVAL;
down(&usbvision->lock); down(&usbvision->lock);
usbvision->tvnorm = &tvnorms[i];
call_i2c_clients(usbvision, VIDIOC_S_STD, call_i2c_clients(usbvision, VIDIOC_S_STD,
&usbvision->tvnorm->id); &usbvision->tvnormId);
up(&usbvision->lock); up(&usbvision->lock);
PDEBUG(DBG_IOCTL, "VIDIOC_S_STD std_id=%s", usbvision->tvnorm->name);
return 0; return 0;
} }
case VIDIOC_G_TUNER:
{ static int vidioc_g_tuner (struct file *file, void *priv,
struct v4l2_tuner *vt = arg; struct v4l2_tuner *vt)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
if (!usbvision->have_tuner || vt->index) // Only tuner 0 if (!usbvision->have_tuner || vt->index) // Only tuner 0
return -EINVAL; return -EINVAL;
if(usbvision->radio) { if(usbvision->radio) {
strcpy(vt->name, "Radio"); strcpy(vt->name, "Radio");
vt->type = V4L2_TUNER_RADIO; vt->type = V4L2_TUNER_RADIO;
} } else {
else {
strcpy(vt->name, "Television"); strcpy(vt->name, "Television");
} }
/* Let clients fill in the remainder of this struct */ /* Let clients fill in the remainder of this struct */
call_i2c_clients(usbvision,VIDIOC_G_TUNER,vt); call_i2c_clients(usbvision,VIDIOC_G_TUNER,vt);
PDEBUG(DBG_IOCTL, "VIDIOC_G_TUNER for %s signal=%x, afc=%x",
vt->name, vt->signal,vt->afc);
return 0; return 0;
} }
case VIDIOC_S_TUNER:
{ static int vidioc_s_tuner (struct file *file, void *priv,
struct v4l2_tuner *vt = arg; struct v4l2_tuner *vt)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
// Only no or one tuner for now // Only no or one tuner for now
if (!usbvision->have_tuner || vt->index) if (!usbvision->have_tuner || vt->index)
...@@ -716,99 +721,123 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -716,99 +721,123 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
/* let clients handle this */ /* let clients handle this */
call_i2c_clients(usbvision,VIDIOC_S_TUNER,vt); call_i2c_clients(usbvision,VIDIOC_S_TUNER,vt);
PDEBUG(DBG_IOCTL, "VIDIOC_S_TUNER");
return 0; return 0;
} }
case VIDIOC_G_FREQUENCY:
{ static int vidioc_g_frequency (struct file *file, void *priv,
struct v4l2_frequency *freq = arg; struct v4l2_frequency *freq)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
freq->tuner = 0; // Only one tuner freq->tuner = 0; // Only one tuner
if(usbvision->radio) { if(usbvision->radio) {
freq->type = V4L2_TUNER_RADIO; freq->type = V4L2_TUNER_RADIO;
} } else {
else {
freq->type = V4L2_TUNER_ANALOG_TV; freq->type = V4L2_TUNER_ANALOG_TV;
} }
freq->frequency = usbvision->freq; freq->frequency = usbvision->freq;
PDEBUG(DBG_IOCTL, "VIDIOC_G_FREQUENCY freq=0x%X", (unsigned)freq->frequency);
return 0; return 0;
} }
case VIDIOC_S_FREQUENCY:
{ static int vidioc_s_frequency (struct file *file, void *priv,
struct v4l2_frequency *freq = arg; struct v4l2_frequency *freq)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
// Only no or one tuner for now // Only no or one tuner for now
if (!usbvision->have_tuner || freq->tuner) if (!usbvision->have_tuner || freq->tuner)
return -EINVAL; return -EINVAL;
usbvision->freq = freq->frequency; usbvision->freq = freq->frequency;
call_i2c_clients(usbvision, cmd, freq); call_i2c_clients(usbvision, VIDIOC_S_FREQUENCY, freq);
PDEBUG(DBG_IOCTL, "VIDIOC_S_FREQUENCY freq=0x%X", (unsigned)freq->frequency);
return 0; return 0;
} }
case VIDIOC_G_AUDIO:
{ static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
struct v4l2_audio *v = arg; {
memset(v,0, sizeof(v)); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
memset(a,0,sizeof(*a));
if(usbvision->radio) { if(usbvision->radio) {
strcpy(v->name,"Radio"); strcpy(a->name,"Radio");
} } else {
else { strcpy(a->name, "TV");
strcpy(v->name, "TV");
} }
PDEBUG(DBG_IOCTL, "VIDIOC_G_AUDIO");
return 0; return 0;
} }
case VIDIOC_S_AUDIO:
{ static int vidioc_s_audio (struct file *file, void *fh,
struct v4l2_audio *v = arg; struct v4l2_audio *a)
if(v->index) { {
if(a->index) {
return -EINVAL; return -EINVAL;
} }
PDEBUG(DBG_IOCTL, "VIDIOC_S_AUDIO");
return 0; return 0;
} }
case VIDIOC_QUERYCTRL:
{ static int vidioc_queryctrl (struct file *file, void *priv,
struct v4l2_queryctrl *ctrl = arg; struct v4l2_queryctrl *ctrl)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int id=ctrl->id; int id=ctrl->id;
memset(ctrl,0,sizeof(*ctrl)); memset(ctrl,0,sizeof(*ctrl));
ctrl->id=id; ctrl->id=id;
call_i2c_clients(usbvision, cmd, arg); call_i2c_clients(usbvision, VIDIOC_QUERYCTRL, ctrl);
if (ctrl->type) if (!ctrl->type)
return 0;
else
return -EINVAL; return -EINVAL;
PDEBUG(DBG_IOCTL,"VIDIOC_QUERYCTRL id=%x value=%x",ctrl->id,ctrl->type); return 0;
} }
case VIDIOC_G_CTRL:
{ static int vidioc_g_ctrl (struct file *file, void *priv,
struct v4l2_control *ctrl = arg; struct v4l2_control *ctrl)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl); call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);
PDEBUG(DBG_IOCTL,"VIDIOC_G_CTRL id=%x value=%x",ctrl->id,ctrl->value);
return 0; return 0;
} }
case VIDIOC_S_CTRL:
{
struct v4l2_control *ctrl = arg;
PDEBUG(DBG_IOCTL, "VIDIOC_S_CTRL id=%x value=%x",ctrl->id,ctrl->value); static int vidioc_s_ctrl (struct file *file, void *priv,
struct v4l2_control *ctrl)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl); call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl);
return 0; return 0;
} }
case VIDIOC_REQBUFS:
{ static int vidioc_reqbufs (struct file *file,
struct v4l2_requestbuffers *vr = arg; void *priv, struct v4l2_requestbuffers *vr)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int ret; int ret;
RESTRICT_TO_RANGE(vr->count,1,USBVISION_NUMFRAMES); RESTRICT_TO_RANGE(vr->count,1,USBVISION_NUMFRAMES);
// Check input validity : the user must do a VIDEO CAPTURE and MMAP method. /* Check input validity:
the user must do a VIDEO CAPTURE and MMAP method. */
if((vr->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) || if((vr->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
(vr->memory != V4L2_MEMORY_MMAP)) (vr->memory != V4L2_MEMORY_MMAP))
return -EINVAL; return -EINVAL;
...@@ -824,23 +853,26 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -824,23 +853,26 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
usbvision->curFrame = NULL; usbvision->curFrame = NULL;
PDEBUG(DBG_IOCTL, "VIDIOC_REQBUFS count=%d",vr->count);
return 0; return 0;
} }
case VIDIOC_QUERYBUF:
{
struct v4l2_buffer *vb = arg;
struct usbvision_frame *frame;
// FIXME : must control that buffers are mapped (VIDIOC_REQBUFS has been called) static int vidioc_querybuf (struct file *file,
void *priv, struct v4l2_buffer *vb)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
struct usbvision_frame *frame;
/* FIXME : must control
that buffers are mapped (VIDIOC_REQBUFS has been called) */
if(vb->type != V4L2_CAP_VIDEO_CAPTURE) { if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
return -EINVAL; return -EINVAL;
} }
if(vb->index>=usbvision->num_frames) { if(vb->index>=usbvision->num_frames) {
return -EINVAL; return -EINVAL;
} }
// Updating the corresponding frame state /* Updating the corresponding frame state */
vb->flags = 0; vb->flags = 0;
frame = &usbvision->frame[vb->index]; frame = &usbvision->frame[vb->index];
if(frame->grabstate >= FrameState_Ready) if(frame->grabstate >= FrameState_Ready)
...@@ -855,18 +887,23 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -855,18 +887,23 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
vb->memory = V4L2_MEMORY_MMAP; vb->memory = V4L2_MEMORY_MMAP;
vb->field = V4L2_FIELD_NONE; vb->field = V4L2_FIELD_NONE;
vb->length = usbvision->curwidth*usbvision->curheight*usbvision->palette.bytes_per_pixel; vb->length = usbvision->curwidth*
usbvision->curheight*
usbvision->palette.bytes_per_pixel;
vb->timestamp = usbvision->frame[vb->index].timestamp; vb->timestamp = usbvision->frame[vb->index].timestamp;
vb->sequence = usbvision->frame[vb->index].sequence; vb->sequence = usbvision->frame[vb->index].sequence;
return 0; return 0;
} }
case VIDIOC_QBUF:
{ static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
struct v4l2_buffer *vb = arg; {
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
struct usbvision_frame *frame; struct usbvision_frame *frame;
unsigned long lock_flags; unsigned long lock_flags;
// FIXME : works only on VIDEO_CAPTURE MODE, MMAP. /* FIXME : works only on VIDEO_CAPTURE MODE, MMAP. */
if(vb->type != V4L2_CAP_VIDEO_CAPTURE) { if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
return -EINVAL; return -EINVAL;
} }
...@@ -894,12 +931,14 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -894,12 +931,14 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
list_add_tail(&usbvision->frame[vb->index].frame, &usbvision->inqueue); list_add_tail(&usbvision->frame[vb->index].frame, &usbvision->inqueue);
spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags); spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags);
PDEBUG(DBG_IOCTL, "VIDIOC_QBUF frame #%d",vb->index);
return 0; return 0;
} }
case VIDIOC_DQBUF:
{ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
struct v4l2_buffer *vb = arg; {
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int ret; int ret;
struct usbvision_frame *f; struct usbvision_frame *f;
unsigned long lock_flags; unsigned long lock_flags;
...@@ -926,7 +965,9 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -926,7 +965,9 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
f->grabstate = FrameState_Unused; f->grabstate = FrameState_Unused;
vb->memory = V4L2_MEMORY_MMAP; vb->memory = V4L2_MEMORY_MMAP;
vb->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE; vb->flags = V4L2_BUF_FLAG_MAPPED |
V4L2_BUF_FLAG_QUEUED |
V4L2_BUF_FLAG_DONE;
vb->index = f->index; vb->index = f->index;
vb->sequence = f->sequence; vb->sequence = f->sequence;
vb->timestamp = f->timestamp; vb->timestamp = f->timestamp;
...@@ -934,41 +975,45 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -934,41 +975,45 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
vb->bytesused = f->scanlength; vb->bytesused = f->scanlength;
return 0; return 0;
} }
case VIDIOC_STREAMON:
{ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int b=V4L2_BUF_TYPE_VIDEO_CAPTURE; int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
usbvision->streaming = Stream_On; usbvision->streaming = Stream_On;
call_i2c_clients(usbvision,VIDIOC_STREAMON , &b); call_i2c_clients(usbvision,VIDIOC_STREAMON , &b);
PDEBUG(DBG_IOCTL, "VIDIOC_STREAMON");
return 0; return 0;
} }
case VIDIOC_STREAMOFF:
{ static int vidioc_streamoff(struct file *file,
int *type = arg; void *priv, enum v4l2_buf_type type)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int b=V4L2_BUF_TYPE_VIDEO_CAPTURE; int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
if(usbvision->streaming == Stream_On) { if(usbvision->streaming == Stream_On) {
usbvision_stream_interrupt(usbvision); usbvision_stream_interrupt(usbvision);
// Stop all video streamings /* Stop all video streamings */
call_i2c_clients(usbvision,VIDIOC_STREAMOFF , &b); call_i2c_clients(usbvision,VIDIOC_STREAMOFF , &b);
} }
usbvision_empty_framequeues(usbvision); usbvision_empty_framequeues(usbvision);
PDEBUG(DBG_IOCTL, "VIDIOC_STREAMOFF");
return 0; return 0;
} }
case VIDIOC_ENUM_FMT:
{
struct v4l2_fmtdesc *vfd = arg;
static int vidioc_enum_fmt_cap (struct file *file, void *priv,
struct v4l2_fmtdesc *vfd)
{
if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) { if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {
return -EINVAL; return -EINVAL;
} }
...@@ -978,43 +1023,38 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -978,43 +1023,38 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
vfd->pixelformat = usbvision_v4l2_format[vfd->index].format; vfd->pixelformat = usbvision_v4l2_format[vfd->index].format;
memset(vfd->reserved, 0, sizeof(vfd->reserved)); memset(vfd->reserved, 0, sizeof(vfd->reserved));
return 0; return 0;
} }
case VIDIOC_G_FMT:
{
struct v4l2_format *vf = arg;
switch (vf->type) { static int vidioc_g_fmt_cap (struct file *file, void *priv,
case V4L2_BUF_TYPE_VIDEO_CAPTURE: struct v4l2_format *vf)
{ {
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
vf->fmt.pix.width = usbvision->curwidth; vf->fmt.pix.width = usbvision->curwidth;
vf->fmt.pix.height = usbvision->curheight; vf->fmt.pix.height = usbvision->curheight;
vf->fmt.pix.pixelformat = usbvision->palette.format; vf->fmt.pix.pixelformat = usbvision->palette.format;
vf->fmt.pix.bytesperline = usbvision->curwidth*usbvision->palette.bytes_per_pixel; vf->fmt.pix.bytesperline =
usbvision->curwidth*usbvision->palette.bytes_per_pixel;
vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*usbvision->curheight; vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*usbvision->curheight;
vf->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; vf->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
vf->fmt.pix.field = V4L2_FIELD_NONE; /* Always progressive image */ vf->fmt.pix.field = V4L2_FIELD_NONE; /* Always progressive image */
PDEBUG(DBG_IOCTL, "VIDIOC_G_FMT w=%d, h=%d, format=%s",
vf->fmt.pix.width, vf->fmt.pix.height,usbvision->palette.desc);
return 0;
}
default:
PDEBUG(DBG_IOCTL, "VIDIOC_G_FMT invalid type %d",vf->type);
return -EINVAL;
}
return 0; return 0;
} }
case VIDIOC_TRY_FMT:
case VIDIOC_S_FMT: static int vidioc_try_fmt_cap (struct file *file, void *priv,
{ struct v4l2_format *vf)
struct v4l2_format *vf = arg; {
int formatIdx,ret; struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int formatIdx;
switch(vf->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
{
/* Find requested format in available ones */ /* Find requested format in available ones */
for(formatIdx=0;formatIdx<USBVISION_SUPPORTED_PALETTES;formatIdx++) { for(formatIdx=0;formatIdx<USBVISION_SUPPORTED_PALETTES;formatIdx++) {
if(vf->fmt.pix.pixelformat == usbvision_v4l2_format[formatIdx].format) { if(vf->fmt.pix.pixelformat ==
usbvision_v4l2_format[formatIdx].format) {
usbvision->palette = usbvision_v4l2_format[formatIdx]; usbvision->palette = usbvision_v4l2_format[formatIdx];
break; break;
} }
...@@ -1026,13 +1066,23 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -1026,13 +1066,23 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
RESTRICT_TO_RANGE(vf->fmt.pix.width, MIN_FRAME_WIDTH, MAX_FRAME_WIDTH); RESTRICT_TO_RANGE(vf->fmt.pix.width, MIN_FRAME_WIDTH, MAX_FRAME_WIDTH);
RESTRICT_TO_RANGE(vf->fmt.pix.height, MIN_FRAME_HEIGHT, MAX_FRAME_HEIGHT); RESTRICT_TO_RANGE(vf->fmt.pix.height, MIN_FRAME_HEIGHT, MAX_FRAME_HEIGHT);
vf->fmt.pix.bytesperline = vf->fmt.pix.width*usbvision->palette.bytes_per_pixel; vf->fmt.pix.bytesperline = vf->fmt.pix.width*
usbvision->palette.bytes_per_pixel;
vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*vf->fmt.pix.height; vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*vf->fmt.pix.height;
if(cmd == VIDIOC_TRY_FMT) {
PDEBUG(DBG_IOCTL, "VIDIOC_TRY_FMT grabdisplay w=%d, h=%d, format=%s",
vf->fmt.pix.width, vf->fmt.pix.height,usbvision->palette.desc);
return 0; return 0;
}
static int vidioc_s_fmt_cap(struct file *file, void *priv,
struct v4l2_format *vf)
{
struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int ret;
if( 0 != (ret=vidioc_try_fmt_cap (file, priv, vf)) ) {
return ret;
} }
/* stop io in case it is already in progress */ /* stop io in case it is already in progress */
...@@ -1045,53 +1095,38 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, ...@@ -1045,53 +1095,38 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
usbvision->curFrame = NULL; usbvision->curFrame = NULL;
// by now we are committed to the new data... /* by now we are committed to the new data... */
down(&usbvision->lock); down(&usbvision->lock);
usbvision_set_output(usbvision, vf->fmt.pix.width, vf->fmt.pix.height); usbvision_set_output(usbvision, vf->fmt.pix.width, vf->fmt.pix.height);
up(&usbvision->lock); up(&usbvision->lock);
PDEBUG(DBG_IOCTL, "VIDIOC_S_FMT grabdisplay w=%d, h=%d, format=%s",
vf->fmt.pix.width, vf->fmt.pix.height,usbvision->palette.desc);
return 0; return 0;
}
default:
return -EINVAL;
}
}
default:
return -ENOIOCTLCMD;
}
return 0;
}
static int usbvision_v4l2_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, usbvision_v4l2_do_ioctl);
} }
static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf, static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev); struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int noblock = file->f_flags & O_NONBLOCK; int noblock = file->f_flags & O_NONBLOCK;
unsigned long lock_flags; unsigned long lock_flags;
int ret,i; int ret,i;
struct usbvision_frame *frame; struct usbvision_frame *frame;
PDEBUG(DBG_IO, "%s: %ld bytes, noblock=%d", __FUNCTION__, (unsigned long)count, noblock); PDEBUG(DBG_IO, "%s: %ld bytes, noblock=%d", __FUNCTION__,
(unsigned long)count, noblock);
if (!USBVISION_IS_OPERATIONAL(usbvision) || (buf == NULL)) if (!USBVISION_IS_OPERATIONAL(usbvision) || (buf == NULL))
return -EFAULT; return -EFAULT;
/* This entry point is compatible with the mmap routines so that a user can do either /* This entry point is compatible with the mmap routines
VIDIOC_QBUF/VIDIOC_DQBUF to get frames or call read on the device. */ so that a user can do either VIDIOC_QBUF/VIDIOC_DQBUF
to get frames or call read on the device. */
if(!usbvision->num_frames) { if(!usbvision->num_frames) {
/* First, allocate some frames to work with if this has not been done with /* First, allocate some frames to work with
VIDIOC_REQBUF */ if this has not been done with VIDIOC_REQBUF */
usbvision_frames_free(usbvision); usbvision_frames_free(usbvision);
usbvision_empty_framequeues(usbvision); usbvision_empty_framequeues(usbvision);
usbvision_frames_alloc(usbvision,USBVISION_NUMFRAMES); usbvision_frames_alloc(usbvision,USBVISION_NUMFRAMES);
...@@ -1103,21 +1138,24 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf, ...@@ -1103,21 +1138,24 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
call_i2c_clients(usbvision,VIDIOC_STREAMON , NULL); call_i2c_clients(usbvision,VIDIOC_STREAMON , NULL);
} }
/* Then, enqueue as many frames as possible (like a user of VIDIOC_QBUF would do) */ /* Then, enqueue as many frames as possible
(like a user of VIDIOC_QBUF would do) */
for(i=0;i<usbvision->num_frames;i++) { for(i=0;i<usbvision->num_frames;i++) {
frame = &usbvision->frame[i]; frame = &usbvision->frame[i];
if(frame->grabstate == FrameState_Unused) { if(frame->grabstate == FrameState_Unused) {
/* Mark it as ready and enqueue frame */ /* Mark it as ready and enqueue frame */
frame->grabstate = FrameState_Ready; frame->grabstate = FrameState_Ready;
frame->scanstate = ScanState_Scanning; frame->scanstate = ScanState_Scanning;
frame->scanlength = 0; /* Accumulated in usbvision_parse_data() */ /* Accumulated in usbvision_parse_data() */
frame->scanlength = 0;
/* set v4l2_format index */ /* set v4l2_format index */
frame->v4l2_format = usbvision->palette; frame->v4l2_format = usbvision->palette;
spin_lock_irqsave(&usbvision->queue_lock, lock_flags); spin_lock_irqsave(&usbvision->queue_lock, lock_flags);
list_add_tail(&frame->frame, &usbvision->inqueue); list_add_tail(&frame->frame, &usbvision->inqueue);
spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags); spin_unlock_irqrestore(&usbvision->queue_lock,
lock_flags);
} }
} }
...@@ -1145,7 +1183,8 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf, ...@@ -1145,7 +1183,8 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
return 0; return 0;
} }
PDEBUG(DBG_IO, "%s: frmx=%d, bytes_read=%ld, scanlength=%ld", __FUNCTION__, PDEBUG(DBG_IO, "%s: frmx=%d, bytes_read=%ld, scanlength=%ld",
__FUNCTION__,
frame->index, frame->bytes_read, frame->scanlength); frame->index, frame->bytes_read, frame->scanlength);
/* copy bytes to user space; we allow for partials reads */ /* copy bytes to user space; we allow for partials reads */
...@@ -1157,10 +1196,11 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf, ...@@ -1157,10 +1196,11 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
} }
frame->bytes_read += count; frame->bytes_read += count;
PDEBUG(DBG_IO, "%s: {copy} count used=%ld, new bytes_read=%ld", __FUNCTION__, PDEBUG(DBG_IO, "%s: {copy} count used=%ld, new bytes_read=%ld",
__FUNCTION__,
(unsigned long)count, frame->bytes_read); (unsigned long)count, frame->bytes_read);
// For now, forget the frame if it has not been read in one shot. /* For now, forget the frame if it has not been read in one shot. */
/* if (frame->bytes_read >= frame->scanlength) {// All data has been read */ /* if (frame->bytes_read >= frame->scanlength) {// All data has been read */
frame->bytes_read = 0; frame->bytes_read = 0;
...@@ -1179,7 +1219,8 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1179,7 +1219,8 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
u32 i; u32 i;
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev); struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
PDEBUG(DBG_MMAP, "mmap"); PDEBUG(DBG_MMAP, "mmap");
...@@ -1197,11 +1238,13 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1197,11 +1238,13 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
} }
for (i = 0; i < usbvision->num_frames; i++) { for (i = 0; i < usbvision->num_frames; i++) {
if (((PAGE_ALIGN(usbvision->max_frame_size)*i) >> PAGE_SHIFT) == vma->vm_pgoff) if (((PAGE_ALIGN(usbvision->max_frame_size)*i) >> PAGE_SHIFT) ==
vma->vm_pgoff)
break; break;
} }
if (i == usbvision->num_frames) { if (i == usbvision->num_frames) {
PDEBUG(DBG_MMAP, "mmap: user supplied mapping address is out of range"); PDEBUG(DBG_MMAP,
"mmap: user supplied mapping address is out of range");
up(&usbvision->lock); up(&usbvision->lock);
return -EINVAL; return -EINVAL;
} }
...@@ -1235,7 +1278,8 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1235,7 +1278,8 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
static int usbvision_radio_open(struct inode *inode, struct file *file) static int usbvision_radio_open(struct inode *inode, struct file *file)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev); struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int errCode = 0; int errCode = 0;
PDEBUG(DBG_IO, "%s:", __FUNCTION__); PDEBUG(DBG_IO, "%s:", __FUNCTION__);
...@@ -1284,7 +1328,8 @@ static int usbvision_radio_open(struct inode *inode, struct file *file) ...@@ -1284,7 +1328,8 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)
static int usbvision_radio_close(struct inode *inode, struct file *file) static int usbvision_radio_close(struct inode *inode, struct file *file)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev); struct usb_usbvision *usbvision =
(struct usb_usbvision *) video_get_drvdata(dev);
int errCode = 0; int errCode = 0;
PDEBUG(DBG_IO, ""); PDEBUG(DBG_IO, "");
...@@ -1318,13 +1363,6 @@ static int usbvision_radio_close(struct inode *inode, struct file *file) ...@@ -1318,13 +1363,6 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
return errCode; return errCode;
} }
static int usbvision_radio_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, usbvision_v4l2_do_ioctl);
}
/* /*
* Here comes the stuff for vbi on usbvision based devices * Here comes the stuff for vbi on usbvision based devices
* *
...@@ -1332,21 +1370,21 @@ static int usbvision_radio_ioctl(struct inode *inode, struct file *file, ...@@ -1332,21 +1370,21 @@ static int usbvision_radio_ioctl(struct inode *inode, struct file *file,
static int usbvision_vbi_open(struct inode *inode, struct file *file) static int usbvision_vbi_open(struct inode *inode, struct file *file)
{ {
/* TODO */ /* TODO */
return -EINVAL; return -ENODEV;
} }
static int usbvision_vbi_close(struct inode *inode, struct file *file) static int usbvision_vbi_close(struct inode *inode, struct file *file)
{ {
/* TODO */ /* TODO */
return -EINVAL; return -ENODEV;
} }
static int usbvision_do_vbi_ioctl(struct inode *inode, struct file *file, static int usbvision_do_vbi_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg) unsigned int cmd, void *arg)
{ {
/* TODO */ /* TODO */
return -EINVAL; return -ENOIOCTLCMD;
} }
static int usbvision_vbi_ioctl(struct inode *inode, struct file *file, static int usbvision_vbi_ioctl(struct inode *inode, struct file *file,
...@@ -1367,8 +1405,11 @@ static const struct file_operations usbvision_fops = { ...@@ -1367,8 +1405,11 @@ static const struct file_operations usbvision_fops = {
.release = usbvision_v4l2_close, .release = usbvision_v4l2_close,
.read = usbvision_v4l2_read, .read = usbvision_v4l2_read,
.mmap = usbvision_v4l2_mmap, .mmap = usbvision_v4l2_mmap,
.ioctl = usbvision_v4l2_ioctl, .ioctl = video_ioctl2,
.llseek = no_llseek, .llseek = no_llseek,
/* .poll = video_poll, */
.mmap = usbvision_v4l2_mmap,
.compat_ioctl = v4l_compat_ioctl32,
}; };
static struct video_device usbvision_video_template = { static struct video_device usbvision_video_template = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -1378,6 +1419,39 @@ static struct video_device usbvision_video_template = { ...@@ -1378,6 +1419,39 @@ static struct video_device usbvision_video_template = {
.name = "usbvision-video", .name = "usbvision-video",
.release = video_device_release, .release = video_device_release,
.minor = -1, .minor = -1,
.vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap,
.vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf,
.vidioc_dqbuf = vidioc_dqbuf,
.vidioc_s_std = vidioc_s_std,
.vidioc_enum_input = vidioc_enum_input,
.vidioc_g_input = vidioc_g_input,
.vidioc_s_input = vidioc_s_input,
.vidioc_queryctrl = vidioc_queryctrl,
.vidioc_g_audio = vidioc_g_audio,
.vidioc_g_audio = vidioc_s_audio,
.vidioc_g_ctrl = vidioc_g_ctrl,
.vidioc_s_ctrl = vidioc_s_ctrl,
.vidioc_streamon = vidioc_streamon,
.vidioc_streamoff = vidioc_streamoff,
#ifdef CONFIG_VIDEO_V4L1_COMPAT
/* .vidiocgmbuf = vidiocgmbuf, */
#endif
.vidioc_g_tuner = vidioc_g_tuner,
.vidioc_s_tuner = vidioc_s_tuner,
.vidioc_g_frequency = vidioc_g_frequency,
.vidioc_s_frequency = vidioc_s_frequency,
#ifdef CONFIG_VIDEO_ADV_DEBUG
.vidioc_g_register = vidioc_g_register,
.vidioc_s_register = vidioc_s_register,
#endif
.tvnorms = USBVISION_NORMS,
.current_norm = V4L2_STD_PAL
}; };
...@@ -1386,8 +1460,9 @@ static const struct file_operations usbvision_radio_fops = { ...@@ -1386,8 +1460,9 @@ static const struct file_operations usbvision_radio_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = usbvision_radio_open, .open = usbvision_radio_open,
.release = usbvision_radio_close, .release = usbvision_radio_close,
.ioctl = usbvision_radio_ioctl, .ioctl = video_ioctl2,
.llseek = no_llseek, .llseek = no_llseek,
.compat_ioctl = v4l_compat_ioctl32,
}; };
static struct video_device usbvision_radio_template= static struct video_device usbvision_radio_template=
...@@ -1396,12 +1471,27 @@ static struct video_device usbvision_radio_template= ...@@ -1396,12 +1471,27 @@ static struct video_device usbvision_radio_template=
.type = VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
.hardware = VID_HARDWARE_USBVISION, .hardware = VID_HARDWARE_USBVISION,
.fops = &usbvision_radio_fops, .fops = &usbvision_radio_fops,
.release = video_device_release,
.name = "usbvision-radio", .name = "usbvision-radio",
.release = video_device_release,
.minor = -1, .minor = -1,
.vidioc_querycap = vidioc_querycap,
.vidioc_enum_input = vidioc_enum_input,
.vidioc_g_input = vidioc_g_input,
.vidioc_s_input = vidioc_s_input,
.vidioc_queryctrl = vidioc_queryctrl,
.vidioc_g_audio = vidioc_g_audio,
.vidioc_g_audio = vidioc_s_audio,
.vidioc_g_ctrl = vidioc_g_ctrl,
.vidioc_s_ctrl = vidioc_s_ctrl,
.vidioc_g_tuner = vidioc_g_tuner,
.vidioc_s_tuner = vidioc_s_tuner,
.vidioc_g_frequency = vidioc_g_frequency,
.vidioc_s_frequency = vidioc_s_frequency,
.tvnorms = USBVISION_NORMS,
.current_norm = V4L2_STD_PAL
}; };
// vbi template // vbi template
static const struct file_operations usbvision_vbi_fops = { static const struct file_operations usbvision_vbi_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -1409,6 +1499,7 @@ static const struct file_operations usbvision_vbi_fops = { ...@@ -1409,6 +1499,7 @@ static const struct file_operations usbvision_vbi_fops = {
.release = usbvision_vbi_close, .release = usbvision_vbi_close,
.ioctl = usbvision_vbi_ioctl, .ioctl = usbvision_vbi_ioctl,
.llseek = no_llseek, .llseek = no_llseek,
.compat_ioctl = v4l_compat_ioctl32,
}; };
static struct video_device usbvision_vbi_template= static struct video_device usbvision_vbi_template=
...@@ -1452,11 +1543,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision) ...@@ -1452,11 +1543,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
{ {
// vbi Device: // vbi Device:
if (usbvision->vbi) { if (usbvision->vbi) {
PDEBUG(DBG_PROBE, "unregister /dev/vbi%d [v4l2]", usbvision->vbi->minor & 0x1f); PDEBUG(DBG_PROBE, "unregister /dev/vbi%d [v4l2]",
usbvision->vbi->minor & 0x1f);
if (usbvision->vbi->minor != -1) { if (usbvision->vbi->minor != -1) {
video_unregister_device(usbvision->vbi); video_unregister_device(usbvision->vbi);
} } else {
else {
video_device_release(usbvision->vbi); video_device_release(usbvision->vbi);
} }
usbvision->vbi = NULL; usbvision->vbi = NULL;
...@@ -1464,11 +1555,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision) ...@@ -1464,11 +1555,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
// Radio Device: // Radio Device:
if (usbvision->rdev) { if (usbvision->rdev) {
PDEBUG(DBG_PROBE, "unregister /dev/radio%d [v4l2]", usbvision->rdev->minor & 0x1f); PDEBUG(DBG_PROBE, "unregister /dev/radio%d [v4l2]",
usbvision->rdev->minor & 0x1f);
if (usbvision->rdev->minor != -1) { if (usbvision->rdev->minor != -1) {
video_unregister_device(usbvision->rdev); video_unregister_device(usbvision->rdev);
} } else {
else {
video_device_release(usbvision->rdev); video_device_release(usbvision->rdev);
} }
usbvision->rdev = NULL; usbvision->rdev = NULL;
...@@ -1476,11 +1567,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision) ...@@ -1476,11 +1567,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
// Video Device: // Video Device:
if (usbvision->vdev) { if (usbvision->vdev) {
PDEBUG(DBG_PROBE, "unregister /dev/video%d [v4l2]", usbvision->vdev->minor & 0x1f); PDEBUG(DBG_PROBE, "unregister /dev/video%d [v4l2]",
usbvision->vdev->minor & 0x1f);
if (usbvision->vdev->minor != -1) { if (usbvision->vdev->minor != -1) {
video_unregister_device(usbvision->vdev); video_unregister_device(usbvision->vdev);
} } else {
else {
video_device_release(usbvision->vdev); video_device_release(usbvision->vdev);
} }
usbvision->vdev = NULL; usbvision->vdev = NULL;
...@@ -1491,37 +1582,52 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision) ...@@ -1491,37 +1582,52 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
static int __devinit usbvision_register_video(struct usb_usbvision *usbvision) static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
{ {
// Video Device: // Video Device:
usbvision->vdev = usbvision_vdev_init(usbvision, &usbvision_video_template, "USBVision Video"); usbvision->vdev = usbvision_vdev_init(usbvision,
&usbvision_video_template,
"USBVision Video");
if (usbvision->vdev == NULL) { if (usbvision->vdev == NULL) {
goto err_exit; goto err_exit;
} }
if (video_register_device(usbvision->vdev, VFL_TYPE_GRABBER, video_nr)<0) { if (video_register_device(usbvision->vdev,
VFL_TYPE_GRABBER,
video_nr)<0) {
goto err_exit; goto err_exit;
} }
printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n", usbvision->nr,usbvision->vdev->minor & 0x1f); printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n",
usbvision->nr,usbvision->vdev->minor & 0x1f);
// Radio Device: // Radio Device:
if (usbvision_device_data[usbvision->DevModel].Radio) { if (usbvision_device_data[usbvision->DevModel].Radio) {
// usbvision has radio // usbvision has radio
usbvision->rdev = usbvision_vdev_init(usbvision, &usbvision_radio_template, "USBVision Radio"); usbvision->rdev = usbvision_vdev_init(usbvision,
&usbvision_radio_template,
"USBVision Radio");
if (usbvision->rdev == NULL) { if (usbvision->rdev == NULL) {
goto err_exit; goto err_exit;
} }
if (video_register_device(usbvision->rdev, VFL_TYPE_RADIO, radio_nr)<0) { if (video_register_device(usbvision->rdev,
VFL_TYPE_RADIO,
radio_nr)<0) {
goto err_exit; goto err_exit;
} }
printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n", usbvision->nr, usbvision->rdev->minor & 0x1f); printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n",
usbvision->nr, usbvision->rdev->minor & 0x1f);
} }
// vbi Device: // vbi Device:
if (usbvision_device_data[usbvision->DevModel].vbi) { if (usbvision_device_data[usbvision->DevModel].vbi) {
usbvision->vbi = usbvision_vdev_init(usbvision, &usbvision_vbi_template, "USBVision VBI"); usbvision->vbi = usbvision_vdev_init(usbvision,
&usbvision_vbi_template,
"USBVision VBI");
if (usbvision->vdev == NULL) { if (usbvision->vdev == NULL) {
goto err_exit; goto err_exit;
} }
if (video_register_device(usbvision->vbi, VFL_TYPE_VBI, vbi_nr)<0) { if (video_register_device(usbvision->vbi,
VFL_TYPE_VBI,
vbi_nr)<0) {
goto err_exit; goto err_exit;
} }
printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n", usbvision->nr,usbvision->vbi->minor & 0x1f); printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n",
usbvision->nr,usbvision->vbi->minor & 0x1f);
} }
// all done // all done
return 0; return 0;
...@@ -1535,7 +1641,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision) ...@@ -1535,7 +1641,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
/* /*
* usbvision_alloc() * usbvision_alloc()
* *
* This code allocates the struct usb_usbvision. It is filled with default values. * This code allocates the struct usb_usbvision.
* It is filled with default values.
* *
* Returns NULL on error, a pointer to usb_usbvision else. * Returns NULL on error, a pointer to usb_usbvision else.
* *
...@@ -1544,7 +1651,8 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev) ...@@ -1544,7 +1651,8 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
{ {
struct usb_usbvision *usbvision; struct usb_usbvision *usbvision;
if ((usbvision = kzalloc(sizeof(struct usb_usbvision), GFP_KERNEL)) == NULL) { if ((usbvision = kzalloc(sizeof(struct usb_usbvision), GFP_KERNEL)) ==
NULL) {
goto err_exit; goto err_exit;
} }
...@@ -1606,11 +1714,11 @@ static void usbvision_release(struct usb_usbvision *usbvision) ...@@ -1606,11 +1714,11 @@ static void usbvision_release(struct usb_usbvision *usbvision)
} }
/******************************** usb interface *****************************************/ /*********************** usb interface **********************************/
static void usbvision_configure_video(struct usb_usbvision *usbvision) static void usbvision_configure_video(struct usb_usbvision *usbvision)
{ {
int model,i; int model;
if (usbvision == NULL) if (usbvision == NULL)
return; return;
...@@ -1619,25 +1727,23 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision) ...@@ -1619,25 +1727,23 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision)
usbvision->palette = usbvision_v4l2_format[2]; // V4L2_PIX_FMT_RGB24; usbvision->palette = usbvision_v4l2_format[2]; // V4L2_PIX_FMT_RGB24;
if (usbvision_device_data[usbvision->DevModel].Vin_Reg2_override) { if (usbvision_device_data[usbvision->DevModel].Vin_Reg2_override) {
usbvision->Vin_Reg2_Preset = usbvision_device_data[usbvision->DevModel].Vin_Reg2; usbvision->Vin_Reg2_Preset =
usbvision_device_data[usbvision->DevModel].Vin_Reg2;
} else { } else {
usbvision->Vin_Reg2_Preset = 0; usbvision->Vin_Reg2_Preset = 0;
} }
for (i = 0; i < TVNORMS; i++) usbvision->tvnormId = usbvision_device_data[model].VideoNorm;
if (usbvision_device_data[model].VideoNorm == tvnorms[i].mode)
break;
if (i == TVNORMS)
i = 0;
usbvision->tvnorm = &tvnorms[i]; /* set default norm */
usbvision->video_inputs = usbvision_device_data[model].VideoChannels; usbvision->video_inputs = usbvision_device_data[model].VideoChannels;
usbvision->ctl_input = 0; usbvision->ctl_input = 0;
/* This should be here to make i2c clients to be able to register */ /* This should be here to make i2c clients to be able to register */
usbvision_audio_off(usbvision); //first switch off audio /* first switch off audio */
usbvision_audio_off(usbvision);
if (!PowerOnAtOpen) { if (!PowerOnAtOpen) {
usbvision_power_on(usbvision); //and then power up the noisy tuner /* and then power up the noisy tuner */
usbvision_power_on(usbvision);
usbvision_i2c_register(usbvision); usbvision_i2c_register(usbvision);
} }
} }
...@@ -1674,18 +1780,22 @@ static int __devinit usbvision_probe(struct usb_interface *intf, ...@@ -1674,18 +1780,22 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
if (usbvision_device_data[model].Interface >= 0) { if (usbvision_device_data[model].Interface >= 0) {
interface = &dev->actconfig->interface[usbvision_device_data[model].Interface]->altsetting[0]; interface = &dev->actconfig->interface[usbvision_device_data[model].Interface]->altsetting[0];
} } else {
else {
interface = &dev->actconfig->interface[ifnum]->altsetting[0]; interface = &dev->actconfig->interface[ifnum]->altsetting[0];
} }
endpoint = &interface->endpoint[1].desc; endpoint = &interface->endpoint[1].desc;
if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC) { if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
err("%s: interface %d. has non-ISO endpoint!", __FUNCTION__, ifnum); USB_ENDPOINT_XFER_ISOC) {
err("%s: Endpoint attributes %d", __FUNCTION__, endpoint->bmAttributes); err("%s: interface %d. has non-ISO endpoint!",
__FUNCTION__, ifnum);
err("%s: Endpoint attributes %d",
__FUNCTION__, endpoint->bmAttributes);
return -ENODEV; return -ENODEV;
} }
if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) { if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
err("%s: interface %d. has ISO OUT endpoint!", __FUNCTION__, ifnum); USB_DIR_OUT) {
err("%s: interface %d. has ISO OUT endpoint!",
__FUNCTION__, ifnum);
return -ENODEV; return -ENODEV;
} }
...@@ -1696,11 +1806,9 @@ static int __devinit usbvision_probe(struct usb_interface *intf, ...@@ -1696,11 +1806,9 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
if (dev->descriptor.bNumConfigurations > 1) { if (dev->descriptor.bNumConfigurations > 1) {
usbvision->bridgeType = BRIDGE_NT1004; usbvision->bridgeType = BRIDGE_NT1004;
} } else if (model == DAZZLE_DVC_90_REV_1_SECAM) {
else if (model == DAZZLE_DVC_90_REV_1_SECAM) {
usbvision->bridgeType = BRIDGE_NT1005; usbvision->bridgeType = BRIDGE_NT1005;
} } else {
else {
usbvision->bridgeType = BRIDGE_NT1003; usbvision->bridgeType = BRIDGE_NT1003;
} }
PDEBUG(DBG_PROBE, "bridgeType %d", usbvision->bridgeType); PDEBUG(DBG_PROBE, "bridgeType %d", usbvision->bridgeType);
...@@ -1797,11 +1905,11 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf) ...@@ -1797,11 +1905,11 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
up(&usbvision->lock); up(&usbvision->lock);
if (usbvision->user) { if (usbvision->user) {
printk(KERN_INFO "%s: In use, disconnect pending\n", __FUNCTION__); printk(KERN_INFO "%s: In use, disconnect pending\n",
__FUNCTION__);
wake_up_interruptible(&usbvision->wait_frame); wake_up_interruptible(&usbvision->wait_frame);
wake_up_interruptible(&usbvision->wait_stream); wake_up_interruptible(&usbvision->wait_stream);
} } else {
else {
usbvision_release(usbvision); usbvision_release(usbvision);
} }
...@@ -1828,7 +1936,6 @@ static int __init usbvision_init(void) ...@@ -1828,7 +1936,6 @@ static int __init usbvision_init(void)
PDEBUG(DBG_PROBE, ""); PDEBUG(DBG_PROBE, "");
PDEBUG(DBG_IOCTL, "IOCTL debugging is enabled [video]");
PDEBUG(DBG_IO, "IO debugging is enabled [video]"); PDEBUG(DBG_IO, "IO debugging is enabled [video]");
PDEBUG(DBG_PROBE, "PROBE debugging is enabled [video]"); PDEBUG(DBG_PROBE, "PROBE debugging is enabled [video]");
PDEBUG(DBG_MMAP, "MMAP debugging is enabled [video]"); PDEBUG(DBG_MMAP, "MMAP debugging is enabled [video]");
......
drivers/media/video/usbvision/usbvision.h
View file @ c5f48367
...@@ -221,6 +221,8 @@ enum { ...@@ -221,6 +221,8 @@ enum {
#define I2C_USB_ADAP_MAX 16 #define I2C_USB_ADAP_MAX 16
#define USBVISION_NORMS (V4L2_STD_PAL | V4L2_STD_NTSC | V4L2_STD_SECAM | V4L2_STD_PAL_M)
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
/* usbvision video structures */ /* usbvision video structures */
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
...@@ -301,14 +303,6 @@ struct usbvision_frame_header { ...@@ -301,14 +303,6 @@ struct usbvision_frame_header {
__u16 frameHeight; /* 10 - 11 after endian correction*/ __u16 frameHeight; /* 10 - 11 after endian correction*/
}; };
/* tvnorms */
struct usbvision_tvnorm {
char *name;
v4l2_std_id id;
/* mode for saa7113h */
int mode;
};
struct usbvision_frame { struct usbvision_frame {
char *data; /* Frame buffer */ char *data; /* Frame buffer */
struct usbvision_frame_header isocHeader; /* Header from stream */ struct usbvision_frame_header isocHeader; /* Header from stream */
...@@ -441,7 +435,7 @@ struct usb_usbvision { ...@@ -441,7 +435,7 @@ struct usb_usbvision {
struct v4l2_capability vcap; /* Video capabilities */ struct v4l2_capability vcap; /* Video capabilities */
unsigned int ctl_input; /* selected input */ unsigned int ctl_input; /* selected input */
struct usbvision_tvnorm *tvnorm; /* selected tv norm */ v4l2_std_id tvnormId; /* selected tv norm */
unsigned char video_endp; /* 0x82 for USBVISION devices based */ unsigned char video_endp; /* 0x82 for USBVISION devices based */
// Decompression stuff: // Decompression stuff:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7