1c1
< /* BT848 1.52 Driver for Brooktree's Bt848 based cards.
---
> /* BT848 1.53 Driver for Brooktree's Bt848 based cards.
304a305,308
> 1.53 9 Sep 1998 Roger Hardiman <roger@cs.strath.ac.uk>
> Changed METEORSINPUT for Hauppauge cards with bt878.
> Submitted by Fred Templin <templin@erg.sri.com>
> Also fixed video_open defines and 878 support.
306d309
<
962,963c965,966
< /* CARD_UNKNOWN */
< { "Unknown", /* the 'name' */
---
> { CARD_UNKNOWN, /* the card id */
> "Unknown", /* the 'name' */
971,972c974,975
< /* CARD_MIRO */
< { "Miro TV", /* the 'name' */
---
> { CARD_MIRO, /* the card id */
> "Miro TV", /* the 'name' */
980,981c983,984
< /* CARD_HAUPPAUGE */
< { "Hauppauge WinCast/TV", /* the 'name' */
---
> { CARD_HAUPPAUGE, /* the card id */
> "Hauppauge WinCast/TV", /* the 'name' */
989,990c992,993
< /* CARD_STB */
< { "STB TV/PCI", /* the 'name' */
---
> { CARD_STB, /* the card id */
> "STB TV/PCI", /* the 'name' */
998,999c1001,1002
< /* CARD_INTEL */
< { "Intel Smart Video III/VideoLogic Captivator PCI", /* the 'name' */
---
> { CARD_INTEL, /* the card id */
> "Intel Smart Video III/VideoLogic Captivator PCI", /* the 'name' */
1007,1008c1010,1011
< /* CARD_IMS_TURBO */
< { "IMS TV Turbo", /* the 'name' */
---
> { CARD_IMS_TURBO, /* the card id */
> "IMS TV Turbo", /* the 'name' */
1016,1017c1019,1020
< /* CARD_AVER_MEDIA */
< { "AVer Media TV/FM", /* the 'name' */
---
> { CARD_AVER_MEDIA, /* the card id */
> "AVer Media TV/FM", /* the 'name' */
1673,1675c1676
< bt848->iform = BT848_IFORM_M_MUX1 |
< BT848_IFORM_X_XT0 |
< BT848_IFORM_F_NTSCM;
---
> bt848->iform = BT848_IFORM_F_NTSCM;
1679,1681c1680
< bt848->iform = BT848_IFORM_M_MUX1 |
< BT848_IFORM_X_XT1 |
< BT848_IFORM_F_PALBDGHI;
---
> bt848->iform = BT848_IFORM_F_PALBDGHI;
1685a1685,1693
> bt848->iform |= format_params[bktr->format_params].iform_xtsel;
>
> /* work around for new Hauppauge 878 cards */
> if ((bktr->card.card_id == CARD_HAUPPAUGE) &&
> (bktr->id==BROOKTREE_878_ID || bktr->id==BROOKTREE_879_ID) )
> bt848->iform |= BT848_IFORM_M_MUX3;
> else
> bt848->iform |= BT848_IFORM_M_MUX1;
>
2885a2894,2901
> /* Bt848 has 3 MUX Inputs. Bt848a/849/878/879 has 4 MUX Inputs*/
> /* On the original bt848 boards, */
> /* Tuner is MUX0, RCA is MUX1, S-Video is MUX2 */
> /* On the Hauppauge bt878 boards, */
> /* Tuner is MUX0, RCA is MUX4 */
> /* Unfortunatly Meteor driver codes DEV_RCA as DEV_0, so we */
> /* stick with this system in our Meteor Emulation */
>
2890a2907
> /* METEOR_INPUT_DEV_RCA: */
2894c2911,2919
< bt848->iform |= BT848_IFORM_M_MUX1;
---
>
> /* work around for new Hauppauge 878 cards */
> if ((bktr->card.card_id == CARD_HAUPPAUGE) &&
> (bktr->id==BROOKTREE_878_ID ||
> bktr->id==BROOKTREE_879_ID) )
> bt848->iform |= BT848_IFORM_M_MUX3;
> else
> bt848->iform |= BT848_IFORM_M_MUX1;
>
2924,2925c2949,2952
< if (bktr->id == BROOKTREE_878_ID ||
< bktr->id == BROOKTREE_879_ID ) {
---
> /* how do I detect a bt848a ? */
> if ((bktr->id == BROOKTREE_849_ID) ||
> (bktr->id == BROOKTREE_878_ID) ||
> (bktr->id == BROOKTREE_879_ID) ) {