diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2005-11-09 00:38:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:29 -0500 |
commit | 6cffcc23d2837295604033d884d1ad259d0aed57 (patch) | |
tree | 11a72fa287c5dcb0a5a5320a38fa16cfc949d598 /drivers/media | |
parent | 7418f3462aedf6fb962a44c8fa7259dd94530ff5 (diff) |
[PATCH] v4l: 896: rename BTTV_FOO --> BTTV_BOARD_FOO
Adapt to changes in v4l tree: rename BTTV_FOO --> BTTV_BOARD_FOO
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 05554e3949db..2e398090cf63 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c | |||
@@ -600,8 +600,8 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) | |||
600 | struct dst_state* state = NULL; | 600 | struct dst_state* state = NULL; |
601 | 601 | ||
602 | switch(type) { | 602 | switch(type) { |
603 | #ifdef BTTV_DVICO_DVBT_LITE | 603 | #ifdef BTTV_BOARD_DVICO_DVBT_LITE |
604 | case BTTV_DVICO_DVBT_LITE: | 604 | case BTTV_BOARD_DVICO_DVBT_LITE: |
605 | card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter); | 605 | card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter); |
606 | if (card->fe != NULL) { | 606 | if (card->fe != NULL) { |
607 | card->fe->ops->info.frequency_min = 174000000; | 607 | card->fe->ops->info.frequency_min = 174000000; |
@@ -610,8 +610,8 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) | |||
610 | break; | 610 | break; |
611 | #endif | 611 | #endif |
612 | 612 | ||
613 | #ifdef BTTV_DVICO_FUSIONHDTV_5_LITE | 613 | #ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE |
614 | case BTTV_DVICO_FUSIONHDTV_5_LITE: | 614 | case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE: |
615 | lgdt330x_reset(card); | 615 | lgdt330x_reset(card); |
616 | card->fe = lgdt330x_attach(&tdvs_tua6034_config, card->i2c_adapter); | 616 | card->fe = lgdt330x_attach(&tdvs_tua6034_config, card->i2c_adapter); |
617 | if (card->fe != NULL) | 617 | if (card->fe != NULL) |
@@ -619,10 +619,10 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) | |||
619 | break; | 619 | break; |
620 | #endif | 620 | #endif |
621 | 621 | ||
622 | #ifdef BTTV_TWINHAN_VP3021 | 622 | #ifdef BTTV_BOARD_TWINHAN_VP3021 |
623 | case BTTV_TWINHAN_VP3021: | 623 | case BTTV_BOARD_TWINHAN_VP3021: |
624 | #else | 624 | #else |
625 | case BTTV_NEBULA_DIGITV: | 625 | case BTTV_BOARD_NEBULA_DIGITV: |
626 | #endif | 626 | #endif |
627 | /* | 627 | /* |
628 | * It is possible to determine the correct frontend using the I2C bus (see the Nebula SDK); | 628 | * It is possible to determine the correct frontend using the I2C bus (see the Nebula SDK); |
@@ -645,11 +645,11 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) | |||
645 | dprintk ("dvb_bt8xx: an mt352 was detected on your digitv card\n"); | 645 | dprintk ("dvb_bt8xx: an mt352 was detected on your digitv card\n"); |
646 | break; | 646 | break; |
647 | 647 | ||
648 | case BTTV_AVDVBT_761: | 648 | case BTTV_BOARD_AVDVBT_761: |
649 | card->fe = sp887x_attach(µtune_mt7202dtf_config, card->i2c_adapter); | 649 | card->fe = sp887x_attach(µtune_mt7202dtf_config, card->i2c_adapter); |
650 | break; | 650 | break; |
651 | 651 | ||
652 | case BTTV_AVDVBT_771: | 652 | case BTTV_BOARD_AVDVBT_771: |
653 | card->fe = mt352_attach(&advbt771_samsung_tdtc9251dh0_config, card->i2c_adapter); | 653 | card->fe = mt352_attach(&advbt771_samsung_tdtc9251dh0_config, card->i2c_adapter); |
654 | if (card->fe != NULL) { | 654 | if (card->fe != NULL) { |
655 | card->fe->ops->info.frequency_min = 174000000; | 655 | card->fe->ops->info.frequency_min = 174000000; |
@@ -657,7 +657,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) | |||
657 | } | 657 | } |
658 | break; | 658 | break; |
659 | 659 | ||
660 | case BTTV_TWINHAN_DST: | 660 | case BTTV_BOARD_TWINHAN_DST: |
661 | /* DST is not a frontend driver !!! */ | 661 | /* DST is not a frontend driver !!! */ |
662 | state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL); | 662 | state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL); |
663 | /* Setup the Card */ | 663 | /* Setup the Card */ |
@@ -678,11 +678,11 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) | |||
678 | ret = dst_ca_attach(state, &card->dvb_adapter); | 678 | ret = dst_ca_attach(state, &card->dvb_adapter); |
679 | break; | 679 | break; |
680 | 680 | ||
681 | case BTTV_PINNACLESAT: | 681 | case BTTV_BOARD_PINNACLESAT: |
682 | card->fe = cx24110_attach(&pctvsat_config, card->i2c_adapter); | 682 | card->fe = cx24110_attach(&pctvsat_config, card->i2c_adapter); |
683 | break; | 683 | break; |
684 | 684 | ||
685 | case BTTV_PC_HDTV: | 685 | case BTTV_BOARD_PC_HDTV: |
686 | card->fe = or51211_attach(&or51211_config, card->i2c_adapter); | 686 | card->fe = or51211_attach(&or51211_config, card->i2c_adapter); |
687 | break; | 687 | break; |
688 | } | 688 | } |
@@ -804,7 +804,7 @@ static int dvb_bt8xx_probe(struct device *dev) | |||
804 | card->i2c_adapter = &sub->core->i2c_adap; | 804 | card->i2c_adapter = &sub->core->i2c_adap; |
805 | 805 | ||
806 | switch(sub->core->type) { | 806 | switch(sub->core->type) { |
807 | case BTTV_PINNACLESAT: | 807 | case BTTV_BOARD_PINNACLESAT: |
808 | card->gpio_mode = 0x0400c060; | 808 | card->gpio_mode = 0x0400c060; |
809 | /* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR, | 809 | /* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR, |
810 | BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */ | 810 | BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */ |
@@ -812,8 +812,8 @@ static int dvb_bt8xx_probe(struct device *dev) | |||
812 | card->irq_err_ignore = 0; | 812 | card->irq_err_ignore = 0; |
813 | break; | 813 | break; |
814 | 814 | ||
815 | #ifdef BTTV_DVICO_DVBT_LITE | 815 | #ifdef BTTV_BOARD_DVICO_DVBT_LITE |
816 | case BTTV_DVICO_DVBT_LITE: | 816 | case BTTV_BOARD_DVICO_DVBT_LITE: |
817 | #endif | 817 | #endif |
818 | card->gpio_mode = 0x0400C060; | 818 | card->gpio_mode = 0x0400C060; |
819 | card->op_sync_orin = 0; | 819 | card->op_sync_orin = 0; |
@@ -823,34 +823,34 @@ static int dvb_bt8xx_probe(struct device *dev) | |||
823 | * DA_APP(parallel) */ | 823 | * DA_APP(parallel) */ |
824 | break; | 824 | break; |
825 | 825 | ||
826 | #ifdef BTTV_DVICO_FUSIONHDTV_5_LITE | 826 | #ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE |
827 | case BTTV_DVICO_FUSIONHDTV_5_LITE: | 827 | case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE: |
828 | #endif | 828 | #endif |
829 | card->gpio_mode = 0x0400c060; | 829 | card->gpio_mode = 0x0400c060; |
830 | card->op_sync_orin = BT878_RISC_SYNC_MASK; | 830 | card->op_sync_orin = BT878_RISC_SYNC_MASK; |
831 | card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR; | 831 | card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR; |
832 | break; | 832 | break; |
833 | 833 | ||
834 | #ifdef BTTV_TWINHAN_VP3021 | 834 | #ifdef BTTV_BOARD_TWINHAN_VP3021 |
835 | case BTTV_TWINHAN_VP3021: | 835 | case BTTV_BOARD_TWINHAN_VP3021: |
836 | #else | 836 | #else |
837 | case BTTV_NEBULA_DIGITV: | 837 | case BTTV_BOARD_NEBULA_DIGITV: |
838 | #endif | 838 | #endif |
839 | case BTTV_AVDVBT_761: | 839 | case BTTV_BOARD_AVDVBT_761: |
840 | card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5); | 840 | card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5); |
841 | card->op_sync_orin = 0; | 841 | card->op_sync_orin = 0; |
842 | card->irq_err_ignore = 0; | 842 | card->irq_err_ignore = 0; |
843 | /* A_PWRDN DA_SBR DA_APP (high speed serial) */ | 843 | /* A_PWRDN DA_SBR DA_APP (high speed serial) */ |
844 | break; | 844 | break; |
845 | 845 | ||
846 | case BTTV_AVDVBT_771: //case 0x07711461: | 846 | case BTTV_BOARD_AVDVBT_771: //case 0x07711461: |
847 | card->gpio_mode = 0x0400402B; | 847 | card->gpio_mode = 0x0400402B; |
848 | card->op_sync_orin = BT878_RISC_SYNC_MASK; | 848 | card->op_sync_orin = BT878_RISC_SYNC_MASK; |
849 | card->irq_err_ignore = 0; | 849 | card->irq_err_ignore = 0; |
850 | /* A_PWRDN DA_SBR DA_APP[0] PKTP=10 RISC_ENABLE FIFO_ENABLE*/ | 850 | /* A_PWRDN DA_SBR DA_APP[0] PKTP=10 RISC_ENABLE FIFO_ENABLE*/ |
851 | break; | 851 | break; |
852 | 852 | ||
853 | case BTTV_TWINHAN_DST: | 853 | case BTTV_BOARD_TWINHAN_DST: |
854 | card->gpio_mode = 0x2204f2c; | 854 | card->gpio_mode = 0x2204f2c; |
855 | card->op_sync_orin = BT878_RISC_SYNC_MASK; | 855 | card->op_sync_orin = BT878_RISC_SYNC_MASK; |
856 | card->irq_err_ignore = BT878_APABORT | BT878_ARIPERR | | 856 | card->irq_err_ignore = BT878_APABORT | BT878_ARIPERR | |
@@ -868,7 +868,7 @@ static int dvb_bt8xx_probe(struct device *dev) | |||
868 | * RISC+FIFO ENABLE */ | 868 | * RISC+FIFO ENABLE */ |
869 | break; | 869 | break; |
870 | 870 | ||
871 | case BTTV_PC_HDTV: | 871 | case BTTV_BOARD_PC_HDTV: |
872 | card->gpio_mode = 0x0100EC7B; | 872 | card->gpio_mode = 0x0100EC7B; |
873 | card->op_sync_orin = 0; | 873 | card->op_sync_orin = 0; |
874 | card->irq_err_ignore = 0; | 874 | card->irq_err_ignore = 0; |