aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2006-01-11 16:40:17 -0500
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-11 16:40:17 -0500
commitbc28636ad37717c53d3247964164cf7ca1aff9d7 (patch)
treece82aefa1d01d4469ab1829d1e520c657d98f6f2 /drivers/media/video
parent2d05ae6b5b77f063aa0f82cf0570f3e4b80b367c (diff)
V4L/DVB (3341): whitespace cleanup: insert missing space before curly brackets
- whitespace cleanup: insert missing space before curly brackets Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/bttv-cards.c282
1 files changed, 141 insertions, 141 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 6c92a6f5fc10..e14d343d2d94 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -321,7 +321,7 @@ struct tvcard bttv_tvcards[] = {
321 .audio_inputs = 1, 321 .audio_inputs = 1,
322 .tuner = 0, 322 .tuner = 0,
323 .svhs = 2, 323 .svhs = 2,
324 .muxsel = { 2, 3, 1, 0}, 324 .muxsel = { 2, 3, 1, 0 },
325 .tuner_type = -1, 325 .tuner_type = -1,
326 .tuner_addr = ADDR_UNSET, 326 .tuner_addr = ADDR_UNSET,
327 .radio_addr = ADDR_UNSET, 327 .radio_addr = ADDR_UNSET,
@@ -333,8 +333,8 @@ struct tvcard bttv_tvcards[] = {
333 .tuner = 0, 333 .tuner = 0,
334 .svhs = 2, 334 .svhs = 2,
335 .gpiomask = 15, 335 .gpiomask = 15,
336 .muxsel = { 2, 3, 1, 1}, 336 .muxsel = { 2, 3, 1, 1 },
337 .audiomux = { 2, 0, 0, 0, 10}, 337 .audiomux = { 2, 0, 0, 0, 10 },
338 .needs_tvaudio = 1, 338 .needs_tvaudio = 1,
339 .tuner_type = -1, 339 .tuner_type = -1,
340 .tuner_addr = ADDR_UNSET, 340 .tuner_addr = ADDR_UNSET,
@@ -347,8 +347,8 @@ struct tvcard bttv_tvcards[] = {
347 .tuner = 0, 347 .tuner = 0,
348 .svhs = 2, 348 .svhs = 2,
349 .gpiomask = 7, 349 .gpiomask = 7,
350 .muxsel = { 2, 3, 1, 1}, 350 .muxsel = { 2, 3, 1, 1 },
351 .audiomux = { 0, 1, 2, 3, 4}, 351 .audiomux = { 0, 1, 2, 3, 4 },
352 .needs_tvaudio = 1, 352 .needs_tvaudio = 1,
353 .tuner_type = -1, 353 .tuner_type = -1,
354 .tuner_addr = ADDR_UNSET, 354 .tuner_addr = ADDR_UNSET,
@@ -361,8 +361,8 @@ struct tvcard bttv_tvcards[] = {
361 .tuner = 0, 361 .tuner = 0,
362 .svhs = 2, 362 .svhs = 2,
363 .gpiomask = 7, 363 .gpiomask = 7,
364 .muxsel = { 2, 3, 1, 1}, 364 .muxsel = { 2, 3, 1, 1 },
365 .audiomux = { 4, 0, 2, 3, 1}, 365 .audiomux = { 4, 0, 2, 3, 1 },
366 .no_msp34xx = 1, 366 .no_msp34xx = 1,
367 .needs_tvaudio = 1, 367 .needs_tvaudio = 1,
368 .tuner_type = TUNER_PHILIPS_NTSC, 368 .tuner_type = TUNER_PHILIPS_NTSC,
@@ -380,7 +380,7 @@ struct tvcard bttv_tvcards[] = {
380 .tuner = -1, 380 .tuner = -1,
381 .svhs = 2, 381 .svhs = 2,
382 .gpiomask = 0, 382 .gpiomask = 0,
383 .muxsel = { 2, 3, 1, 1}, 383 .muxsel = { 2, 3, 1, 1 },
384 .audiomux = { 0 }, 384 .audiomux = { 0 },
385 .needs_tvaudio = 0, 385 .needs_tvaudio = 0,
386 .tuner_type = 4, 386 .tuner_type = 4,
@@ -394,8 +394,8 @@ struct tvcard bttv_tvcards[] = {
394 .tuner = 0, 394 .tuner = 0,
395 .svhs = 2, 395 .svhs = 2,
396 .gpiomask = 3, 396 .gpiomask = 3,
397 .muxsel = { 2, 3, 1, 0}, 397 .muxsel = { 2, 3, 1, 0 },
398 .audiomux = { 0, 1, 0, 1, 3}, 398 .audiomux = { 0, 1, 0, 1, 3 },
399 .needs_tvaudio = 1, 399 .needs_tvaudio = 1,
400 .tuner_type = -1, 400 .tuner_type = -1,
401 .tuner_addr = ADDR_UNSET, 401 .tuner_addr = ADDR_UNSET,
@@ -407,9 +407,9 @@ struct tvcard bttv_tvcards[] = {
407 .audio_inputs = 1, 407 .audio_inputs = 1,
408 .tuner = 0, 408 .tuner = 0,
409 .svhs = 3, 409 .svhs = 3,
410 .muxsel = { 2, 3, 1, 1}, 410 .muxsel = { 2, 3, 1, 1 },
411 .gpiomask = 0x0f, 411 .gpiomask = 0x0f,
412 .audiomux = { 0x0c, 0x04, 0x08, 0x04, 0}, 412 .audiomux = { 0x0c, 0x04, 0x08, 0x04, 0 },
413 /* 0x04 for some cards ?? */ 413 /* 0x04 for some cards ?? */
414 .needs_tvaudio = 1, 414 .needs_tvaudio = 1,
415 .tuner_type = -1, 415 .tuner_type = -1,
@@ -425,8 +425,8 @@ struct tvcard bttv_tvcards[] = {
425 .tuner = -1, 425 .tuner = -1,
426 .svhs = 3, 426 .svhs = 3,
427 .gpiomask = 0, 427 .gpiomask = 0,
428 .muxsel = { 2, 3, 1, 0, 0}, 428 .muxsel = { 2, 3, 1, 0, 0 },
429 .audiomux = {0 }, 429 .audiomux = { 0 },
430 .needs_tvaudio = 1, 430 .needs_tvaudio = 1,
431 .tuner_type = -1, 431 .tuner_type = -1,
432 .tuner_addr = ADDR_UNSET, 432 .tuner_addr = ADDR_UNSET,
@@ -441,8 +441,8 @@ struct tvcard bttv_tvcards[] = {
441 .tuner = 0, 441 .tuner = 0,
442 .svhs = 2, 442 .svhs = 2,
443 .gpiomask = 0xc00, 443 .gpiomask = 0xc00,
444 .muxsel = { 2, 3, 1, 1}, 444 .muxsel = { 2, 3, 1, 1 },
445 .audiomux = { 0, 0xc00, 0x800, 0x400, 0xc00, 0}, 445 .audiomux = { 0, 0xc00, 0x800, 0x400, 0xc00, 0 },
446 .needs_tvaudio = 1, 446 .needs_tvaudio = 1,
447 .pll = PLL_28, 447 .pll = PLL_28,
448 .tuner_type = -1, 448 .tuner_type = -1,
@@ -456,8 +456,8 @@ struct tvcard bttv_tvcards[] = {
456 .tuner = 0, 456 .tuner = 0,
457 .svhs = 2, 457 .svhs = 2,
458 .gpiomask = 3, 458 .gpiomask = 3,
459 .muxsel = { 2, 3, 1, 1}, 459 .muxsel = { 2, 3, 1, 1 },
460 .audiomux = { 1, 1, 2, 3, 0}, 460 .audiomux = { 1, 1, 2, 3, 0 },
461 .needs_tvaudio = 0, 461 .needs_tvaudio = 0,
462 .pll = PLL_28, 462 .pll = PLL_28,
463 .tuner_type = TUNER_TEMIC_PAL, 463 .tuner_type = TUNER_TEMIC_PAL,
@@ -471,8 +471,8 @@ struct tvcard bttv_tvcards[] = {
471 .tuner = 0, 471 .tuner = 0,
472 .svhs = 2, 472 .svhs = 2,
473 .gpiomask = 0x0f, /* old: 7 */ 473 .gpiomask = 0x0f, /* old: 7 */
474 .muxsel = { 2, 0, 1, 1}, 474 .muxsel = { 2, 0, 1, 1 },
475 .audiomux = { 0, 1, 2, 3, 4}, 475 .audiomux = { 0, 1, 2, 3, 4 },
476 .needs_tvaudio = 1, 476 .needs_tvaudio = 1,
477 .pll = PLL_28, 477 .pll = PLL_28,
478 .tuner_type = -1, 478 .tuner_type = -1,
@@ -486,8 +486,8 @@ struct tvcard bttv_tvcards[] = {
486 .tuner = 0, 486 .tuner = 0,
487 .svhs = 2, 487 .svhs = 2,
488 .gpiomask = 0x3014f, 488 .gpiomask = 0x3014f,
489 .muxsel = { 2, 3, 1, 1}, 489 .muxsel = { 2, 3, 1, 1 },
490 .audiomux = { 0x20001,0x10001, 0, 0,10}, 490 .audiomux = { 0x20001,0x10001, 0, 0,10 },
491 .needs_tvaudio = 1, 491 .needs_tvaudio = 1,
492 .tuner_type = -1, 492 .tuner_type = -1,
493 .tuner_addr = ADDR_UNSET, 493 .tuner_addr = ADDR_UNSET,
@@ -502,8 +502,8 @@ struct tvcard bttv_tvcards[] = {
502 .tuner = 0, 502 .tuner = 0,
503 .svhs = 2, 503 .svhs = 2,
504 .gpiomask = 15, 504 .gpiomask = 15,
505 .muxsel = { 2, 3, 1, 1}, 505 .muxsel = { 2, 3, 1, 1 },
506 .audiomux = { 13, 14, 11, 7, 0, 0}, 506 .audiomux = { 13, 14, 11, 7, 0, 0 },
507 .needs_tvaudio = 1, 507 .needs_tvaudio = 1,
508 .tuner_type = -1, 508 .tuner_type = -1,
509 .tuner_addr = ADDR_UNSET, 509 .tuner_addr = ADDR_UNSET,
@@ -516,8 +516,8 @@ struct tvcard bttv_tvcards[] = {
516 .tuner = 0, 516 .tuner = 0,
517 .svhs = 2, 517 .svhs = 2,
518 .gpiomask = 15, 518 .gpiomask = 15,
519 .muxsel = { 2, 3, 1, 1}, 519 .muxsel = { 2, 3, 1, 1 },
520 .audiomux = { 13, 14, 11, 7, 0, 0}, 520 .audiomux = { 13, 14, 11, 7, 0, 0 },
521 .needs_tvaudio = 1, 521 .needs_tvaudio = 1,
522 .msp34xx_alt = 1, 522 .msp34xx_alt = 1,
523 .pll = PLL_28, 523 .pll = PLL_28,
@@ -534,8 +534,8 @@ struct tvcard bttv_tvcards[] = {
534 .tuner = 0, 534 .tuner = 0,
535 .svhs = 2, 535 .svhs = 2,
536 .gpiomask = 7, 536 .gpiomask = 7,
537 .muxsel = { 2, 3, 1, 1}, 537 .muxsel = { 2, 3, 1, 1 },
538 .audiomux = { 0, 2, 1, 3, 4}, /* old: { 0, 1, 2, 3, 4} */ 538 .audiomux = { 0, 2, 1, 3, 4 }, /* old: {0, 1, 2, 3, 4} */
539 .needs_tvaudio = 1, 539 .needs_tvaudio = 1,
540 .pll = PLL_28, 540 .pll = PLL_28,
541 .tuner_type = -1, 541 .tuner_type = -1,
@@ -549,8 +549,8 @@ struct tvcard bttv_tvcards[] = {
549 .tuner = 0, 549 .tuner = 0,
550 .svhs = 2, 550 .svhs = 2,
551 .gpiomask = 15, 551 .gpiomask = 15,
552 .muxsel = { 2, 3, 1, 1}, 552 .muxsel = { 2, 3, 1, 1 },
553 .audiomux = {0 , 0, 1 , 0, 10}, 553 .audiomux = { 0 , 0, 1 , 0, 10 },
554 .needs_tvaudio = 1, 554 .needs_tvaudio = 1,
555 .tuner_type = -1, 555 .tuner_type = -1,
556 .tuner_addr = ADDR_UNSET, 556 .tuner_addr = ADDR_UNSET,
@@ -565,7 +565,7 @@ struct tvcard bttv_tvcards[] = {
565 .tuner = 0, 565 .tuner = 0,
566 .svhs = 2, 566 .svhs = 2,
567 .gpiomask = 0x01fe00, 567 .gpiomask = 0x01fe00,
568 .muxsel = { 2, 3, 1, 1}, 568 .muxsel = { 2, 3, 1, 1 },
569 #if 0 569 #if 0
570 /* old */ 570 /* old */
571 .audiomux = { 0x01c000, 0, 0x018000, 0x014000, 0x002000, 0 }, 571 .audiomux = { 0x01c000, 0, 0x018000, 0x014000, 0x002000, 0 },
@@ -584,8 +584,8 @@ struct tvcard bttv_tvcards[] = {
584 .tuner = 0, 584 .tuner = 0,
585 .svhs = 2, 585 .svhs = 2,
586 .gpiomask = 0x8300f8, 586 .gpiomask = 0x8300f8,
587 .muxsel = { 2, 3, 1, 1,0}, 587 .muxsel = { 2, 3, 1, 1,0 },
588 .audiomux = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007}, 588 .audiomux = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007 },
589 .needs_tvaudio = 1, 589 .needs_tvaudio = 1,
590 .tuner_type = -1, 590 .tuner_type = -1,
591 .tuner_addr = ADDR_UNSET, 591 .tuner_addr = ADDR_UNSET,
@@ -600,8 +600,8 @@ struct tvcard bttv_tvcards[] = {
600 .tuner = 0, 600 .tuner = 0,
601 .svhs = 2, 601 .svhs = 2,
602 .gpiomask = 0, 602 .gpiomask = 0,
603 .muxsel = {2, 3, 1, 1}, 603 .muxsel = { 2, 3, 1, 1 },
604 .audiomux = {1, 0, 0, 0, 0}, 604 .audiomux = { 1, 0, 0, 0, 0 },
605 .needs_tvaudio = 1, 605 .needs_tvaudio = 1,
606 .tuner_type = -1, 606 .tuner_type = -1,
607 .tuner_addr = ADDR_UNSET, 607 .tuner_addr = ADDR_UNSET,
@@ -614,7 +614,7 @@ struct tvcard bttv_tvcards[] = {
614 .tuner = -1, 614 .tuner = -1,
615 .svhs = -1, 615 .svhs = -1,
616 .gpiomask = 0x8dff00, 616 .gpiomask = 0x8dff00,
617 .muxsel = { 2, 3, 1, 1}, 617 .muxsel = { 2, 3, 1, 1 },
618 .audiomux = { 0 }, 618 .audiomux = { 0 },
619 .no_msp34xx = 1, 619 .no_msp34xx = 1,
620 .tuner_type = -1, 620 .tuner_type = -1,
@@ -629,7 +629,7 @@ struct tvcard bttv_tvcards[] = {
629 .audio_inputs = 3, 629 .audio_inputs = 3,
630 .tuner = 0, 630 .tuner = 0,
631 .svhs = 2, 631 .svhs = 2,
632 .muxsel = {2, 3, 1, 1}, 632 .muxsel = { 2, 3, 1, 1 },
633 .tuner_type = -1, 633 .tuner_type = -1,
634 .tuner_addr = ADDR_UNSET, 634 .tuner_addr = ADDR_UNSET,
635 .radio_addr = ADDR_UNSET, 635 .radio_addr = ADDR_UNSET,
@@ -641,8 +641,8 @@ struct tvcard bttv_tvcards[] = {
641 .tuner = 0, 641 .tuner = 0,
642 .svhs = 2, 642 .svhs = 2,
643 .gpiomask = 0x1800, 643 .gpiomask = 0x1800,
644 .muxsel = { 2, 3, 1, 1}, 644 .muxsel = { 2, 3, 1, 1 },
645 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800}, 645 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800 },
646 .pll = PLL_28, 646 .pll = PLL_28,
647 .tuner_type = TUNER_PHILIPS_PAL_I, 647 .tuner_type = TUNER_PHILIPS_PAL_I,
648 .tuner_addr = ADDR_UNSET, 648 .tuner_addr = ADDR_UNSET,
@@ -655,8 +655,8 @@ struct tvcard bttv_tvcards[] = {
655 .tuner = 0, 655 .tuner = 0,
656 .svhs = 2, 656 .svhs = 2,
657 .gpiomask = 0xc00, 657 .gpiomask = 0xc00,
658 .muxsel = { 2, 3, 1, 1}, 658 .muxsel = { 2, 3, 1, 1 },
659 .audiomux = {0, 1, 0x800, 0x400, 0xc00, 0}, 659 .audiomux = { 0, 1, 0x800, 0x400, 0xc00, 0 },
660 .needs_tvaudio = 1, 660 .needs_tvaudio = 1,
661 .pll = PLL_28, 661 .pll = PLL_28,
662 .tuner_type = -1, 662 .tuner_type = -1,
@@ -688,8 +688,8 @@ struct tvcard bttv_tvcards[] = {
688 .tuner = 0, 688 .tuner = 0,
689 .svhs = 2, 689 .svhs = 2,
690 .gpiomask = 0xe00, 690 .gpiomask = 0xe00,
691 .muxsel = { 2, 3, 1, 1}, 691 .muxsel = { 2, 3, 1, 1 },
692 .audiomux = {0x400, 0x400, 0x400, 0x400, 0xc00}, 692 .audiomux = {0x400, 0x400, 0x400, 0x400, 0xc00 },
693 .needs_tvaudio = 1, 693 .needs_tvaudio = 1,
694 .pll = PLL_28, 694 .pll = PLL_28,
695 .tuner_type = -1, 695 .tuner_type = -1,
@@ -704,8 +704,8 @@ struct tvcard bttv_tvcards[] = {
704 .tuner = 0, 704 .tuner = 0,
705 .svhs = 2, 705 .svhs = 2,
706 .gpiomask = 0x1f0fff, 706 .gpiomask = 0x1f0fff,
707 .muxsel = { 2, 3, 1, 1}, 707 .muxsel = { 2, 3, 1, 1 },
708 .audiomux = { 0x20000, 0x30000, 0x10000, 0, 0x40000}, 708 .audiomux = { 0x20000, 0x30000, 0x10000, 0, 0x40000 },
709 .needs_tvaudio = 0, 709 .needs_tvaudio = 0,
710 .tuner_type = TUNER_PHILIPS_PAL, 710 .tuner_type = TUNER_PHILIPS_PAL,
711 .tuner_addr = ADDR_UNSET, 711 .tuner_addr = ADDR_UNSET,
@@ -719,8 +719,8 @@ struct tvcard bttv_tvcards[] = {
719 .tuner = 0, 719 .tuner = 0,
720 .svhs = 3, 720 .svhs = 3,
721 .gpiomask = 7, 721 .gpiomask = 7,
722 .muxsel = { 2, 0, 1, 1}, 722 .muxsel = { 2, 0, 1, 1 },
723 .audiomux = { 0, 1, 2, 3, 4}, 723 .audiomux = { 0, 1, 2, 3, 4 },
724 .needs_tvaudio = 1, 724 .needs_tvaudio = 1,
725 .tuner_type = -1, 725 .tuner_type = -1,
726 .tuner_addr = ADDR_UNSET, 726 .tuner_addr = ADDR_UNSET,
@@ -733,8 +733,8 @@ struct tvcard bttv_tvcards[] = {
733 .tuner = 0, 733 .tuner = 0,
734 .svhs = 2, 734 .svhs = 2,
735 .gpiomask = 0x1800, 735 .gpiomask = 0x1800,
736 .muxsel = { 2, 3, 1, 1}, 736 .muxsel = { 2, 3, 1, 1 },
737 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800}, 737 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800 },
738 .pll = PLL_28, 738 .pll = PLL_28,
739 .tuner_type = TUNER_PHILIPS_SECAM, 739 .tuner_type = TUNER_PHILIPS_SECAM,
740 .tuner_addr = ADDR_UNSET, 740 .tuner_addr = ADDR_UNSET,
@@ -749,8 +749,8 @@ struct tvcard bttv_tvcards[] = {
749 .tuner = 0, 749 .tuner = 0,
750 .svhs = 2, 750 .svhs = 2,
751 .gpiomask = 0x1f0fff, 751 .gpiomask = 0x1f0fff,
752 .muxsel = { 2, 3, 1, 1}, 752 .muxsel = { 2, 3, 1, 1 },
753 .audiomux = { 0x20000, 0x30000, 0x10000, 0x00000, 0x40000}, 753 .audiomux = { 0x20000, 0x30000, 0x10000, 0x00000, 0x40000 },
754 .needs_tvaudio = 0, 754 .needs_tvaudio = 0,
755 .tuner_type = TUNER_PHILIPS_PAL, 755 .tuner_type = TUNER_PHILIPS_PAL,
756 .tuner_addr = ADDR_UNSET, 756 .tuner_addr = ADDR_UNSET,
@@ -812,7 +812,7 @@ struct tvcard bttv_tvcards[] = {
812 .tuner = 0, 812 .tuner = 0,
813 .svhs = 2, 813 .svhs = 2,
814 .gpiomask = 0x1800, /* 0x8dfe00 */ 814 .gpiomask = 0x1800, /* 0x8dfe00 */
815 .muxsel = { 2, 3, 1, 1}, 815 .muxsel = { 2, 3, 1, 1 },
816 .audiomux = { 0, 0x0800, 0x1000, 0x1000, 0x1800, 0 }, 816 .audiomux = { 0, 0x0800, 0x1000, 0x1000, 0x1800, 0 },
817 .pll = PLL_28, 817 .pll = PLL_28,
818 .tuner_type = -1, 818 .tuner_type = -1,
@@ -826,7 +826,7 @@ struct tvcard bttv_tvcards[] = {
826 .tuner = 0, 826 .tuner = 0,
827 .svhs = 3, 827 .svhs = 3,
828 .gpiomask = 1, 828 .gpiomask = 1,
829 .muxsel = { 2, 3, 1, 1}, 829 .muxsel = { 2, 3, 1, 1 },
830 .audiomux = { 1, 0, 0, 0, 0 }, 830 .audiomux = { 1, 0, 0, 0, 0 },
831 .pll = PLL_28, 831 .pll = PLL_28,
832 .tuner_type = TUNER_PHILIPS_PAL, 832 .tuner_type = TUNER_PHILIPS_PAL,
@@ -842,7 +842,7 @@ struct tvcard bttv_tvcards[] = {
842 .tuner = -1, 842 .tuner = -1,
843 .svhs = 2, 843 .svhs = 2,
844 .gpiomask = 0, 844 .gpiomask = 0,
845 .muxsel = { 2, 3, 1, 1}, 845 .muxsel = { 2, 3, 1, 1 },
846 .audiomux = { 0 }, 846 .audiomux = { 0 },
847 .needs_tvaudio = 0, 847 .needs_tvaudio = 0,
848 .tuner_type = 4, 848 .tuner_type = 4,
@@ -856,8 +856,8 @@ struct tvcard bttv_tvcards[] = {
856 .tuner = 0, 856 .tuner = 0,
857 .svhs = 2, 857 .svhs = 2,
858 .gpiomask = 0xffff00, 858 .gpiomask = 0xffff00,
859 .muxsel = { 2, 3, 1, 1}, 859 .muxsel = { 2, 3, 1, 1 },
860 .audiomux = { 0x500, 0, 0x300, 0x900, 0x900}, 860 .audiomux = { 0x500, 0, 0x300, 0x900, 0x900 },
861 .needs_tvaudio = 1, 861 .needs_tvaudio = 1,
862 .pll = PLL_28, 862 .pll = PLL_28,
863 .tuner_type = TUNER_PHILIPS_PAL, 863 .tuner_type = TUNER_PHILIPS_PAL,
@@ -870,7 +870,7 @@ struct tvcard bttv_tvcards[] = {
870 .audio_inputs = 1, 870 .audio_inputs = 1,
871 .tuner = 0, 871 .tuner = 0,
872 .svhs = 2, 872 .svhs = 2,
873 .muxsel = { 2, 3, 1, 1, 0}, /* TV, CVid, SVid, CVid over SVid connector */ 873 .muxsel = { 2, 3, 1, 1, 0 }, /* TV, CVid, SVid, CVid over SVid connector */
874 #if 0 874 #if 0
875 .gpiomask = 0xc33000, 875 .gpiomask = 0xc33000,
876 .audiomux = { 0x422000,0x1000,0x0000,0x620000,0x800000 }, 876 .audiomux = { 0x422000,0x1000,0x0000,0x620000,0x800000 },
@@ -906,8 +906,8 @@ struct tvcard bttv_tvcards[] = {
906 .tuner = 0, 906 .tuner = 0,
907 .svhs = 2, 907 .svhs = 2,
908 .gpiomask = 0x1800, 908 .gpiomask = 0x1800,
909 .muxsel = { 2, 3, 1, 1}, 909 .muxsel = { 2, 3, 1, 1 },
910 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800}, 910 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800 },
911 .pll = PLL_28, 911 .pll = PLL_28,
912 .tuner_type = -1, 912 .tuner_type = -1,
913 .tuner_addr = ADDR_UNSET, 913 .tuner_addr = ADDR_UNSET,
@@ -922,7 +922,7 @@ struct tvcard bttv_tvcards[] = {
922 .tuner = 0, 922 .tuner = 0,
923 .svhs = 2, 923 .svhs = 2,
924 .gpiomask = 0x1800, 924 .gpiomask = 0x1800,
925 .muxsel = { 2, 3, 1, 1}, 925 .muxsel = { 2, 3, 1, 1 },
926 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 }, 926 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
927 .pll = PLL_28, 927 .pll = PLL_28,
928 .tuner_type = -1, 928 .tuner_type = -1,
@@ -952,7 +952,7 @@ struct tvcard bttv_tvcards[] = {
952 .tuner = 0, 952 .tuner = 0,
953 .svhs = 2, 953 .svhs = 2,
954 .gpiomask = 0x551e00, 954 .gpiomask = 0x551e00,
955 .muxsel = { 2, 3, 1, 0}, 955 .muxsel = { 2, 3, 1, 0 },
956 .audiomux = { 0x551400, 0x551200, 0, 0, 0x551c00, 0x551200 }, 956 .audiomux = { 0x551400, 0x551200, 0, 0, 0x551c00, 0x551200 },
957 .needs_tvaudio = 1, 957 .needs_tvaudio = 1,
958 .pll = PLL_28, 958 .pll = PLL_28,
@@ -968,8 +968,8 @@ struct tvcard bttv_tvcards[] = {
968 .tuner = 0, 968 .tuner = 0,
969 .svhs = 2, 969 .svhs = 2,
970 .gpiomask = 0x03000F, 970 .gpiomask = 0x03000F,
971 .muxsel = { 2, 3, 1, 1}, 971 .muxsel = { 2, 3, 1, 1 },
972 .audiomux = { 2, 0xd0001, 0, 0, 1}, 972 .audiomux = { 2, 0xd0001, 0, 0, 1 },
973 .needs_tvaudio = 0, 973 .needs_tvaudio = 0,
974 .pll = PLL_28, 974 .pll = PLL_28,
975 .tuner_type = -1, 975 .tuner_type = -1,
@@ -985,8 +985,8 @@ struct tvcard bttv_tvcards[] = {
985 .tuner = 0, 985 .tuner = 0,
986 .svhs = 2, 986 .svhs = 2,
987 .gpiomask = 7, 987 .gpiomask = 7,
988 .muxsel = { 2, 3, 1, 1}, 988 .muxsel = { 2, 3, 1, 1 },
989 .audiomux = { 4, 0, 2, 3, 1}, 989 .audiomux = { 4, 0, 2, 3, 1 },
990 .no_msp34xx = 1, 990 .no_msp34xx = 1,
991 .needs_tvaudio = 1, 991 .needs_tvaudio = 1,
992 .tuner_type = TUNER_PHILIPS_NTSC, 992 .tuner_type = TUNER_PHILIPS_NTSC,
@@ -1002,8 +1002,8 @@ struct tvcard bttv_tvcards[] = {
1002 .tuner = 0, 1002 .tuner = 0,
1003 .svhs = 2, 1003 .svhs = 2,
1004 .gpiomask = 15, 1004 .gpiomask = 15,
1005 .muxsel = { 2, 3, 1, 1}, 1005 .muxsel = { 2, 3, 1, 1 },
1006 .audiomux = { 13, 4, 11, 7, 0, 0}, 1006 .audiomux = { 13, 4, 11, 7, 0, 0 },
1007 .needs_tvaudio = 1, 1007 .needs_tvaudio = 1,
1008 .pll = PLL_28, 1008 .pll = PLL_28,
1009 .tuner_type = -1, 1009 .tuner_type = -1,
@@ -1035,8 +1035,8 @@ struct tvcard bttv_tvcards[] = {
1035 .tuner = 0, 1035 .tuner = 0,
1036 .svhs = 2, 1036 .svhs = 2,
1037 .gpiomask = 0xe00b, 1037 .gpiomask = 0xe00b,
1038 .muxsel = {2, 3, 1, 1}, 1038 .muxsel = { 2, 3, 1, 1 },
1039 .audiomux = {0xff9ff6, 0xff9ff6, 0xff1ff7, 0, 0xff3ffc}, 1039 .audiomux = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0, 0xff3ffc },
1040 .no_msp34xx = 1, 1040 .no_msp34xx = 1,
1041 .tuner_type = -1, 1041 .tuner_type = -1,
1042 .tuner_addr = ADDR_UNSET, 1042 .tuner_addr = ADDR_UNSET,
@@ -1051,8 +1051,8 @@ struct tvcard bttv_tvcards[] = {
1051 .tuner = 0, 1051 .tuner = 0,
1052 .svhs = -1, 1052 .svhs = -1,
1053 .gpiomask = 3, 1053 .gpiomask = 3,
1054 .muxsel = {2, 3, 1, 1}, 1054 .muxsel = { 2, 3, 1, 1 },
1055 .audiomux = {1, 1, 0, 2, 3}, 1055 .audiomux = { 1, 1, 0, 2, 3 },
1056 .no_msp34xx = 1, 1056 .no_msp34xx = 1,
1057 .pll = PLL_NONE, 1057 .pll = PLL_NONE,
1058 .tuner_type = -1, 1058 .tuner_type = -1,
@@ -1066,8 +1066,8 @@ struct tvcard bttv_tvcards[] = {
1066 .tuner = -1, 1066 .tuner = -1,
1067 .svhs = 3, 1067 .svhs = 3,
1068 .gpiomask = 0, 1068 .gpiomask = 0,
1069 .muxsel = { 2, 3, 1, 0, 0}, 1069 .muxsel = { 2, 3, 1, 0, 0 },
1070 .audiomux = {0 }, 1070 .audiomux = { 0 },
1071 .no_msp34xx = 1, 1071 .no_msp34xx = 1,
1072 .pll = PLL_28, 1072 .pll = PLL_28,
1073 .tuner_type = -1, 1073 .tuner_type = -1,
@@ -1081,8 +1081,8 @@ struct tvcard bttv_tvcards[] = {
1081 .tuner = 0, 1081 .tuner = 0,
1082 .svhs = 2, 1082 .svhs = 2,
1083 .gpiomask = 0xbcf03f, 1083 .gpiomask = 0xbcf03f,
1084 .muxsel = { 2, 3, 1, 1}, 1084 .muxsel = { 2, 3, 1, 1 },
1085 .audiomux = { 0xbc803f, 0xbc903f, 0xbcb03f, 0, 0xbcb03f}, 1085 .audiomux = { 0xbc803f, 0xbc903f, 0xbcb03f, 0, 0xbcb03f },
1086 .no_msp34xx = 1, 1086 .no_msp34xx = 1,
1087 .pll = PLL_28, 1087 .pll = PLL_28,
1088 .tuner_type = 21, 1088 .tuner_type = 21,
@@ -1096,7 +1096,7 @@ struct tvcard bttv_tvcards[] = {
1096 .tuner = 0, 1096 .tuner = 0,
1097 .svhs = 2, 1097 .svhs = 2,
1098 .gpiomask = 0x70000, 1098 .gpiomask = 0x70000,
1099 .muxsel = { 2, 3, 1, 1}, 1099 .muxsel = { 2, 3, 1, 1 },
1100 .audiomux = { 0x20000, 0x30000, 0x10000, 0, 0x40000, 0x20000 }, 1100 .audiomux = { 0x20000, 0x30000, 0x10000, 0, 0x40000, 0x20000 },
1101 .needs_tvaudio = 1, 1101 .needs_tvaudio = 1,
1102 .no_msp34xx = 1, 1102 .no_msp34xx = 1,
@@ -1115,8 +1115,8 @@ struct tvcard bttv_tvcards[] = {
1115 .tuner = 0, 1115 .tuner = 0,
1116 .svhs = 2, 1116 .svhs = 2,
1117 .gpiomask = 15, 1117 .gpiomask = 15,
1118 .muxsel = { 2, 3, 1, 1}, 1118 .muxsel = { 2, 3, 1, 1 },
1119 .audiomux = {2,0,0,0,1}, 1119 .audiomux = {2,0,0,0,1 },
1120 .needs_tvaudio = 1, 1120 .needs_tvaudio = 1,
1121 .pll = PLL_28, 1121 .pll = PLL_28,
1122 .tuner_type = -1, 1122 .tuner_type = -1,
@@ -1130,8 +1130,8 @@ struct tvcard bttv_tvcards[] = {
1130 .tuner = 0, 1130 .tuner = 0,
1131 .svhs = 2, 1131 .svhs = 2,
1132 .gpiomask = 0x010f00, 1132 .gpiomask = 0x010f00,
1133 .muxsel = {2, 3, 0, 0}, 1133 .muxsel = {2, 3, 0, 0 },
1134 .audiomux = {0x10000, 0, 0x10000, 0, 0, 0}, 1134 .audiomux = {0x10000, 0, 0x10000, 0, 0, 0 },
1135 .no_msp34xx = 1, 1135 .no_msp34xx = 1,
1136 .pll = PLL_28, 1136 .pll = PLL_28,
1137 .tuner_type = TUNER_ALPS_TSHC6_NTSC, 1137 .tuner_type = TUNER_ALPS_TSHC6_NTSC,
@@ -1172,8 +1172,8 @@ struct tvcard bttv_tvcards[] = {
1172 .tuner = 0, 1172 .tuner = 0,
1173 .svhs = 2, 1173 .svhs = 2,
1174 .gpiomask = 7, 1174 .gpiomask = 7,
1175 .muxsel = { 2, 0, 1, 1}, 1175 .muxsel = { 2, 0, 1, 1 },
1176 .audiomux = { 0, 1, 2, 3, 4}, 1176 .audiomux = { 0, 1, 2, 3, 4 },
1177 .pll = PLL_28, 1177 .pll = PLL_28,
1178 .tuner_type = -1 /* TUNER_ALPS_TMDH2_NTSC */, 1178 .tuner_type = -1 /* TUNER_ALPS_TMDH2_NTSC */,
1179 .tuner_addr = ADDR_UNSET, 1179 .tuner_addr = ADDR_UNSET,
@@ -1189,8 +1189,8 @@ struct tvcard bttv_tvcards[] = {
1189 .tuner = 0, 1189 .tuner = 0,
1190 .svhs = 3, 1190 .svhs = 3,
1191 .gpiomask = 0x03000F, 1191 .gpiomask = 0x03000F,
1192 .muxsel = { 2, 3, 1, 1}, 1192 .muxsel = { 2, 3, 1, 1 },
1193 .audiomux = { 1, 0xd0001, 0, 0, 10}, 1193 .audiomux = { 1, 0xd0001, 0, 0, 10 },
1194 /* sound path (5 sources): 1194 /* sound path (5 sources):
1195 MUX1 (mask 0x03), Enable Pin 0x08 (0=enable, 1=disable) 1195 MUX1 (mask 0x03), Enable Pin 0x08 (0=enable, 1=disable)
1196 0= ext. Audio IN 1196 0= ext. Audio IN
@@ -1215,7 +1215,7 @@ struct tvcard bttv_tvcards[] = {
1215 .tuner = 0, 1215 .tuner = 0,
1216 .svhs = 2, 1216 .svhs = 2,
1217 .gpiomask = 0x1c, 1217 .gpiomask = 0x1c,
1218 .muxsel = { 2, 3, 1, 1}, 1218 .muxsel = { 2, 3, 1, 1 },
1219 .audiomux = { 0, 0, 0x10, 8, 4 }, 1219 .audiomux = { 0, 0, 0x10, 8, 4 },
1220 .needs_tvaudio = 1, 1220 .needs_tvaudio = 1,
1221 .pll = PLL_28, 1221 .pll = PLL_28,
@@ -1236,7 +1236,7 @@ struct tvcard bttv_tvcards[] = {
1236 .tuner = 0, 1236 .tuner = 0,
1237 .svhs = 2, 1237 .svhs = 2,
1238 .gpiomask = 0x18e0, 1238 .gpiomask = 0x18e0,
1239 .muxsel = { 2, 3, 1, 1}, 1239 .muxsel = { 2, 3, 1, 1 },
1240 .audiomux = { 0x0000,0x0800,0x1000,0x1000,0x18e0 }, 1240 .audiomux = { 0x0000,0x0800,0x1000,0x1000,0x18e0 },
1241 /* For cards with tda9820/tda9821: 1241 /* For cards with tda9820/tda9821:
1242 0x0000: Tuner normal stereo 1242 0x0000: Tuner normal stereo
@@ -1256,8 +1256,8 @@ struct tvcard bttv_tvcards[] = {
1256 .tuner = 0, 1256 .tuner = 0,
1257 .svhs = 2, 1257 .svhs = 2,
1258 .gpiomask = 0xF, 1258 .gpiomask = 0xF,
1259 .muxsel = { 2, 3, 1, 0}, 1259 .muxsel = { 2, 3, 1, 0 },
1260 .audiomux = { 2, 0, 0, 0, 10}, 1260 .audiomux = { 2, 0, 0, 0, 10 },
1261 .needs_tvaudio = 0, 1261 .needs_tvaudio = 0,
1262 .pll = PLL_28, 1262 .pll = PLL_28,
1263 .tuner_type = TUNER_TEMIC_PAL, 1263 .tuner_type = TUNER_TEMIC_PAL,
@@ -1274,7 +1274,7 @@ struct tvcard bttv_tvcards[] = {
1274 .tuner = 0, 1274 .tuner = 0,
1275 .svhs = 2, 1275 .svhs = 2,
1276 .gpiomask = 0x1800, 1276 .gpiomask = 0x1800,
1277 .muxsel = { 2, 3, 1, 1}, 1277 .muxsel = { 2, 3, 1, 1 },
1278 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 }, 1278 .audiomux = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
1279 .pll = PLL_28, 1279 .pll = PLL_28,
1280 .tuner_type = 5, 1280 .tuner_type = 5,
@@ -1324,8 +1324,8 @@ struct tvcard bttv_tvcards[] = {
1324 .tuner = 0, 1324 .tuner = 0,
1325 .svhs = 2, 1325 .svhs = 2,
1326 .gpiomask = 0x03000F, 1326 .gpiomask = 0x03000F,
1327 .muxsel = { 2, 3, 1, 0}, 1327 .muxsel = { 2, 3, 1, 0 },
1328 .audiomux = { 2,0,0,0,1 }, 1328 .audiomux = { 2, 0, 0, 0, 1 },
1329 .pll = PLL_28, 1329 .pll = PLL_28,
1330 .tuner_type = 0, 1330 .tuner_type = 0,
1331 .tuner_addr = ADDR_UNSET, 1331 .tuner_addr = ADDR_UNSET,
@@ -1341,8 +1341,8 @@ struct tvcard bttv_tvcards[] = {
1341 .tuner = 0, 1341 .tuner = 0,
1342 .svhs = -1, 1342 .svhs = -1,
1343 .gpiomask = 11, 1343 .gpiomask = 11,
1344 .muxsel = { 2, 3, 1, 1}, 1344 .muxsel = { 2, 3, 1, 1 },
1345 .audiomux = { 2, 0, 0, 1, 8}, 1345 .audiomux = { 2, 0, 0, 1, 8 },
1346 .pll = PLL_35, 1346 .pll = PLL_35,
1347 .tuner_type = TUNER_TEMIC_PAL, 1347 .tuner_type = TUNER_TEMIC_PAL,
1348 .tuner_addr = ADDR_UNSET, 1348 .tuner_addr = ADDR_UNSET,
@@ -1356,7 +1356,7 @@ struct tvcard bttv_tvcards[] = {
1356 .tuner = -1, 1356 .tuner = -1,
1357 .svhs = 1, 1357 .svhs = 1,
1358 .gpiomask = 0xF, 1358 .gpiomask = 0xF,
1359 .muxsel = { 2, 2}, 1359 .muxsel = { 2, 2 },
1360 .audiomux = { }, 1360 .audiomux = { },
1361 .no_msp34xx = 1, 1361 .no_msp34xx = 1,
1362 .needs_tvaudio = 0, 1362 .needs_tvaudio = 0,
@@ -1375,8 +1375,8 @@ struct tvcard bttv_tvcards[] = {
1375 .tuner = 0, 1375 .tuner = 0,
1376 .svhs = 2, 1376 .svhs = 2,
1377 .gpiomask = 0xFF, 1377 .gpiomask = 0xFF,
1378 .muxsel = { 2, 3, 1, 0}, 1378 .muxsel = { 2, 3, 1, 0 },
1379 .audiomux = { 1, 0, 4, 4, 9}, 1379 .audiomux = { 1, 0, 4, 4, 9 },
1380 .needs_tvaudio = 0, 1380 .needs_tvaudio = 0,
1381 .pll = PLL_28, 1381 .pll = PLL_28,
1382 .tuner_type = TUNER_PHILIPS_PAL, 1382 .tuner_type = TUNER_PHILIPS_PAL,
@@ -1392,7 +1392,7 @@ struct tvcard bttv_tvcards[] = {
1392 .svhs = 2, 1392 .svhs = 2,
1393 .gpiomask = 0xf03f, 1393 .gpiomask = 0xf03f,
1394 .muxsel = { 2, 3, 1, 0 }, 1394 .muxsel = { 2, 3, 1, 0 },
1395 .audiomux = { 0xbffe, 0, 0xbfff, 0, 0xbffe}, 1395 .audiomux = { 0xbffe, 0, 0xbfff, 0, 0xbffe },
1396 .pll = PLL_28, 1396 .pll = PLL_28,
1397 .tuner_type = TUNER_TEMIC_4006FN5_MULTI_PAL, 1397 .tuner_type = TUNER_TEMIC_4006FN5_MULTI_PAL,
1398 .tuner_addr = ADDR_UNSET, 1398 .tuner_addr = ADDR_UNSET,
@@ -1408,8 +1408,8 @@ struct tvcard bttv_tvcards[] = {
1408 .tuner = 0, 1408 .tuner = 0,
1409 .svhs = -1, 1409 .svhs = -1,
1410 .gpiomask = 1, 1410 .gpiomask = 1,
1411 .muxsel = { 2, 3, 0, 1}, 1411 .muxsel = { 2, 3, 0, 1 },
1412 .audiomux = { 0, 0, 1, 0, 0}, 1412 .audiomux = { 0, 0, 1, 0, 0 },
1413 .no_msp34xx = 1, 1413 .no_msp34xx = 1,
1414 .pll = PLL_28, 1414 .pll = PLL_28,
1415 .tuner_type = TUNER_TEMIC_4006FN5_MULTI_PAL, 1415 .tuner_type = TUNER_TEMIC_4006FN5_MULTI_PAL,
@@ -1424,7 +1424,7 @@ struct tvcard bttv_tvcards[] = {
1424 .tuner = 0, 1424 .tuner = 0,
1425 .svhs = 2, 1425 .svhs = 2,
1426 .gpiomask = 0x18e0, 1426 .gpiomask = 0x18e0,
1427 .muxsel = { 2, 3, 0, 1}, 1427 .muxsel = { 2, 3, 0, 1 },
1428 /* Radio changed from 1e80 to 0x800 to make 1428 /* Radio changed from 1e80 to 0x800 to make
1429 FlyVideo2000S in .hu happy (gm)*/ 1429 FlyVideo2000S in .hu happy (gm)*/
1430 /* -dk-???: set mute=0x1800 for tda9874h daughterboard */ 1430 /* -dk-???: set mute=0x1800 for tda9874h daughterboard */
@@ -1445,8 +1445,8 @@ struct tvcard bttv_tvcards[] = {
1445 .tuner = 0, 1445 .tuner = 0,
1446 .svhs = 2, 1446 .svhs = 2,
1447 .gpiomask = 0xffff00, 1447 .gpiomask = 0xffff00,
1448 .muxsel = { 2, 3, 1, 1}, 1448 .muxsel = { 2, 3, 1, 1 },
1449 .audiomux = { 0x500, 0x500, 0x300, 0x900, 0x900}, 1449 .audiomux = { 0x500, 0x500, 0x300, 0x900, 0x900 },
1450 .needs_tvaudio = 1, 1450 .needs_tvaudio = 1,
1451 .pll = PLL_28, 1451 .pll = PLL_28,
1452 .tuner_type = TUNER_PHILIPS_PAL, 1452 .tuner_type = TUNER_PHILIPS_PAL,
@@ -1462,8 +1462,8 @@ struct tvcard bttv_tvcards[] = {
1462 .tuner = 0, 1462 .tuner = 0,
1463 .svhs = 2, 1463 .svhs = 2,
1464 .gpiomask = 0x010f00, 1464 .gpiomask = 0x010f00,
1465 .muxsel = {2, 3, 0, 0}, 1465 .muxsel = {2, 3, 0, 0 },
1466 .audiomux = {0x10000, 0, 0x10000, 0, 0, 0}, 1466 .audiomux = {0x10000, 0, 0x10000, 0, 0, 0 },
1467 .no_msp34xx = 1, 1467 .no_msp34xx = 1,
1468 .pll = PLL_28, 1468 .pll = PLL_28,
1469 .tuner_type = TUNER_SHARP_2U5JF5540_NTSC, 1469 .tuner_type = TUNER_SHARP_2U5JF5540_NTSC,
@@ -1487,7 +1487,7 @@ struct tvcard bttv_tvcards[] = {
1487 .audiomux = {0x947fff, 0x987fff,0x947fff,0x947fff, 0x947fff}, 1487 .audiomux = {0x947fff, 0x987fff,0x947fff,0x947fff, 0x947fff},
1488 /* tvtuner, radio, external,internal, mute, stereo 1488 /* tvtuner, radio, external,internal, mute, stereo
1489 * tuner, Composit, SVid, Composit-on-Svid-adapter */ 1489 * tuner, Composit, SVid, Composit-on-Svid-adapter */
1490 .muxsel = { 2, 3 ,0 ,1}, 1490 .muxsel = { 2, 3 ,0 ,1 },
1491 .tuner_type = TUNER_MT2032, 1491 .tuner_type = TUNER_MT2032,
1492 .tuner_addr = ADDR_UNSET, 1492 .tuner_addr = ADDR_UNSET,
1493 .radio_addr = ADDR_UNSET, 1493 .radio_addr = ADDR_UNSET,
@@ -1515,8 +1515,8 @@ struct tvcard bttv_tvcards[] = {
1515 .tuner = 0, 1515 .tuner = 0,
1516 .svhs = 2, 1516 .svhs = 2,
1517 .gpiomask = 15, 1517 .gpiomask = 15,
1518 .muxsel = { 2, 3, 1, 1}, 1518 .muxsel = { 2, 3, 1, 1 },
1519 .audiomux = { 0, 0, 11, 7, 13, 0}, /* TV and Radio with same GPIO ! */ 1519 .audiomux = { 0, 0, 11, 7, 13, 0 }, /* TV and Radio with same GPIO ! */
1520 .needs_tvaudio = 1, 1520 .needs_tvaudio = 1,
1521 .pll = PLL_28, 1521 .pll = PLL_28,
1522 .tuner_type = 25, 1522 .tuner_type = 25,
@@ -1537,7 +1537,7 @@ struct tvcard bttv_tvcards[] = {
1537 .audio_inputs = 0, 1537 .audio_inputs = 0,
1538 .tuner = -1, 1538 .tuner = -1,
1539 .svhs = 2, 1539 .svhs = 2,
1540 .muxsel = { 2, 3, 1, 1}, /* AV1, AV2, SVHS, CVid adapter on SVHS */ 1540 .muxsel = { 2, 3, 1, 1 }, /* AV1, AV2, SVHS, CVid adapter on SVHS */
1541 .pll = PLL_28, 1541 .pll = PLL_28,
1542 .no_msp34xx = 1, 1542 .no_msp34xx = 1,
1543 .tuner_type = UNSET, 1543 .tuner_type = UNSET,
@@ -1583,7 +1583,7 @@ struct tvcard bttv_tvcards[] = {
1583 .tuner = -1, 1583 .tuner = -1,
1584 .svhs = 4, 1584 .svhs = 4,
1585 .gpiomask = 0, 1585 .gpiomask = 0,
1586 .muxsel = { 2, 3, 1, 0, 0}, 1586 .muxsel = { 2, 3, 1, 0, 0 },
1587 .audiomux = { 0 }, 1587 .audiomux = { 0 },
1588 .needs_tvaudio = 0, 1588 .needs_tvaudio = 0,
1589 .tuner_type = -1, 1589 .tuner_type = -1,
@@ -1696,7 +1696,7 @@ struct tvcard bttv_tvcards[] = {
1696 .name = "DSP Design TCVIDEO", 1696 .name = "DSP Design TCVIDEO",
1697 .video_inputs = 4, 1697 .video_inputs = 4,
1698 .svhs = -1, 1698 .svhs = -1,
1699 .muxsel = { 2, 3, 1, 0}, 1699 .muxsel = { 2, 3, 1, 0 },
1700 .pll = PLL_28, 1700 .pll = PLL_28,
1701 .tuner_type = -1, 1701 .tuner_type = -1,
1702 .tuner_addr = ADDR_UNSET, 1702 .tuner_addr = ADDR_UNSET,
@@ -1710,7 +1710,7 @@ struct tvcard bttv_tvcards[] = {
1710 .audio_inputs = 1, 1710 .audio_inputs = 1,
1711 .tuner = 0, 1711 .tuner = 0,
1712 .svhs = 2, 1712 .svhs = 2,
1713 .muxsel = { 2, 0, 1, 1}, 1713 .muxsel = { 2, 0, 1, 1 },
1714 .needs_tvaudio = 1, 1714 .needs_tvaudio = 1,
1715 .pll = PLL_28, 1715 .pll = PLL_28,
1716 .tuner_type = -1, 1716 .tuner_type = -1,
@@ -1727,7 +1727,7 @@ struct tvcard bttv_tvcards[] = {
1727 .tuner = 0, 1727 .tuner = 0,
1728 .svhs = 2, 1728 .svhs = 2,
1729 .gpiomask = 0x0f0f80, 1729 .gpiomask = 0x0f0f80,
1730 .muxsel = {2, 3, 1, 0}, 1730 .muxsel = {2, 3, 1, 0 },
1731 .audiomux = {0x030000, 0x010000, 0, 0, 0x020000, 0}, 1731 .audiomux = {0x030000, 0x010000, 0, 0, 0x020000, 0},
1732 .no_msp34xx = 1, 1732 .no_msp34xx = 1,
1733 .pll = PLL_28, 1733 .pll = PLL_28,
@@ -1944,7 +1944,7 @@ struct tvcard bttv_tvcards[] = {
1944 .no_msp34xx = 1, 1944 .no_msp34xx = 1,
1945 .no_tda9875 = 1, 1945 .no_tda9875 = 1,
1946 .no_tda7432 = 1, 1946 .no_tda7432 = 1,
1947 .muxsel = { 3, 0, 1, 2}, 1947 .muxsel = { 3, 0, 1, 2 },
1948 .pll = PLL_28, 1948 .pll = PLL_28,
1949 .no_gpioirq = 1, 1949 .no_gpioirq = 1,
1950 .has_dvb = 1, 1950 .has_dvb = 1,
@@ -1957,7 +1957,7 @@ struct tvcard bttv_tvcards[] = {
1957 .svhs = 3, 1957 .svhs = 3,
1958 .gpiomask = 2, 1958 .gpiomask = 2,
1959 /* TV, Comp1, Composite over SVID con, SVID */ 1959 /* TV, Comp1, Composite over SVID con, SVID */
1960 .muxsel = { 2, 3, 1, 1}, 1960 .muxsel = { 2, 3, 1, 1 },
1961 .audiomux = { 2, 2, 0, 0, 0 }, 1961 .audiomux = { 2, 2, 0, 0, 0 },
1962 .pll = PLL_28, 1962 .pll = PLL_28,
1963 .has_radio = 1, 1963 .has_radio = 1,
@@ -2074,7 +2074,7 @@ struct tvcard bttv_tvcards[] = {
2074 .audio_inputs = 1, 2074 .audio_inputs = 1,
2075 .tuner = 0, 2075 .tuner = 0,
2076 .svhs = 2, 2076 .svhs = 2,
2077 .muxsel = { 2, 3, 1, 1}, /* Tuner, CVid, SVid, CVid over SVid connector */ 2077 .muxsel = { 2, 3, 1, 1 }, /* Tuner, CVid, SVid, CVid over SVid connector */
2078 .gpiomask = 0, 2078 .gpiomask = 0,
2079 .no_tda9875 = 1, 2079 .no_tda9875 = 1,
2080 .no_tda7432 = 1, 2080 .no_tda7432 = 1,
@@ -2128,7 +2128,7 @@ struct tvcard bttv_tvcards[] = {
2128 .video_inputs = 1, 2128 .video_inputs = 1,
2129 .tuner = -1, 2129 .tuner = -1,
2130 .svhs = -1, 2130 .svhs = -1,
2131 .muxsel = { 2, 3, 1, 0}, 2131 .muxsel = { 2, 3, 1, 0 },
2132 .no_msp34xx = 1, 2132 .no_msp34xx = 1,
2133 .no_tda9875 = 1, 2133 .no_tda9875 = 1,
2134 .no_tda7432 = 1, 2134 .no_tda7432 = 1,
@@ -2166,7 +2166,7 @@ struct tvcard bttv_tvcards[] = {
2166 .tuner = -1, /* card has no tuner */ 2166 .tuner = -1, /* card has no tuner */
2167 .svhs = 3, 2167 .svhs = 3,
2168 .gpiomask = 0x00, 2168 .gpiomask = 0x00,
2169 .muxsel = { 2, 3, 1, 0}, 2169 .muxsel = { 2, 3, 1, 0 },
2170 .audiomux = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */ 2170 .audiomux = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
2171 .needs_tvaudio = 1, 2171 .needs_tvaudio = 1,
2172 .pll = PLL_28, 2172 .pll = PLL_28,
@@ -2181,7 +2181,7 @@ struct tvcard bttv_tvcards[] = {
2181 .tuner = -1, /* card has no tuner */ 2181 .tuner = -1, /* card has no tuner */
2182 .svhs = 3, 2182 .svhs = 3,
2183 .gpiomask = 0x00, 2183 .gpiomask = 0x00,
2184 .muxsel = { 2, 3, 1, 1}, 2184 .muxsel = { 2, 3, 1, 1 },
2185 .audiomux = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */ 2185 .audiomux = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
2186 .needs_tvaudio = 1, 2186 .needs_tvaudio = 1,
2187 .pll = PLL_28, 2187 .pll = PLL_28,
@@ -2268,7 +2268,7 @@ struct tvcard bttv_tvcards[] = {
2268 .audio_inputs = 1, 2268 .audio_inputs = 1,
2269 .tuner = 0, 2269 .tuner = 0,
2270 .svhs = 2, 2270 .svhs = 2,
2271 .muxsel = { 2, 3, 1, 0}, 2271 .muxsel = { 2, 3, 1, 0 },
2272 .tuner_type = TUNER_PHILIPS_ATSC, 2272 .tuner_type = TUNER_PHILIPS_ATSC,
2273 .tuner_addr = ADDR_UNSET, 2273 .tuner_addr = ADDR_UNSET,
2274 .radio_addr = ADDR_UNSET, 2274 .radio_addr = ADDR_UNSET,
@@ -2291,7 +2291,7 @@ struct tvcard bttv_tvcards[] = {
2291 .audio_inputs = 0, 2291 .audio_inputs = 0,
2292 .svhs = 1, 2292 .svhs = 1,
2293 .tuner = -1, 2293 .tuner = -1,
2294 .muxsel = { 3, 1, 1, 3}, /* Vid In, SVid In, Vid over SVid in connector */ 2294 .muxsel = { 3, 1, 1, 3 }, /* Vid In, SVid In, Vid over SVid in connector */
2295 .no_msp34xx = 1, 2295 .no_msp34xx = 1,
2296 .no_tda9875 = 1, 2296 .no_tda9875 = 1,
2297 .no_tda7432 = 1, 2297 .no_tda7432 = 1,
@@ -2307,8 +2307,8 @@ struct tvcard bttv_tvcards[] = {
2307 .tuner = 0, 2307 .tuner = 0,
2308 .svhs = 2, 2308 .svhs = 2,
2309 .gpiomask = 3, 2309 .gpiomask = 3,
2310 .muxsel = { 2, 3, 1, 1}, 2310 .muxsel = { 2, 3, 1, 1 },
2311 .audiomux = { 1, 1, 1, 1, 0}, 2311 .audiomux = { 1, 1, 1, 1, 0 },
2312 .needs_tvaudio = 1, 2312 .needs_tvaudio = 1,
2313 .tuner_type = TUNER_PHILIPS_PAL, 2313 .tuner_type = TUNER_PHILIPS_PAL,
2314 .tuner_addr = ADDR_UNSET, 2314 .tuner_addr = ADDR_UNSET,
@@ -2327,7 +2327,7 @@ struct tvcard bttv_tvcards[] = {
2327 .tuner_addr = ADDR_UNSET, 2327 .tuner_addr = ADDR_UNSET,
2328 .radio_addr = ADDR_UNSET, 2328 .radio_addr = ADDR_UNSET,
2329 .pll = PLL_28, 2329 .pll = PLL_28,
2330 .muxsel = { 2, 2, 2, 2}, 2330 .muxsel = { 2, 2, 2, 2 },
2331 .gpiomask = 0x3F, 2331 .gpiomask = 0x3F,
2332 .muxsel_hook = gvc1100_muxsel, 2332 .muxsel_hook = gvc1100_muxsel,
2333 }, 2333 },
@@ -2338,8 +2338,8 @@ struct tvcard bttv_tvcards[] = {
2338 .tuner = 0, 2338 .tuner = 0,
2339 .svhs = 2, 2339 .svhs = 2,
2340 .gpiomask = 0x008007, 2340 .gpiomask = 0x008007,
2341 .muxsel = {2, 3, 0, 0}, 2341 .muxsel = { 2, 3, 0, 0 },
2342 .audiomux = {0, 0, 0, 0, 0x000003, 0}, 2342 .audiomux = { 0, 0, 0, 0, 0x000003, 0 },
2343 .pll = PLL_28, 2343 .pll = PLL_28,
2344 .tuner_type = TUNER_PHILIPS_PAL, 2344 .tuner_type = TUNER_PHILIPS_PAL,
2345 .tuner_addr = ADDR_UNSET, 2345 .tuner_addr = ADDR_UNSET,
@@ -2374,7 +2374,7 @@ struct tvcard bttv_tvcards[] = {
2374 .svhs = 2, 2374 .svhs = 2,
2375 .needs_tvaudio = 0, 2375 .needs_tvaudio = 0,
2376 .gpiomask = 0x68, 2376 .gpiomask = 0x68,
2377 .muxsel = { 2, 3, 1}, 2377 .muxsel = { 2, 3, 1 },
2378 .audiomux = { 0x68, 0x68, 0x61, 0x61, 0x00 }, 2378 .audiomux = { 0x68, 0x68, 0x61, 0x61, 0x00 },
2379 .pll = PLL_28, 2379 .pll = PLL_28,
2380 }, 2380 },
@@ -2433,7 +2433,7 @@ struct tvcard bttv_tvcards[] = {
2433 .svhs = 2, 2433 .svhs = 2,
2434 .gpiomask = 0x0000000f, 2434 .gpiomask = 0x0000000f,
2435 .muxsel = { 2, 1, 1 }, 2435 .muxsel = { 2, 1, 1 },
2436 .audiomux = { 0x02, 0x00, 0x00, 0x00, 0x00}, 2436 .audiomux = { 0x02, 0x00, 0x00, 0x00, 0x00 },
2437 .tuner_type = TUNER_TEMIC_PAL, 2437 .tuner_type = TUNER_TEMIC_PAL,
2438 .tuner_addr = ADDR_UNSET, 2438 .tuner_addr = ADDR_UNSET,
2439 .radio_addr = ADDR_UNSET, 2439 .radio_addr = ADDR_UNSET,
@@ -2466,7 +2466,7 @@ struct tvcard bttv_tvcards[] = {
2466 .video_inputs = 2, 2466 .video_inputs = 2,
2467 .tuner = -1, 2467 .tuner = -1,
2468 .svhs = 1, 2468 .svhs = 1,
2469 .muxsel = { 3, 1, 2, 0}, /* Comp0, S-Video, ?, ? */ 2469 .muxsel = { 3, 1, 2, 0 }, /* Comp0, S-Video, ?, ? */
2470 .no_msp34xx = 1, 2470 .no_msp34xx = 1,
2471 .no_tda9875 = 1, 2471 .no_tda9875 = 1,
2472 .no_tda7432 = 1, 2472 .no_tda7432 = 1,
@@ -2523,8 +2523,8 @@ struct tvcard bttv_tvcards[] = {
2523 .tuner = 0, 2523 .tuner = 0,
2524 .svhs = -1, 2524 .svhs = -1,
2525 .gpiomask = 0xFF, 2525 .gpiomask = 0xFF,
2526 .muxsel = { 2, 3, 1, 1}, 2526 .muxsel = { 2, 3, 1, 1 },
2527 .audiomux = { 2, 0, 0, 0, 10}, 2527 .audiomux = { 2, 0, 0, 0, 10 },
2528 .needs_tvaudio = 0, 2528 .needs_tvaudio = 0,
2529 .pll = PLL_28, 2529 .pll = PLL_28,
2530 .tuner_type = TUNER_PHILIPS_PAL, 2530 .tuner_type = TUNER_PHILIPS_PAL,
@@ -2557,8 +2557,8 @@ struct tvcard bttv_tvcards[] = {
2557 .tuner = 0, 2557 .tuner = 0,
2558 .svhs = 2, 2558 .svhs = 2,
2559 .gpiomask = 0x3f, 2559 .gpiomask = 0x3f,
2560 .muxsel = {2, 3, 1, 0}, 2560 .muxsel = {2, 3, 1, 0 },
2561 .audiomux = {0x31, 0x31, 0x31, 0x31, 0x31, 0x31}, 2561 .audiomux = {0x31, 0x31, 0x31, 0x31, 0x31, 0x31 },
2562 .no_msp34xx = 1, 2562 .no_msp34xx = 1,
2563 .pll = PLL_28, 2563 .pll = PLL_28,
2564 .tuner_type = TUNER_PHILIPS_NTSC_M, 2564 .tuner_type = TUNER_PHILIPS_NTSC_M,
@@ -2576,12 +2576,12 @@ struct tvcard bttv_tvcards[] = {
2576 .audio_inputs = 1, 2576 .audio_inputs = 1,
2577 .tuner = 0, 2577 .tuner = 0,
2578 .svhs = 2, 2578 .svhs = 2,
2579 .muxsel = { 2, 3, 1, 0}, 2579 .muxsel = { 2, 3, 1, 0 },
2580 .tuner_type = TUNER_PHILIPS_NTSC, 2580 .tuner_type = TUNER_PHILIPS_NTSC,
2581 .tuner_addr = ADDR_UNSET, 2581 .tuner_addr = ADDR_UNSET,
2582 .radio_addr = ADDR_UNSET, 2582 .radio_addr = ADDR_UNSET,
2583 .gpiomask = 0x008007, 2583 .gpiomask = 0x008007,
2584 .audiomux = { 0, 0x000001,0,0, 0}, 2584 .audiomux = { 0, 0x000001,0,0, 0 },
2585 .needs_tvaudio = 1, 2585 .needs_tvaudio = 1,
2586 .has_radio = 1, 2586 .has_radio = 1,
2587 }, 2587 },
@@ -2672,7 +2672,7 @@ struct tvcard bttv_tvcards[] = {
2672 .audio_inputs = 1, 2672 .audio_inputs = 1,
2673 .tuner = 0, 2673 .tuner = 0,
2674 .svhs = 2, 2674 .svhs = 2,
2675 .muxsel = { 2, 3, 1, 0}, 2675 .muxsel = { 2, 3, 1, 0 },
2676 .tuner_type = -1, 2676 .tuner_type = -1,
2677 .tuner_addr = ADDR_UNSET, 2677 .tuner_addr = ADDR_UNSET,
2678 .radio_addr = ADDR_UNSET, 2678 .radio_addr = ADDR_UNSET,
@@ -2706,7 +2706,7 @@ struct tvcard bttv_tvcards[] = {
2706 .tuner = 0, 2706 .tuner = 0,
2707 .svhs = 2, 2707 .svhs = 2,
2708 .gpiomask = 0x01fe00, 2708 .gpiomask = 0x01fe00,
2709 .muxsel = { 2, 3, 1, 1}, 2709 .muxsel = { 2, 3, 1, 1 },
2710 .audiomux = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 }, 2710 .audiomux = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 },
2711 .needs_tvaudio = 1, 2711 .needs_tvaudio = 1,
2712 .pll = PLL_28, 2712 .pll = PLL_28,
@@ -2794,8 +2794,8 @@ struct tvcard bttv_tvcards[] = {
2794 .tuner = 0, 2794 .tuner = 0,
2795 .svhs = 2, 2795 .svhs = 2,
2796 .gpiomask = 15, 2796 .gpiomask = 15,
2797 .muxsel = { 2, 3, 1, 1}, 2797 .muxsel = { 2, 3, 1, 1 },
2798 .audiomux = {2,0,0,0,1}, 2798 .audiomux = {2,0,0,0,1 },
2799 .needs_tvaudio = 1, 2799 .needs_tvaudio = 1,
2800 .pll = PLL_28, 2800 .pll = PLL_28,
2801 .tuner_type = 2, 2801 .tuner_type = 2,
@@ -2810,8 +2810,8 @@ struct tvcard bttv_tvcards[] = {
2810 .tuner = 0, 2810 .tuner = 0,
2811 .svhs = 2, 2811 .svhs = 2,
2812 .gpiomask = 0x108007, 2812 .gpiomask = 0x108007,
2813 .muxsel = { 2, 3, 1, 1}, 2813 .muxsel = { 2, 3, 1, 1 },
2814 .audiomux = { 100000, 100002, 100002, 100000}, 2814 .audiomux = { 100000, 100002, 100002, 100000 },
2815 .no_msp34xx = 1, 2815 .no_msp34xx = 1,
2816 .no_tda9875 = 1, 2816 .no_tda9875 = 1,
2817 .no_tda7432 = 1, 2817 .no_tda7432 = 1,
@@ -2828,7 +2828,7 @@ struct tvcard bttv_tvcards[] = {
2828 .tuner = -1, 2828 .tuner = -1,
2829 .svhs = -1, 2829 .svhs = -1,
2830 .gpiomask = 0x0f, /* old: 7 */ 2830 .gpiomask = 0x0f, /* old: 7 */
2831 .muxsel = { 0, 1, 3, 2}, /* Composite 0-3 */ 2831 .muxsel = { 0, 1, 3, 2 }, /* Composite 0-3 */
2832 .no_msp34xx = 1, 2832 .no_msp34xx = 1,
2833 .no_tda9875 = 1, 2833 .no_tda9875 = 1,
2834 .no_tda7432 = 1, 2834 .no_tda7432 = 1,