The patch number 10922 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Mauro Carvalho Chehab <[email protected]>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
Makefile | 8
linux/Documentation/video4linux/bttv/Insmod-options | 10 -
linux/drivers/media/dvb/frontends/zl10036.c | 1
linux/drivers/media/video/Makefile | 1
linux/drivers/media/video/adv7170.c | 7
linux/drivers/media/video/adv7175.c | 5
linux/drivers/media/video/bt819.c | 5
linux/drivers/media/video/bt856.c | 2
linux/drivers/media/video/bt866.c | 2
linux/drivers/media/video/bt8xx/bttv-cards.c | 4
linux/drivers/media/video/bt8xx/bttv-i2c.c | 4
linux/drivers/media/video/cx88/cx88-alsa.c | 6
linux/drivers/media/video/ks0127.c | 4
linux/drivers/media/video/msp3400-driver.c | 116 ------------
linux/drivers/media/video/saa7110.c | 2
linux/drivers/media/video/tlv320aic23b.c | 4
linux/drivers/media/video/v4l2-compat-ioctl32.c | 1
linux/drivers/media/video/v4l2-ioctl.c | 16 -
linux/drivers/media/video/vivi.c | 2
linux/drivers/media/video/vpx3220.c | 2
linux/include/linux/videodev2.h | 10 -
linux/sound/i2c/other/tea575x-tuner.c | 16 -
v4l/scripts/release.sh | 2
v4l2-apps/test/ioctl-test.c | 2
24 files changed, 53 insertions(+), 179 deletions(-)
diff -r ba7af807e2db -r 39c257ae5063 Makefile
--- a/Makefile Tue Mar 10 18:30:27 2009 -0300
+++ b/Makefile Tue Mar 10 18:32:24 2009 -0300
@@ -14,6 +14,14 @@ all:
install:
$(MAKE) -C $(BUILD_DIR) install
+
+# Hmm, .PHONY does not work with wildcard rules :-(
+SPECS = v4l2-spec dvb-spec
+
+.PHONY: $(SPECS)
+
+$(SPECS):
+ $(MAKE) -C $(BUILD_DIR) $(MAKECMDGOALS)
%::
$(MAKE) -C $(BUILD_DIR) $(MAKECMDGOALS)
diff -r ba7af807e2db -r 39c257ae5063
linux/Documentation/video4linux/bttv/Insmod-options
--- a/linux/Documentation/video4linux/bttv/Insmod-options Tue Mar 10
18:30:27 2009 -0300
+++ b/linux/Documentation/video4linux/bttv/Insmod-options Tue Mar 10
18:32:24 2009 -0300
@@ -80,16 +80,6 @@ tuner.o
see CARDLIST for a complete list.
pal=[bdgil] select PAL variant (used for some tuners
only, important for the audio carrier).
-
-tvmixer.o
- registers a mixer device for the TV card's volume/bass/treble
- controls (requires a i2c audio control chip like the msp3400).
-
- insmod args:
- debug=1 print some debug info to the syslog.
- devnr=n allocate device #n (0 == /dev/mixer,
- 1 = /dev/mixer1, ...), default is to
- use the first free one.
tvaudio.o
new, experimental module which is supported to provide a single
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/dvb/frontends/zl10036.c
--- a/linux/drivers/media/dvb/frontends/zl10036.c Tue Mar 10 18:30:27
2009 -0300
+++ b/linux/drivers/media/dvb/frontends/zl10036.c Tue Mar 10 18:32:24
2009 -0300
@@ -30,6 +30,7 @@
#include <linux/module.h>
#include <linux/dvb/frontend.h>
#include <asm/types.h>
+#include "compat.h"
#include "zl10036.h"
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/Makefile
--- a/linux/drivers/media/video/Makefile Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/Makefile Tue Mar 10 18:32:24 2009 -0300
@@ -30,7 +30,6 @@ obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o
-obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o
obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/adv7170.c
--- a/linux/drivers/media/video/adv7170.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/adv7170.c Tue Mar 10 18:32:24 2009 -0300
@@ -205,7 +205,7 @@ static int adv7170_s_std_output(struct v
{
struct adv7170 *encoder = to_adv7170(sd);
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
adv7170_write_block(sd, init_NTSC, sizeof(init_NTSC));
@@ -220,10 +220,11 @@ static int adv7170_s_std_output(struct v
adv7170_write(sd, 0x07, TR0MODE | TR0RST);
adv7170_write(sd, 0x07, TR0MODE);
} else {
- v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", std);
+ v4l2_dbg(1, debug, sd, "illegal norm: %llx\n",
+ (unsigned long long)std);
return -EINVAL;
}
- v4l2_dbg(1, debug, sd, "switched to %llx\n", std);
+ v4l2_dbg(1, debug, sd, "switched to %llx\n", (unsigned long long)std);
encoder->norm = std;
return 0;
}
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/adv7175.c
--- a/linux/drivers/media/video/adv7175.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/adv7175.c Tue Mar 10 18:32:24 2009 -0300
@@ -238,10 +238,11 @@ static int adv7175_s_std_output(struct v
adv7175_write(sd, 0x07, TR0MODE | TR0RST);
adv7175_write(sd, 0x07, TR0MODE);
} else {
- v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", std);
+ v4l2_dbg(1, debug, sd, "illegal norm: %llx\n",
+ (unsigned long long)std);
return -EINVAL;
}
- v4l2_dbg(1, debug, sd, "switched to %llx\n", std);
+ v4l2_dbg(1, debug, sd, "switched to %llx\n", (unsigned long long)std);
encoder->norm = std;
return 0;
}
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/bt819.c
--- a/linux/drivers/media/video/bt819.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/bt819.c Tue Mar 10 18:32:24 2009 -0300
@@ -254,7 +254,7 @@ static int bt819_s_std(struct v4l2_subde
struct bt819 *decoder = to_bt819(sd);
struct timing *timing = NULL;
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
bt819_setbit(decoder, 0x01, 0, 1);
@@ -273,7 +273,8 @@ static int bt819_s_std(struct v4l2_subde
/* bt819_setbit(decoder, 0x1a, 5, 0); */
timing = &timing_data[0];
} else {
- v4l2_dbg(1, debug, sd, "unsupported norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "unsupported norm %llx\n",
+ (unsigned long long)std);
return -EINVAL;
}
bt819_write(decoder, 0x03,
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/bt856.c
--- a/linux/drivers/media/video/bt856.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/bt856.c Tue Mar 10 18:32:24 2009 -0300
@@ -131,7 +131,7 @@ static int bt856_s_std_output(struct v4l
{
struct bt856 *encoder = to_bt856(sd);
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
bt856_setbit(encoder, 0xdc, 2, 0);
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/bt866.c
--- a/linux/drivers/media/video/bt866.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/bt866.c Tue Mar 10 18:32:24 2009 -0300
@@ -97,7 +97,7 @@ static int bt866_write(struct bt866 *enc
static int bt866_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
{
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
/* Only PAL supported by this driver at the moment! */
if (!(std & V4L2_STD_NTSC))
diff -r ba7af807e2db -r 39c257ae5063
linux/drivers/media/video/bt8xx/bttv-cards.c
--- a/linux/drivers/media/video/bt8xx/bttv-cards.c Tue Mar 10 18:30:27
2009 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c Tue Mar 10 18:32:24
2009 -0300
@@ -3744,7 +3744,11 @@ static void __devinit osprey_eeprom(stru
unsigned short type;
for (i = 4*16; i < 8*16; i += 16) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+ u16 checksum = ip_compute_csum((unsigned char *)(ee +
i), 16);
+#else
u16 checksum = ip_compute_csum(ee + i, 16);
+#endif
if ((checksum&0xff) + (checksum>>8) == 0xff)
break;
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/bt8xx/bttv-i2c.c
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c Tue Mar 10 18:30:27
2009 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c Tue Mar 10 18:32:24
2009 -0300
@@ -401,7 +401,11 @@ int __devinit init_bttv_i2c(struct bttv
strlcpy(btv->c.i2c_adap.name, "bt878",
sizeof(btv->c.i2c_adap.name));
btv->c.i2c_adap.id = I2C_HW_B_BT848; /* FIXME */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ btv->c.i2c_adap.algo = (struct i2c_algorithm *)&bttv_algo;
+#else
btv->c.i2c_adap.algo = &bttv_algo;
+#endif
} else {
/* bt848 */
/* Prevents usage of invalid delay values */
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/cx88/cx88-alsa.c
--- a/linux/drivers/media/video/cx88/cx88-alsa.c Tue Mar 10 18:30:27
2009 -0300
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c Tue Mar 10 18:32:24
2009 -0300
@@ -657,8 +657,12 @@ static int snd_cx88_volume_put(struct sn
return changed;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21)
static const DECLARE_TLV_DB_SCALE(snd_cx88_db_scale, -6300, 100, 0);
+#else
+static DECLARE_TLV_DB_SCALE(snd_cx88_db_scale, -6300, 100, 0);
+#endif
#endif
static struct snd_kcontrol_new snd_cx88_volume = {
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/ks0127.c
--- a/linux/drivers/media/video/ks0127.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/ks0127.c Tue Mar 10 18:32:24 2009 -0300
@@ -589,8 +589,8 @@ static int ks0127_s_std(struct v4l2_subd
/* force to secam mode */
ks0127_and_or(sd, KS_DEMOD, 0xf0, 0x0f);
} else {
- v4l2_dbg(1, debug, sd,
- "VIDIOC_S_STD: Unknown norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "VIDIOC_S_STD: Unknown norm %llx\n",
+ (unsigned long long)std);
}
return 0;
}
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/msp3400-driver.c
--- a/linux/drivers/media/video/msp3400-driver.c Tue Mar 10 18:30:27
2009 -0300
+++ b/linux/drivers/media/video/msp3400-driver.c Tue Mar 10 18:32:24
2009 -0300
@@ -371,29 +371,6 @@ int msp_sleep(struct msp_state *state, i
}
/* ------------------------------------------------------------------------ */
-#ifdef CONFIG_VIDEO_ALLOW_V4L1
-static int msp_mode_v4l2_to_v4l1(int rxsubchans, int audmode)
-{
- if (rxsubchans == V4L2_TUNER_SUB_MONO)
- return VIDEO_SOUND_MONO;
- if (rxsubchans == V4L2_TUNER_SUB_STEREO)
- return VIDEO_SOUND_STEREO;
- if (audmode == V4L2_TUNER_MODE_LANG2)
- return VIDEO_SOUND_LANG2;
- return VIDEO_SOUND_LANG1;
-}
-
-static int msp_mode_v4l1_to_v4l2(int mode)
-{
- if (mode & VIDEO_SOUND_STEREO)
- return V4L2_TUNER_MODE_STEREO;
- if (mode & VIDEO_SOUND_LANG2)
- return V4L2_TUNER_MODE_LANG2;
- if (mode & VIDEO_SOUND_LANG1)
- return V4L2_TUNER_MODE_LANG1;
- return V4L2_TUNER_MODE_MONO;
-}
-#endif
static int msp_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
{
@@ -486,96 +463,6 @@ static int msp_s_ctrl(struct v4l2_subdev
msp_set_audio(client);
return 0;
}
-
-#ifdef CONFIG_VIDEO_ALLOW_V4L1
-static long msp_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
-{
- struct msp_state *state = to_state(sd);
- struct i2c_client *client = v4l2_get_subdevdata(sd);
-
- switch (cmd) {
- /* --- v4l ioctls --- */
- /* take care: bttv does userspace copying, we'll get a
- kernel pointer here... */
- case VIDIOCGAUDIO:
- {
- struct video_audio *va = arg;
-
- va->flags |= VIDEO_AUDIO_VOLUME | VIDEO_AUDIO_MUTABLE;
- if (state->has_sound_processing)
- va->flags |= VIDEO_AUDIO_BALANCE |
- VIDEO_AUDIO_BASS |
- VIDEO_AUDIO_TREBLE;
- if (state->muted)
- va->flags |= VIDEO_AUDIO_MUTE;
- va->volume = state->volume;
- va->balance = state->volume ? state->balance : 32768;
- va->bass = state->bass;
- va->treble = state->treble;
-
- if (state->radio)
- break;
- if (state->opmode == OPMODE_AUTOSELECT)
- msp_detect_stereo(client);
- va->mode = msp_mode_v4l2_to_v4l1(state->rxsubchans,
state->audmode);
- break;
- }
-
- case VIDIOCSAUDIO:
- {
- struct video_audio *va = arg;
-
- state->muted = (va->flags & VIDEO_AUDIO_MUTE);
- state->volume = va->volume;
- state->balance = va->balance;
- state->bass = va->bass;
- state->treble = va->treble;
- msp_set_audio(client);
-
- if (va->mode != 0 && state->radio == 0 &&
- state->audmode != msp_mode_v4l1_to_v4l2(va->mode)) {
- state->audmode = msp_mode_v4l1_to_v4l2(va->mode);
- msp_set_audmode(client);
- }
- break;
- }
-
- case VIDIOCSCHAN:
- {
- struct video_channel *vc = arg;
- int update = 0;
- v4l2_std_id std;
-
- if (state->radio)
- update = 1;
- state->radio = 0;
- if (vc->norm == VIDEO_MODE_PAL)
- std = V4L2_STD_PAL;
- else if (vc->norm == VIDEO_MODE_SECAM)
- std = V4L2_STD_SECAM;
- else
- std = V4L2_STD_NTSC;
- if (std != state->v4l2_std) {
- state->v4l2_std = std;
- update = 1;
- }
- if (update)
- msp_wake_thread(client);
- break;
- }
-
- case VIDIOCSFREQ:
- {
- /* new channel -- kick audio carrier scan */
- msp_wake_thread(client);
- break;
- }
- default:
- return -ENOIOCTLCMD;
- }
- return 0;
-}
-#endif
/* --- v4l2 ioctls --- */
static int msp_s_radio(struct v4l2_subdev *sd)
@@ -827,9 +714,6 @@ static const struct v4l2_subdev_core_ops
.g_ctrl = msp_g_ctrl,
.s_ctrl = msp_s_ctrl,
.queryctrl = msp_queryctrl,
-#ifdef CONFIG_VIDEO_ALLOW_V4L1
- .ioctl = msp_ioctl,
-#endif
};
static const struct v4l2_subdev_tuner_ops msp_tuner_ops = {
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/saa7110.c
--- a/linux/drivers/media/video/saa7110.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/saa7110.c Tue Mar 10 18:32:24 2009 -0300
@@ -257,7 +257,7 @@ static int saa7110_g_input_status(struct
int status = saa7110_read(sd);
v4l2_dbg(1, debug, sd, "status=0x%02x norm=%llx\n",
- status, decoder->norm);
+ status, (unsigned long long)decoder->norm);
if (!(status & 0x40))
res = 0;
if (!(status & 0x03))
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/tlv320aic23b.c
--- a/linux/drivers/media/video/tlv320aic23b.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/tlv320aic23b.c Tue Mar 10 18:32:24 2009 -0300
@@ -31,16 +31,18 @@
#include <linux/i2c-id.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
#include "compat.h"
MODULE_DESCRIPTION("tlv320aic23b driver");
MODULE_AUTHOR("Scott Alfter, Ulf Eklund, Hans Verkuil");
MODULE_LICENSE("GPL");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
static unsigned short normal_i2c[] = { 0x34 >> 1, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
+#endif
/* ----------------------------------------------------------------------- */
diff -r ba7af807e2db -r 39c257ae5063
linux/drivers/media/video/v4l2-compat-ioctl32.c
--- a/linux/drivers/media/video/v4l2-compat-ioctl32.c Tue Mar 10 18:30:27
2009 -0300
+++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c Tue Mar 10 18:32:24
2009 -0300
@@ -1052,7 +1052,6 @@ long v4l2_compat_ioctl32(struct file *fi
case VIDIOC_DBG_S_REGISTER:
case VIDIOC_DBG_G_REGISTER:
case VIDIOC_DBG_G_CHIP_IDENT:
- case VIDIOC_G_CHIP_IDENT_OLD:
case VIDIOC_S_HW_FREQ_SEEK:
ret = do_video_ioctl(file, cmd, arg);
break;
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/v4l2-ioctl.c
--- a/linux/drivers/media/video/v4l2-ioctl.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/v4l2-ioctl.c Tue Mar 10 18:32:24 2009 -0300
@@ -1693,11 +1693,6 @@ static long __video_do_ioctl(struct file
dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident,
p->revision);
break;
}
- case VIDIOC_G_CHIP_IDENT_OLD:
- printk(KERN_ERR "VIDIOC_G_CHIP_IDENT has been deprecated and
will disappear in 2.6.30.\n");
- printk(KERN_ERR "It is a debugging ioctl and must not be used
in applications!\n");
- return -EINVAL;
-
case VIDIOC_S_HW_FREQ_SEEK:
{
struct v4l2_hw_freq_seek *p = arg;
@@ -1802,11 +1797,12 @@ static unsigned long cmd_input_size(unsi
static unsigned long cmd_input_size(unsigned int cmd)
{
/* Size of structure up to and including 'field' */
-#define CMDINSIZE(cmd, type, field) case _IOC_NR(VIDIOC_##cmd): return \
- offsetof(struct v4l2_##type, field) + \
- sizeof(((struct v4l2_##type *)0)->field);
-
- switch (_IOC_NR(cmd)) {
+#define CMDINSIZE(cmd, type, field) \
+ case VIDIOC_##cmd: \
+ return offsetof(struct v4l2_##type, field) + \
+ sizeof(((struct v4l2_##type *)0)->field);
+
+ switch (cmd) {
CMDINSIZE(ENUM_FMT, fmtdesc, type);
CMDINSIZE(G_FMT, format, type);
CMDINSIZE(QUERYBUF, buffer, type);
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/vivi.c
--- a/linux/drivers/media/video/vivi.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/vivi.c Tue Mar 10 18:32:24 2009 -0300
@@ -1409,7 +1409,7 @@ free_dev:
*/
static int __init vivi_init(void)
{
- int ret, i;
+ int ret = 0, i;
if (n_devs <= 0)
n_devs = 1;
diff -r ba7af807e2db -r 39c257ae5063 linux/drivers/media/video/vpx3220.c
--- a/linux/drivers/media/video/vpx3220.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/drivers/media/video/vpx3220.c Tue Mar 10 18:32:24 2009 -0300
@@ -374,7 +374,7 @@ static int vpx3220_s_std(struct v4l2_sub
choosen video norm */
temp_input = vpx3220_fp_read(sd, 0xf2);
- v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", std);
+ v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1);
v4l2_dbg(1, debug, sd, "norm switched to NTSC\n");
diff -r ba7af807e2db -r 39c257ae5063 linux/include/linux/videodev2.h
--- a/linux/include/linux/videodev2.h Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/include/linux/videodev2.h Tue Mar 10 18:32:24 2009 -0300
@@ -1411,14 +1411,6 @@ struct v4l2_dbg_chip_ident {
__u32 ident; /* chip identifier as specified in
<media/v4l2-chip-ident.h> */
__u32 revision; /* chip revision, chip specific */
} __attribute__ ((packed));
-
-/* VIDIOC_G_CHIP_IDENT_OLD: Deprecated, do not use */
-struct v4l2_chip_ident_old {
- __u32 match_type; /* Match type */
- __u32 match_chip; /* Match this chip, meaning determined by match_type
*/
- __u32 ident; /* chip identifier as specified in
<media/v4l2-chip-ident.h> */
- __u32 revision; /* chip revision, chip specific */
-};
/*
* I O C T L C O D E S F O R V I D E O D E V I C E S
@@ -1497,8 +1489,6 @@ struct v4l2_chip_ident_old {
/* Experimental, meant for debugging, testing and internal use.
Never use this ioctl in applications! */
#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-/* This is deprecated and will go away in 2.6.30 */
-#define VIDIOC_G_CHIP_IDENT_OLD _IOWR('V', 81, struct v4l2_chip_ident_old)
#endif
#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
diff -r ba7af807e2db -r 39c257ae5063 linux/sound/i2c/other/tea575x-tuner.c
--- a/linux/sound/i2c/other/tea575x-tuner.c Tue Mar 10 18:30:27 2009 -0300
+++ b/linux/sound/i2c/other/tea575x-tuner.c Tue Mar 10 18:32:24 2009 -0300
@@ -77,11 +77,7 @@ static struct v4l2_queryctrl radio_qctrl
* lowlevel part
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
-static void snd_tea575x_set_freq(tea575x_t *tea)
-#else
static void snd_tea575x_set_freq(struct snd_tea575x *tea)
-#endif
{
unsigned long freq;
@@ -209,9 +205,9 @@ static int vidioc_g_ctrl(struct file *fi
static int vidioc_g_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
- struct snd_tea575x *tea = video_drvdata(file);
-
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)
+ struct snd_tea575x *tea = video_drvdata(file);
+
switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (tea->ops->mute) {
@@ -226,9 +222,9 @@ static int vidioc_s_ctrl(struct file *fi
static int vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
- struct snd_tea575x *tea = video_drvdata(file);
-
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)
+ struct snd_tea575x *tea = video_drvdata(file);
+
switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (tea->ops->mute) {
@@ -301,11 +297,7 @@ static struct video_device tea575x_radio
/*
* initialize all the tea575x chips
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
-void snd_tea575x_init(tea575x_t *tea)
-#else
void snd_tea575x_init(struct snd_tea575x *tea)
-#endif
{
int retval;
unsigned int val;
diff -r ba7af807e2db -r 39c257ae5063 v4l/scripts/release.sh
--- a/v4l/scripts/release.sh Tue Mar 10 18:30:27 2009 -0300
+++ b/v4l/scripts/release.sh Tue Mar 10 18:32:24 2009 -0300
@@ -14,7 +14,7 @@ files_common="$files_v4l $files_tuner $f
# other files
files_ir="ir-common.[ch]"
-files_audio="msp3400.[ch] tvaudio.[ch] tvmixer.[ch]"
+files_audio="msp3400.[ch] tvaudio.[ch]"
files_bttv="bt848.h btcx*.[ch] bttv*.[ch] ir-kbd*.c"
files_saa="saa7134*.[ch] saa6752hs.[ch] ir-kbd-i2c.c"
diff -r ba7af807e2db -r 39c257ae5063 v4l2-apps/test/ioctl-test.c
--- a/v4l2-apps/test/ioctl-test.c Tue Mar 10 18:30:27 2009 -0300
+++ b/v4l2-apps/test/ioctl-test.c Tue Mar 10 18:32:24 2009 -0300
@@ -90,7 +90,6 @@ union v4l_parms {
struct v4l2_encoder_cmd p_v4l2_encoder_cmd;
struct v4l2_dbg_register p_v4l2_dbg_register;
struct v4l2_dbg_chip_ident p_v4l2_dbg_chip_ident;
- struct v4l2_chip_ident_old p_v4l2_chip_ident_old;
struct v4l2_hw_freq_seek p_v4l2_hw_freq_seek;
};
@@ -197,7 +196,6 @@ static const struct {
ioc(VIDIOC_DBG_S_REGISTER), /* struct v4l2_register */
ioc(VIDIOC_DBG_G_REGISTER), /* struct v4l2_register */
ioc(VIDIOC_DBG_G_CHIP_IDENT), /* struct v4l2_dbg_chip_ident */
- ioc(VIDIOC_G_CHIP_IDENT_OLD), /* struct v4l2_chip_ident_old */
ioc(VIDIOC_S_HW_FREQ_SEEK), /* struct v4l2_hw_freq_seek */
#ifdef __OLD_VIDIOC_
ioc(VIDIOC_OVERLAY_OLD), /* int */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/39c257ae5063b78612e27aee93df61613ed7153c
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
