diff options
author | Michael Hunold <devnull@localhost> | 2003-10-13 10:58:17 +0000 |
---|---|---|
committer | Michael Hunold <devnull@localhost> | 2003-10-13 10:58:17 +0000 |
commit | 4eeb8ba790ec99f2ec397f92f5bc4ee5c6f814a7 (patch) | |
tree | c0504d3e96f5eb2945ef9715ff455de21650e91d /linux/drivers/media | |
parent | d78ed83ebce071b36b814c335b7bf4708c0fb6c8 (diff) | |
download | mediapointer-dvb-s2-4eeb8ba790ec99f2ec397f92f5bc4ee5c6f814a7.tar.gz mediapointer-dvb-s2-4eeb8ba790ec99f2ec397f92f5bc4ee5c6f814a7.tar.bz2 |
Patches are no longer needer for dvb-bt8xx support,
have a look at README.bt8xx in the top-level
directory.
Diffstat (limited to 'linux/drivers/media')
-rw-r--r-- | linux/drivers/media/dvb/bt8xx/patches/i2c-if-0.9.4.patch | 38 | ||||
-rw-r--r-- | linux/drivers/media/dvb/bt8xx/patches/nebula-0.9.4.patch | 41 |
2 files changed, 0 insertions, 79 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/patches/i2c-if-0.9.4.patch b/linux/drivers/media/dvb/bt8xx/patches/i2c-if-0.9.4.patch deleted file mode 100644 index 9ca998c10..000000000 --- a/linux/drivers/media/dvb/bt8xx/patches/i2c-if-0.9.4.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naurp bttv-0.9.4/bttv-if.c bttv-0.9.4-old/bttv-if.c ---- bttv-0.9.4/bttv-if.c Wed Jan 8 11:39:49 2003 -+++ bttv-0.9.4-old/bttv-if.c Sun Jan 19 11:47:29 2003 -@@ -43,6 +43,7 @@ static struct i2c_client bttv_i2c_client - EXPORT_SYMBOL(bttv_get_cardinfo); - EXPORT_SYMBOL(bttv_get_pcidev); - EXPORT_SYMBOL(bttv_get_id); -+EXPORT_SYMBOL(bttv_get_i2c_adap); - EXPORT_SYMBOL(bttv_gpio_enable); - EXPORT_SYMBOL(bttv_read_gpio); - EXPORT_SYMBOL(bttv_write_gpio); -@@ -80,6 +82,14 @@ int bttv_get_id(unsigned int card) - return bttvs[card].type; - } - -+struct i2c_adapter *bttv_get_i2c_adap(unsigned int card) -+{ -+ if (card >= bttv_num) { -+ return NULL; -+ } -+ return &bttvs[card].i2c_adap; -+} -+ - int bttv_gpio_enable(unsigned int card, unsigned long mask, unsigned long data) - { - struct bttv *btv; -diff -Naurp bttv-0.9.4/bttv.h bttv-0.9.4-old/bttv.h ---- bttv-0.9.4/bttv.h Wed Jan 8 11:39:49 2003 -+++ bttv-0.9.4-old/bttv.h Sun Jan 19 11:46:59 2003 -@@ -207,6 +208,8 @@ extern struct pci_dev* bttv_get_pcidev(u - /* obsolete, use bttv_get_cardinfo instead */ - extern int bttv_get_id(unsigned int card); - -+extern struct i2c_adapter *bttv_get_i2c_adap(unsigned int card); -+ - /* sets GPOE register (BT848_GPIO_OUT_EN) to new value: - data | (current_GPOE_value & ~mask) - returns negative value if error occurred diff --git a/linux/drivers/media/dvb/bt8xx/patches/nebula-0.9.4.patch b/linux/drivers/media/dvb/bt8xx/patches/nebula-0.9.4.patch deleted file mode 100644 index 9baf23a8c..000000000 --- a/linux/drivers/media/dvb/bt8xx/patches/nebula-0.9.4.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naurp bttv-0.9.4/bttv-cards.c bttv-0.9.4-old/bttv-cards.c ---- bttv-0.9.4/bttv-cards.c Wed Jan 8 11:39:49 2003 -+++ bttv-0.9.4-old/bttv-cards.c Sun Jan 19 01:18:28 2003 -@@ -206,6 +206,7 @@ static struct CARD { - { 0x00790e11, BTTV_WINDVR, "Canopus WinDVR PCI" }, - { 0xa0fca1a0, BTTV_ZOLTRIX, "Face to Face Tvmax" }, - { 0xa0fca04f, BTTV_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, -+ { 0x01010071, BTTV_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, - - { 0, -1, NULL } - }; -@@ -1583,6 +1584,18 @@ struct tvcard bttv_tvcards[] = { - .no_tda7432 = 1, - .muxsel = { 2, 0, 1}, - .pll = PLL_28, -+},{ -+ .name = "Nebula Electronics DigiTV", -+ .video_inputs = 0, -+ .audio_inputs = 0, -+ .svhs = -1, -+ .muxsel = { 2, 3, 1, 0}, -+ .needs_tvaudio = 0, -+ .no_msp34xx = 1, -+ .no_tda9875 = 1, -+ .no_tda7432 = 1, -+ .pll = PLL_28, -+ .tuner_type = -1, - }}; - - const int bttv_num_tvcards = (sizeof(bttv_tvcards)/sizeof(struct tvcard)); -diff -Naurp bttv-0.9.4/bttv.h bttv-0.9.4-old/bttv.h ---- bttv-0.9.4/bttv.h Wed Jan 8 11:39:49 2003 -+++ bttv-0.9.4-old/bttv.h Sun Jan 19 11:46:59 2003 -@@ -108,6 +108,7 @@ - #define BTTV_PINNACLESAT 0x5e - #define BTTV_FORMAC_PROTV 0x5f - #define BTTV_EURESYS_PICOLO 0x61 -+#define BTTV_NEBULA_DIGITV 0x62 - - /* i2c address list */ - #define I2C_TSA5522 0xc2 |