mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
V4L/DVB (3269): ioctls cleanups.
- Now, all internal ioctls are at v4l2-common.h - removed unused ioctl at saa6752hs.h - all debug ioctl code moved to v4l2-common.c - removed duplicated stuff from other cards Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
This commit is contained in:
1 parent
37bdfa06b6
commit
5e453dc757
31 files changed
+267
-286
No files matched your search
@@ -38,6 +38,7 @@
|
||||
#include <asm/io.h>
|
||||
|
||||
#include "bttvp.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
/* fwd decl */
|
||||
static void boot_msp34xx(struct bttv *btv, int pin);
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/kdev_t.h>
|
||||
#include "bttvp.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
@@ -1520,14 +1521,6 @@ static struct videobuf_queue_ops bttv_video_qops = {
|
||||
.buf_release = buffer_release,
|
||||
};
|
||||
|
||||
static const char *v4l1_ioctls[] = {
|
||||
"?", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT",
|
||||
"CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ",
|
||||
"SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT",
|
||||
"GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO",
|
||||
"SMICROCODE", "GVBIFMT", "SVBIFMT" };
|
||||
#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
|
||||
|
||||
static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
|
||||
{
|
||||
switch (cmd) {
|
||||
@@ -2216,22 +2209,9 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned long flags;
|
||||
int retval = 0;
|
||||
|
||||
if (bttv_debug > 1) {
|
||||
switch (_IOC_TYPE(cmd)) {
|
||||
case 'v':
|
||||
printk("bttv%d: ioctl 0x%x (v4l1, VIDIOC%s)\n",
|
||||
btv->c.nr, cmd, (_IOC_NR(cmd) < V4L1_IOCTLS) ?
|
||||
v4l1_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
case 'V':
|
||||
printk("bttv%d: ioctl 0x%x (v4l2, %s)\n",
|
||||
btv->c.nr, cmd, v4l2_ioctl_names[_IOC_NR(cmd)]);
|
||||
break;
|
||||
default:
|
||||
printk("bttv%d: ioctl 0x%x (???)\n",
|
||||
btv->c.nr, cmd);
|
||||
}
|
||||
}
|
||||
if (bttv_debug > 1)
|
||||
v4l_print_ioctl(btv->c.name, cmd);
|
||||
|
||||
if (btv->errors)
|
||||
bttv_reinit_bt848(btv);
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <linux/delay.h>
|
||||
|
||||
#include "bttvp.h"
|
||||
#include <media/v4l2-common.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <linux/firmware.h>
|
||||
|
||||
#include "cx88.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards");
|
||||
MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>, Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
|
||||
@@ -1374,7 +1375,7 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
|
||||
struct cx88_core *core = dev->core;
|
||||
|
||||
if (debug > 1)
|
||||
cx88_print_ioctl(core->name,cmd);
|
||||
v4l_print_ioctl(core->name,cmd);
|
||||
|
||||
switch (cmd) {
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <linux/videodev2.h>
|
||||
|
||||
#include "cx88.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
|
||||
MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
|
||||
@@ -76,60 +77,6 @@ static unsigned int cx88_devcount;
|
||||
static LIST_HEAD(cx88_devlist);
|
||||
static DECLARE_MUTEX(devlist);
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* debug help functions */
|
||||
|
||||
static const char *v4l1_ioctls[] = {
|
||||
"0", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT",
|
||||
"CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ",
|
||||
"SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT",
|
||||
"GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO",
|
||||
"SMICROCODE", "GVBIFMT", "SVBIFMT" };
|
||||
#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
|
||||
|
||||
static const char *v4l2_ioctls[] = {
|
||||
"QUERYCAP", "1", "ENUM_PIXFMT", "ENUM_FBUFFMT", "G_FMT", "S_FMT",
|
||||
"G_COMP", "S_COMP", "REQBUFS", "QUERYBUF", "G_FBUF", "S_FBUF",
|
||||
"G_WIN", "S_WIN", "PREVIEW", "QBUF", "16", "DQBUF", "STREAMON",
|
||||
"STREAMOFF", "G_PERF", "G_PARM", "S_PARM", "G_STD", "S_STD",
|
||||
"ENUMSTD", "ENUMINPUT", "G_CTRL", "S_CTRL", "G_TUNER", "S_TUNER",
|
||||
"G_FREQ", "S_FREQ", "G_AUDIO", "S_AUDIO", "35", "QUERYCTRL",
|
||||
"QUERYMENU", "G_INPUT", "S_INPUT", "ENUMCVT", "41", "42", "43",
|
||||
"44", "45", "G_OUTPUT", "S_OUTPUT", "ENUMOUTPUT", "G_AUDOUT",
|
||||
"S_AUDOUT", "ENUMFX", "G_EFFECT", "S_EFFECT", "G_MODULATOR",
|
||||
"S_MODULATOR"
|
||||
};
|
||||
#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
|
||||
|
||||
void cx88_print_ioctl(char *name, unsigned int cmd)
|
||||
{
|
||||
char *dir;
|
||||
|
||||
switch (_IOC_DIR(cmd)) {
|
||||
case _IOC_NONE: dir = "--"; break;
|
||||
case _IOC_READ: dir = "r-"; break;
|
||||
case _IOC_WRITE: dir = "-w"; break;
|
||||
case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
|
||||
default: dir = "??"; break;
|
||||
}
|
||||
switch (_IOC_TYPE(cmd)) {
|
||||
case 'v':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l1, %s, VIDIOC%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < V4L1_IOCTLS) ?
|
||||
v4l1_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
case 'V':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l2, %s, VIDIOC_%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < V4L2_IOCTLS) ?
|
||||
v4l2_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
default:
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n",
|
||||
name, cmd, dir, _IOC_NR(cmd));
|
||||
}
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
#define NO_SYNC_LINE (-1U)
|
||||
|
||||
static u32* cx88_risc_field(u32 *rp, struct scatterlist *sglist,
|
||||
@@ -1208,7 +1155,6 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci)
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
EXPORT_SYMBOL(cx88_print_ioctl);
|
||||
EXPORT_SYMBOL(cx88_print_irqbits);
|
||||
|
||||
EXPORT_SYMBOL(cx88_core_irq);
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include "cx88.h"
|
||||
#include "dvb-pll.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
#ifdef HAVE_MT352
|
||||
# include "mt352.h"
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <asm/io.h>
|
||||
|
||||
#include "cx88.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
static unsigned int i2c_debug = 0;
|
||||
module_param(i2c_debug, int, 0644);
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <asm/div64.h>
|
||||
|
||||
#include "cx88.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
/* Include V4L1 specific functions. Should be removed soon */
|
||||
#include <linux/videodev.h>
|
||||
@@ -1118,7 +1119,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
|
||||
int err;
|
||||
|
||||
if (video_debug > 1)
|
||||
cx88_print_ioctl(core->name,cmd);
|
||||
v4l_print_ioctl(core->name,cmd);
|
||||
switch (cmd) {
|
||||
|
||||
/* --- capabilities ------------------------------------------ */
|
||||
@@ -1254,7 +1255,7 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
|
||||
|
||||
dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
|
||||
if (video_debug > 1)
|
||||
cx88_print_ioctl(core->name,cmd);
|
||||
v4l_print_ioctl(core->name,cmd);
|
||||
|
||||
switch (cmd) {
|
||||
/* ---------- tv norms ---------- */
|
||||
@@ -1474,7 +1475,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
|
||||
struct cx88_core *core = dev->core;
|
||||
|
||||
if (video_debug > 1)
|
||||
cx88_print_ioctl(core->name,cmd);
|
||||
v4l_print_ioctl(core->name,cmd);
|
||||
|
||||
switch (cmd) {
|
||||
case VIDIOC_QUERYCAP:
|
||||
|
||||
@@ -461,7 +461,6 @@ struct cx8802_dev {
|
||||
|
||||
extern void cx88_print_irqbits(char *name, char *tag, char **strings,
|
||||
u32 bits, u32 mask);
|
||||
extern void cx88_print_ioctl(char *name, unsigned int cmd);
|
||||
|
||||
extern int cx88_core_irq(struct cx88_core *core, u32 status);
|
||||
extern void cx88_wakeup(struct cx88_core *core,
|
||||
|
||||
@@ -63,59 +63,6 @@ static int alt = EM28XX_PINOUT;
|
||||
module_param(alt, int, 0644);
|
||||
MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* debug help functions */
|
||||
|
||||
static const char *v4l1_ioctls[] = {
|
||||
"0", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT",
|
||||
"CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ",
|
||||
"SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT",
|
||||
"GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO",
|
||||
"SMICROCODE", "GVBIFMT", "SVBIFMT" };
|
||||
#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
|
||||
|
||||
static const char *v4l2_ioctls[] = {
|
||||
"QUERYCAP", "1", "ENUM_PIXFMT", "ENUM_FBUFFMT", "G_FMT", "S_FMT",
|
||||
"G_COMP", "S_COMP", "REQBUFS", "QUERYBUF", "G_FBUF", "S_FBUF",
|
||||
"G_WIN", "S_WIN", "PREVIEW", "QBUF", "16", "DQBUF", "STREAMON",
|
||||
"STREAMOFF", "G_PERF", "G_PARM", "S_PARM", "G_STD", "S_STD",
|
||||
"ENUMSTD", "ENUMINPUT", "G_CTRL", "S_CTRL", "G_TUNER", "S_TUNER",
|
||||
"G_FREQ", "S_FREQ", "G_AUDIO", "S_AUDIO", "35", "QUERYCTRL",
|
||||
"QUERYMENU", "G_INPUT", "S_INPUT", "ENUMCVT", "41", "42", "43",
|
||||
"44", "45", "G_OUTPUT", "S_OUTPUT", "ENUMOUTPUT", "G_AUDOUT",
|
||||
"S_AUDOUT", "ENUMFX", "G_EFFECT", "S_EFFECT", "G_MODULATOR",
|
||||
"S_MODULATOR"
|
||||
};
|
||||
#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
|
||||
|
||||
void em28xx_print_ioctl(char *name, unsigned int cmd)
|
||||
{
|
||||
char *dir;
|
||||
|
||||
switch (_IOC_DIR(cmd)) {
|
||||
case _IOC_NONE: dir = "--"; break;
|
||||
case _IOC_READ: dir = "r-"; break;
|
||||
case _IOC_WRITE: dir = "-w"; break;
|
||||
case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
|
||||
default: dir = "??"; break;
|
||||
}
|
||||
switch (_IOC_TYPE(cmd)) {
|
||||
case 'v':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l1, %s, VIDIOC%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < V4L1_IOCTLS) ?
|
||||
v4l1_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
case 'V':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l2, %s, VIDIOC_%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < V4L2_IOCTLS) ?
|
||||
v4l2_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
default:
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n",
|
||||
name, cmd, dir, _IOC_NR(cmd));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* em28xx_request_buffers()
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <linux/video_decoder.h>
|
||||
|
||||
#include "em28xx.h"
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/tuner.h>
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
|
||||
@@ -1269,7 +1269,7 @@ static int em28xx_video_do_ioctl(struct inode *inode, struct file *filp,
|
||||
return -ENODEV;
|
||||
|
||||
if (video_debug > 1)
|
||||
em28xx_print_ioctl(dev->name,cmd);
|
||||
v4l_print_ioctl(dev->name,cmd);
|
||||
|
||||
switch (cmd) {
|
||||
|
||||
|
||||
@@ -295,8 +295,6 @@ void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir);
|
||||
|
||||
/* Provided by em28xx-core.c */
|
||||
|
||||
void em28xx_print_ioctl(char *name, unsigned int cmd);
|
||||
|
||||
u32 em28xx_request_buffers(struct em28xx *dev, u32 count);
|
||||
void em28xx_queue_unusedframes(struct em28xx *dev);
|
||||
void em28xx_release_buffers(struct em28xx *dev);
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <media/saa7146_vv.h>
|
||||
#include <media/tuner.h>
|
||||
#include <linux/video_decoder.h>
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
#include "mxb.h"
|
||||
#include "tea6415c.h"
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include "saa7134-reg.h"
|
||||
#include "saa7134.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
/* commly used strings */
|
||||
static char name_mute[] = "mute";
|
||||
|
||||
@@ -95,77 +95,6 @@ int (*dmasound_exit)(struct saa7134_dev *dev);
|
||||
#define dprintk(fmt, arg...) if (core_debug) \
|
||||
printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg)
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* debug help functions */
|
||||
|
||||
static const char *v4l1_ioctls[] = {
|
||||
"0", "GCAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT",
|
||||
"CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ",
|
||||
"SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT",
|
||||
"GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO",
|
||||
"SMICROCODE", "GVBIFMT", "SVBIFMT" };
|
||||
#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
|
||||
|
||||
static const char *v4l2_ioctls[] = {
|
||||
"QUERYCAP", "1", "ENUM_PIXFMT", "ENUM_FBUFFMT", "G_FMT", "S_FMT",
|
||||
"G_COMP", "S_COMP", "REQBUFS", "QUERYBUF", "G_FBUF", "S_FBUF",
|
||||
"G_WIN", "S_WIN", "PREVIEW", "QBUF", "16", "DQBUF", "STREAMON",
|
||||
"STREAMOFF", "G_PERF", "G_PARM", "S_PARM", "G_STD", "S_STD",
|
||||
"ENUMSTD", "ENUMINPUT", "G_CTRL", "S_CTRL", "G_TUNER", "S_TUNER",
|
||||
"G_FREQ", "S_FREQ", "G_AUDIO", "S_AUDIO", "35", "QUERYCTRL",
|
||||
"QUERYMENU", "G_INPUT", "S_INPUT", "ENUMCVT", "41", "42", "43",
|
||||
"44", "45", "G_OUTPUT", "S_OUTPUT", "ENUMOUTPUT", "G_AUDOUT",
|
||||
"S_AUDOUT", "ENUMFX", "G_EFFECT", "S_EFFECT", "G_MODULATOR",
|
||||
"S_MODULATOR"
|
||||
};
|
||||
#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
|
||||
|
||||
static const char *osspcm_ioctls[] = {
|
||||
"RESET", "SYNC", "SPEED", "STEREO", "GETBLKSIZE", "SETFMT",
|
||||
"CHANNELS", "?", "POST", "SUBDIVIDE", "SETFRAGMENT", "GETFMTS",
|
||||
"GETOSPACE", "GETISPACE", "NONBLOCK", "GETCAPS", "GET/SETTRIGGER",
|
||||
"GETIPTR", "GETOPTR", "MAPINBUF", "MAPOUTBUF", "SETSYNCRO",
|
||||
"SETDUPLEX", "GETODELAY"
|
||||
};
|
||||
#define OSSPCM_IOCTLS ARRAY_SIZE(v4l2_ioctls)
|
||||
|
||||
void saa7134_print_ioctl(char *name, unsigned int cmd)
|
||||
{
|
||||
char *dir;
|
||||
|
||||
switch (_IOC_DIR(cmd)) {
|
||||
case _IOC_NONE: dir = "--"; break;
|
||||
case _IOC_READ: dir = "r-"; break;
|
||||
case _IOC_WRITE: dir = "-w"; break;
|
||||
case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
|
||||
default: dir = "??"; break;
|
||||
}
|
||||
switch (_IOC_TYPE(cmd)) {
|
||||
case 'v':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l1, %s, VIDIOC%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < V4L1_IOCTLS) ?
|
||||
v4l1_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
case 'V':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l2, %s, VIDIOC_%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < V4L2_IOCTLS) ?
|
||||
v4l2_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
case 'P':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (oss dsp, %s, SNDCTL_DSP_%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < OSSPCM_IOCTLS) ?
|
||||
osspcm_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
case 'M':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (oss mixer, %s, #%d)\n",
|
||||
name, cmd, dir, _IOC_NR(cmd));
|
||||
break;
|
||||
default:
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n",
|
||||
name, cmd, dir, _IOC_NR(cmd));
|
||||
}
|
||||
}
|
||||
|
||||
void saa7134_track_gpio(struct saa7134_dev *dev, char *msg)
|
||||
{
|
||||
unsigned long mode,status;
|
||||
@@ -1173,7 +1102,6 @@ module_exit(saa7134_fini);
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
|
||||
EXPORT_SYMBOL(saa7134_print_ioctl);
|
||||
EXPORT_SYMBOL(saa7134_i2c_call_clients);
|
||||
EXPORT_SYMBOL(saa7134_devlist);
|
||||
EXPORT_SYMBOL(saa7134_boards);
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include "saa7134-reg.h"
|
||||
#include "saa7134.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
#ifdef HAVE_MT352
|
||||
# include "mt352.h"
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "saa7134.h"
|
||||
|
||||
#include <media/saa6752hs.h>
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
@@ -163,7 +164,7 @@ static int ts_do_ioctl(struct inode *inode, struct file *file,
|
||||
struct saa7134_dev *dev = file->private_data;
|
||||
|
||||
if (debug > 1)
|
||||
saa7134_print_ioctl(dev->name,cmd);
|
||||
v4l_print_ioctl(dev->name,cmd);
|
||||
switch (cmd) {
|
||||
case VIDIOC_QUERYCAP:
|
||||
{
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#include "saa7134-reg.h"
|
||||
#include "saa7134.h"
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
|
||||
|
||||
@@ -373,6 +373,42 @@ static ssize_t dsp_write(struct file *file, const char __user *buffer,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static const char *osspcm_ioctls[] = {
|
||||
"RESET", "SYNC", "SPEED", "STEREO", "GETBLKSIZE", "SETFMT",
|
||||
"CHANNELS", "?", "POST", "SUBDIVIDE", "SETFRAGMENT", "GETFMTS",
|
||||
"GETOSPACE", "GETISPACE", "NONBLOCK", "GETCAPS", "GET/SETTRIGGER",
|
||||
"GETIPTR", "GETOPTR", "MAPINBUF", "MAPOUTBUF", "SETSYNCRO",
|
||||
"SETDUPLEX", "GETODELAY"
|
||||
};
|
||||
#define OSSPCM_IOCTLS ARRAY_SIZE(osspcm_ioctls)
|
||||
|
||||
static void saa7134_oss_print_ioctl(char *name, unsigned int cmd)
|
||||
{
|
||||
char *dir;
|
||||
|
||||
switch (_IOC_DIR(cmd)) {
|
||||
case _IOC_NONE: dir = "--"; break;
|
||||
case _IOC_READ: dir = "r-"; break;
|
||||
case _IOC_WRITE: dir = "-w"; break;
|
||||
case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
|
||||
default: dir = "??"; break;
|
||||
}
|
||||
switch (_IOC_TYPE(cmd)) {
|
||||
case 'P':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (oss dsp, %s, SNDCTL_DSP_%s)\n",
|
||||
name, cmd, dir, (_IOC_NR(cmd) < OSSPCM_IOCTLS) ?
|
||||
osspcm_ioctls[_IOC_NR(cmd)] : "???");
|
||||
break;
|
||||
case 'M':
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (oss mixer, %s, #%d)\n",
|
||||
name, cmd, dir, _IOC_NR(cmd));
|
||||
break;
|
||||
default:
|
||||
printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n",
|
||||
name, cmd, dir, _IOC_NR(cmd));
|
||||
}
|
||||
}
|
||||
|
||||
static int dsp_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
@@ -382,7 +418,7 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
|
||||
int val = 0;
|
||||
|
||||
if (debug > 1)
|
||||
saa7134_print_ioctl(dev->name,cmd);
|
||||
saa7134_oss_print_ioctl(dev->name,cmd);
|
||||
switch (cmd) {
|
||||
case OSS_GETVERSION:
|
||||
return put_user(SOUND_VERSION, p);
|
||||
@@ -678,7 +714,7 @@ static int mixer_ioctl(struct inode *inode, struct file *file,
|
||||
int __user *p = argp;
|
||||
|
||||
if (debug > 1)
|
||||
saa7134_print_ioctl(dev->name,cmd);
|
||||
saa7134_oss_print_ioctl(dev->name,cmd);
|
||||
switch (cmd) {
|
||||
case OSS_GETVERSION:
|
||||
return put_user(SOUND_VERSION, p);
|
||||
|
||||
Loaded 20 of 31 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user