summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/video/bt832.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c13
-rw-r--r--linux/drivers/media/video/msp3400-driver.c4
-rw-r--r--linux/drivers/media/video/msp3400.c4
-rw-r--r--linux/drivers/media/video/saa6752hs.c4
-rw-r--r--linux/drivers/media/video/saa7134/saa6752hs.c4
-rw-r--r--linux/drivers/media/video/tda7432.c1
-rw-r--r--linux/drivers/media/video/tda9875.c1
-rw-r--r--linux/drivers/media/video/tda9887.c4
-rw-r--r--linux/drivers/media/video/tea5767.c46
-rw-r--r--linux/drivers/media/video/tuner-core.c51
-rw-r--r--linux/drivers/media/video/tvaudio.c4
-rw-r--r--linux/drivers/media/video/tveeprom.c3
-rw-r--r--v4l/.bp/2.6/v4l-driver-doc6
-rw-r--r--v4l/ChangeLog23
-rw-r--r--v4l/Make.config4
-rw-r--r--v4l/Makefile7
17 files changed, 127 insertions, 56 deletions
diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt832.c
index 4051c2312..348c1f4c0 100644
--- a/linux/drivers/media/video/bt832.c
+++ b/linux/drivers/media/video/bt832.c
@@ -45,8 +45,8 @@
MODULE_LICENSE("GPL");
/* Addresses to scan */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_BT832_ALT1>>1,I2C_BT832_ALT2>>1,I2C_CLIENT_END};
+static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
+ I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
/* ---------------------------------------------------------------------- */
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 7c0fcd89b..5614147f3 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-video.c,v 1.63 2005/06/12 04:19:19 mchehab Exp $
+ * $Id: cx88-video.c,v 1.64 2005/06/15 02:43:03 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* video4linux video interface
@@ -1358,9 +1358,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
V4L2_CAP_STREAMING |
V4L2_CAP_VBI_CAPTURE |
#if 0
- V4L2_TUNER_CAP_LOW |
-#endif
-#if 0
V4L2_CAP_VIDEO_OVERLAY |
#endif
0;
@@ -1721,11 +1718,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
sizeof(cap->card));
sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
cap->version = CX88_VERSION_CODE;
- cap->capabilities = V4L2_CAP_TUNER
-#if 0
- | V4L2_TUNER_CAP_LOW
-#endif
- ;
+ cap->capabilities = V4L2_CAP_TUNER;
return 0;
}
case VIDIOC_G_TUNER:
@@ -1737,8 +1730,10 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
memset(t,0,sizeof(*t));
strcpy(t->name, "Radio");
+#if 0
t->rangelow = (int)(65*16);
t->rangehigh = (int)(108*16);
+#endif
#ifdef V4L2_I2C_CLIENTS
cx88_call_i2c_clients(dev->core,VIDIOC_G_TUNER,t);
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 7183480a8..174ee99d8 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -148,7 +148,9 @@ static unsigned short normal_i2c[] = {
I2C_MSP3400C_ALT >> 1,
I2C_CLIENT_END
};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
+#ifdef CONFIG_USE_I2C_RANGE
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
I2C_CLIENT_INSMOD;
/* ----------------------------------------------------------------------- */
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 7183480a8..174ee99d8 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -148,7 +148,9 @@ static unsigned short normal_i2c[] = {
I2C_MSP3400C_ALT >> 1,
I2C_CLIENT_END
};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
+#ifdef CONFIG_USE_I2C_RANGE
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
I2C_CLIENT_INSMOD;
/* ----------------------------------------------------------------------- */
diff --git a/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c
index 7ebd0e9a5..11c7d9acb 100644
--- a/linux/drivers/media/video/saa6752hs.c
+++ b/linux/drivers/media/video/saa6752hs.c
@@ -28,7 +28,9 @@
/* Addresses to scan */
static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
+#ifdef CONFIG_USE_I2C_RANGE
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
I2C_CLIENT_INSMOD;
MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index 7ebd0e9a5..11c7d9acb 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -28,7 +28,9 @@
/* Addresses to scan */
static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
+#ifdef CONFIG_USE_I2C_RANGE
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
I2C_CLIENT_INSMOD;
MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c
index ca8b765f5..2b8e163d0 100644
--- a/linux/drivers/media/video/tda7432.c
+++ b/linux/drivers/media/video/tda7432.c
@@ -80,7 +80,6 @@ static unsigned short normal_i2c[] = {
I2C_TDA7432 >> 1,
I2C_CLIENT_END,
};
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
/* Structure of address and subaddresses for the tda7432 */
diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c
index 347d71659..d607de480 100644
--- a/linux/drivers/media/video/tda9875.c
+++ b/linux/drivers/media/video/tda9875.c
@@ -50,7 +50,6 @@ static unsigned short normal_i2c[] = {
I2C_TDA9875 >> 1,
I2C_CLIENT_END
};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
I2C_CLIENT_INSMOD;
/* This is a superset of the TDA9875 */
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index b83b8e67d..567288476 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -41,7 +41,9 @@ static unsigned short normal_i2c[] = {
0x96 >>1,
I2C_CLIENT_END,
};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
+#ifdef CONFIG_USE_I2C_RANGE
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
I2C_CLIENT_INSMOD;
/* insmod options */
diff --git a/linux/drivers/media/video/tea5767.c b/linux/drivers/media/video/tea5767.c
index 153e4aa90..ed7b56944 100644
--- a/linux/drivers/media/video/tea5767.c
+++ b/linux/drivers/media/video/tea5767.c
@@ -2,7 +2,7 @@
* For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
* I2C address is allways 0xC0.
*
- * $Id: tea5767.c,v 1.6 2005/06/10 10:57:18 mchehab Exp $
+ * $Id: tea5767.c,v 1.7 2005/06/15 02:43:03 mchehab Exp $
*
* Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
* This code is placed under the terms of the GNU General Public License
@@ -134,13 +134,14 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 */
/* radio adjust freq for odd channel frequencies used in US, Brazil, ... */
-int radio_frq[16]={ 0, 1, 2, 3, 5, 6, 7, 9, 10, 11, 13, 14, 15, 17, 18, 19 };
+/* int radio_frq[16]={ 0, 1, 2, 3, 5, 6, 7, 9, 10, 11, 13, 14, 15, 17, 18, 19 }; */
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 */
/* radio adjust freq for even channel frequencies */
/* int radio_frq[16]={ 0, 1, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 19 }; */
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 */
+/* Freq should be specifyed at 62.5 Hz */
static void set_radio_freq(struct i2c_client *c, unsigned int frq)
{
struct tuner *t = i2c_get_clientdata(c);
@@ -151,8 +152,8 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
printk(PREFIX "radio freq counter %d\n",frq);
- /* Rounds freq to next decimal value */
- frq = 20*(frq/16)+radio_frq[frq%16];
+ /* Rounds freq to next decimal value - for 62.5 KHz step */
+ /* frq = 20*(frq/16)+radio_frq[frq%16]; */
buffer[2] = TEA5767_PORT1_HIGH;
buffer[3] = TEA5767_PORT2_HIGH | TEA5767_HIGH_CUT_CTRL | TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND;
@@ -163,19 +164,22 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
tuner_dbg("TEA5767 radio HIGH LO inject xtal @ 13 MHz\n");
buffer[2] |= TEA5767_HIGH_LO_INJECT;
buffer[4] |= TEA5767_PLLREF_ENABLE;
- div = (frq*4000/20+225+25)/50;
+/* div = (frq*4000/20+225+25)/50; */
+ div = (frq*4/16+700+225+25)/50;
break;
case TEA5767_LOW_LO_13MHz:
tuner_dbg("TEA5767 radio LOW LO inject xtal @ 13 MHz\n");
buffer[4] |= TEA5767_PLLREF_ENABLE;
- div = (frq*4000/20-225+25)/50;
+/* div = (frq*4000/20-225+25)/50; */
+ div = (frq*4/16-700-225+25)/50;
break;
case TEA5767_LOW_LO_32768:
tuner_dbg("TEA5767 radio LOW LO inject xtal @ 32,768 MHz\n");
buffer[3] |= TEA5767_XTAL_32768;
/* const 700=4000*175 Khz - to adjust freq to right value */
- div = (1000*(frq*4000/20-700-225)+16384)>>15;
+ div = (1000*(frq*4/16-700-225)+16384)>>15;
+/* div = (1000*(frq*4000/20-700-225)+16384)>>15; */
break;
case TEA5767_HIGH_LO_32768:
default:
@@ -183,7 +187,8 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
buffer[2] |= TEA5767_HIGH_LO_INJECT;
buffer[3] |= TEA5767_XTAL_32768;
- div = (1000*(frq*4000/20+700+225)+16384)/32768;
+/* div = (1000*(frq*4000/20+700+225)+16384)/32768; */
+ div = (1000*(frq*4/16+700+225)+16384)>>15;
break;
}
buffer[0] = (div>>8) & 0x3f;
@@ -198,7 +203,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
static void tea5767_status_dump(unsigned char *buffer)
{
- unsigned int div;
+ unsigned int div, frq;
if (TEA5767_READY_FLAG_MASK & buffer[0])
printk(PREFIX "Ready Flag ON\n");
@@ -211,8 +216,29 @@ static void tea5767_status_dump(unsigned char *buffer)
printk(PREFIX "Tuner not at band limit\n");
div=((buffer[0]&0x3f)<<8) | buffer[1];
+
+ switch (TEA5767_HIGH_LO_32768) {
+ case TEA5767_HIGH_LO_13MHz:
+ frq = 1000*(div*50-700-225)/4; /* Freq in KHz */
+ break;
+ case TEA5767_LOW_LO_13MHz:
+ frq = 1000*(div*50+700+225)/4; /* Freq in KHz */
+ break;
+ case TEA5767_LOW_LO_32768:
+ frq = 1000*(div*32768/1000+700+225)/4; /* Freq in KHz */
+ break;
+ case TEA5767_HIGH_LO_32768:
+ default:
+// div = (1000*(frq*4/20+700+225)+16384)>>15;
+ frq = 1000*(div*32768/1000-700-225)/4; /* Freq in KHz */
+ break;
+ }
+ buffer[0] = (div>>8) & 0x3f;
+ buffer[1] = div & 0xff;
+
- printk(PREFIX "Frequency divider = 0x%4x\n",div);
+ printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
+ frq/1000,frq%1000,div);
if (TEA5767_STEREO_MASK & buffer[2])
printk(PREFIX "Stereo\n");
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 5f24ab97f..ca55bd188 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-core.c,v 1.16 2005/06/14 22:52:59 hhackmann Exp $
+ * $Id: tuner-core.c,v 1.17 2005/06/15 02:43:03 mchehab Exp $
*
* i2c tv tuner chip device driver
* core core, i.e. kernel interfaces, registering and so on
@@ -27,19 +27,19 @@
/*
* comment line bellow to return to old behavor, where only one I2C device is supported
*/
-#define CONFIG_TUNER_MULTI_I2C /**/
#define UNSET (-1U)
/* standard i2c insmod options */
static unsigned short normal_i2c[] = {
0x4b, /* tda8290 */
+ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
I2C_CLIENT_END
};
-static unsigned short normal_i2c_range[] = {
- 0x60, 0x6f,
- I2C_CLIENT_END
-};
+#ifdef CONFIG_USE_I2C_RANGE
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
I2C_CLIENT_INSMOD;
/* insmod options used at init time => read/only */
@@ -90,13 +90,12 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
return;
}
if (freq < tv_range[0]*16 || freq > tv_range[1]*16) {
-
- if (freq >= tv_range[0]*16364 && freq <= tv_range[1]*16384) {
+ if (freq >= tv_range[0]*16000 && freq <= tv_range[1]*16000) {
/* V4L2_TUNER_CAP_LOW frequency */
tuner_dbg("V4L2_TUNER_CAP_LOW freq selected for TV. Tuners yet doesn't support converting it to valid freq.\n");
- t->tv_freq(c,freq>>10);
+ t->tv_freq(c,freq/1000);
return;
} else {
@@ -126,17 +125,18 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq)
return;
}
if (freq < radio_range[0]*16 || freq > radio_range[1]*16) {
- if (freq >= tv_range[0]*16364 && freq <= tv_range[1]*16384) {
+ if (freq >= radio_range[0]*16000 && freq <= radio_range[1]*16000) {
/* V4L2_TUNER_CAP_LOW frequency */
if (t->type == TUNER_TEA5767) {
- tuner_info("radio freq step 62.5Hz (%d.%06d)\n",(freq>>14),freq%(1<<14)*10000);
- t->radio_freq(c,freq>>10);
+ tuner_info("radio freq step 62.5Hz (%d.%06d)\n",
+ freq/16000,freq%16000*1000/16);
+ t->radio_freq(c,freq);
return;
}
tuner_dbg("V4L2_TUNER_CAP_LOW freq selected for Radio. Tuners yet doesn't support converting it to valid freq.\n");
- tuner_info("radio freq (%d.%06d)\n",(freq>>14),freq%(1<<14)*10000);
+ tuner_info("radio freq (%d.%02d)\n",(freq/16000),freq%16000*100/16000);
t->radio_freq(c,freq>>10);
return;
@@ -332,9 +332,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
static int tuner_probe(struct i2c_adapter *adap)
{
if (0 != addr) {
- normal_i2c[0] = addr;
- normal_i2c_range[0] = addr;
- normal_i2c_range[1] = addr;
+ normal_i2c[0] = addr;
+ normal_i2c[1] = I2C_CLIENT_END;
}
this_adap = 0;
@@ -457,6 +456,13 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
vt-> flags &= 0xffff ^ VIDEO_TUNER_STEREO_ON;
}
vt->flags |= V4L2_TUNER_CAP_LOW; /* Allow freqs at 62.5 Hz */
+
+ vt->rangelow = radio_range[0] * 16000;
+ vt->rangehigh = radio_range[1] * 16000;
+
+ } else {
+ vt->rangelow = tv_range[0] * 16;
+ vt->rangehigh = tv_range[1] * 16;
}
return 0;
@@ -528,12 +534,15 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
tuner -> rxsubchans &= 0xffff ^ V4L2_TUNER_SUB_STEREO;
}
}
+ tuner -> capability |= V4L2_TUNER_CAP_LOW;
+
+ tuner->rangelow = radio_range[0] * 16000;
+ tuner->rangehigh = radio_range[1] * 16000;
+
+ } else {
+ tuner->rangelow = tv_range[0] * 16;
+ tuner->rangehigh = tv_range[1] * 16;
}
- /* Wow to deal with V4L2_TUNER_CAP_LOW ? For now, it accepts from low at 62.5KHz step to high at 62.5 Hz */
- tuner->rangelow = tv_range[0] * 16;
-// tuner->rangehigh = tv_range[1] * 16;
-// tuner->rangelow = tv_range[0] * 16384;
- tuner->rangehigh = tv_range[1] * 16384;
break;
}
default:
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index ac5ea20ca..637feb9eb 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -154,7 +154,9 @@ static unsigned short normal_i2c[] = {
I2C_TDA9874 >> 1,
I2C_PIC16C54 >> 1,
I2C_CLIENT_END };
-static unsigned short normal_i2c_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
+#ifdef CONFIG_USE_I2C_RANGE
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
I2C_CLIENT_INSMOD;
static struct i2c_driver driver;
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index faee59184..a82d43965 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -483,7 +483,10 @@ static unsigned short normal_i2c[] = {
0xa0 >> 1,
I2C_CLIENT_END,
};
+#ifdef CONFIG_USE_I2C_RANGE
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+#endif
+
I2C_CLIENT_INSMOD;
struct i2c_driver i2c_driver_tveeprom;
diff --git a/v4l/.bp/2.6/v4l-driver-doc b/v4l/.bp/2.6/v4l-driver-doc
index 64e89710c..0bc362fdc 100644
--- a/v4l/.bp/2.6/v4l-driver-doc
+++ b/v4l/.bp/2.6/v4l-driver-doc
@@ -21,9 +21,9 @@ srcdiff doc/CARDLIST.tuner Documentation/video4linux/CARDLIST.tuner
srcdiff doc/CARDLIST.cx88 Documentation/video4linux/CARDLIST.cx88
# API
-srcdiff /dev/null Docummentation/video4linux/API.html
-srcdiff doc/V4L1_API.html Docummentation/video4linux/V4L1_API.html
-srcdiff doc/V4L2_API.html Docummentation/video4linux/V4L2_API.html
+srcdiff /dev/null Documentation/video4linux/API.html
+srcdiff doc/V4L1_API.html Documentation/video4linux/V4L1_API.html
+srcdiff doc/V4L2_API.html Documentation/video4linux/V4L2_API.html
# obsolete / fixme
#srcdiff doc/Specs Documentation/video4linux/bttv/Specs
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 92ffec52a..db9e74626 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,24 @@
+2005-06-15 02:14 mchehab
+ * Make.config, Makefile, tuner-core.c:
+
+ - CONFIG_TUNER_MULTI_I2C dropped from tuner-core.c and included on Make.config
+ - included CONFIG_USE_I2C_RANGE for kernels that requires normal_i2c_range struct
+ (only kernels after 2.6.12-rc6-mm1 doesn't require).
+
+ * bt832.c, msp3400.c, saa6752hs.c, tda7432.c, tda9875.c, tda9887.c, tuner-core.c,tvaudio.c,
+ tveeprom.c,
+
+ - I2C range detection corrected to new behavior of 2.6.12-rc6-mm1
+
+ * cx88-video.c, tea5767, tuner-core.c:
+
+ - V4L2_TUNER_CAP_LOW implemented according with V4L2 API for Radio.
+ - tea5767 debug improved.
+
+ * .bp/2.6/v4l-driver-doc
+
+ - typo corrected.
+
2005-06-14 04:08 Hartmut Hackmann
* saa7134-cards.c saa7134.h
- added entry for Philips TOUGH Reference design
@@ -77,7 +98,6 @@
- Updated entry for Avermedia Cardbus E500. Thanks to
Kees Blom <Kees.Blom@cwi.nl>.
->>>>>>> 1.42
2005-06-12 04:08 mchehab
* audiochip.h, compat.h, cx22702.h, cx88-core.c, cx88-dvb.c,
cx88-i2c.c, cx88-vbi.c, cx88-video.c, dpl3518.c, dpl3518.h,
@@ -266,7 +286,6 @@
Thanks to Catalin Climov <catalin@climov.com>
->>>>>>> 1.19
2005-06-03 12:33 mchehab
* cx88-cards.c, cx88.h, CARDLIST.cx88, CARDLIST.tuner, tuner-simple.c:
diff --git a/v4l/Make.config b/v4l/Make.config
index 004d49ae5..d8d663e61 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -7,6 +7,8 @@ CONFIG_VIDEO_IR := m
CONFIG_VIDEO_TUNER := m
CONFIG_VIDEO_TVAUDIO := m
CONFIG_VIDEO_CX88 := m
+CONFIG_TUNER_MULTI_I2C := y
+CONFIG_USE_I2C_RANGE := y
# doesn't build on kernels older than 2.6.10
# Hmm, need a more clever check once we have 2.6.11 ...
@@ -20,3 +22,5 @@ ifeq ($(SUBLEVEL),11)
CONFIG_VIDEO_CX88_DVB := m
CONFIG_VIDEO_SAA7134_DVB := m
endif
+
+
diff --git a/v4l/Makefile b/v4l/Makefile
index ea4e3ca0c..8bbaeaa1e 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -59,7 +59,12 @@ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
endif
-
+ifeq ($(CONFIG_TUNER_MULTI_I2C),y)
+ EXTRA_CFLAGS += -DCONFIG_TUNER_MULTI_I2C=1
+endif
+ifeq ($(CONFIG_USE_I2C_RANGE),y)
+ EXTRA_CFLAGS += -DCONFIG_USE_I2C_RANGE=1
+endif
#################################################
# compile modules
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 21:38:49 +0000