Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e453dc7 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

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: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent 37bdfa06

drivers/media/video/bttv-cards.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/bttv-driver.c

+4 −24
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/bttv-i2c.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/delay.h>



#include "bttvp.h"

#include <media/v4l2-common.h>

#include <linux/jiffies.h>

#include <asm/io.h>

drivers/media/video/cx88/cx88-blackbird.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/media/video/cx88/cx88-core.c

+1 −55
Original line number Diff line number Diff line
@@ -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);