[BTTV_BOARD_UNKNOWN] = {
                .name           = " *** UNKNOWN/GENERIC *** ",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 0 },
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MIRO] = {
                .name           = "MIRO PCTV",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_HAUPPAUGE] = {
                .name           = "Hauppauge (bt848)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_STB] = {
                .name           = "STB, Gateway P/N 6000699 (bt848)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
        },
        [BTTV_BOARD_INTEL] = {
                .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_DIAMOND] = {
                .name           = "Diamond DTV2000",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 3,
                .muxsel         = { 2, 3, 1, 0 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_AVERMEDIA] = {
                .name           = "AVerMedia TVPhone",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .muxsel         = { 2, 3, 1, 1 },
                .gpiomask       = 0x0f,
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= avermedia_tvphone_audio,
                .has_remote     = 1,
        },
        [BTTV_BOARD_MATRIX_VISION] = {
                .name           = "MATRIX-Vision MV-Delta",
                .video_inputs   = 5,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 0, 0 },
                .needs_tvaudio  = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x08 ---------------------------------- */
        [BTTV_BOARD_FLYVIDEO] = {
                .name           = "Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xc00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_TURBOTV] = {
                .name           = "IMS/IXmicro TurboTV",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 3,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_HAUPPAUGE878] = {
                .name           = "Hauppauge (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x0f, /* old: 7 */
                .muxsel         = { 2, 0, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MIROPRO] = {
                .name           = "MIRO PCTV pro",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x3014f,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x0c ---------------------------------- */
        [BTTV_BOARD_ADSTECH_TV] = {
                .name           = "ADS Technologies Channel Surfer TV (bt848)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_AVERMEDIA98] = {
                .name           = "AVerMedia TVCapture 98",
                .video_inputs   = 3,
-               .audio_inputs   = 4,
+               /* .audio_inputs= 4, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= avermedia_tv_stereo_audio,
                .no_gpioirq     = 1,
        },
        [BTTV_BOARD_VHX] = {
                .name           = "Aimslab Video Highway Xtreme (VHX)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_ZOLTRIX] = {
                .name           = "Zoltrix TV-Max",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x10 ---------------------------------- */
        [BTTV_BOARD_PIXVIEWPLAYTV] = {
                .name           = "Prolink Pixelview PlayTV (bt878)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x01fe00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_WINVIEW_601] = {
                .name           = "Leadtek WinView 601",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x8300f8,
                .muxsel         = { 2, 3, 1, 1,0 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .volume_gpio    = winview_volume,
                .has_radio      = 1,
        },
        [BTTV_BOARD_AVEC_INTERCAP] = {
                .name           = "AVEC Intercapture",
                .video_inputs   = 3,
-               .audio_inputs   = 2,
+               /* .audio_inputs= 2, */
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_LIFE_FLYKIT] = {
                .name           = "Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0x8dff00,
                .muxsel         = { 2, 3, 1, 1 },
                .gpiomux        = { 0 },
                .no_msp34xx     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x14 ---------------------------------- */
        [BTTV_BOARD_CEI_RAFFLES] = {
                .name           = "CEI Raffles Card",
                .video_inputs   = 3,
-               .audio_inputs   = 3,
+               /* .audio_inputs= 3, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 1 },
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_CONFERENCETV] = {
                .name           = "Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50",
                .video_inputs   = 4,
-               .audio_inputs   = 2,  /* tuner, line in */
+               /* .audio_inputs= 2,  tuner, line in */
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_PHOEBE_TVMAS] = {
                .name           = "Askey CPH050/ Phoebe Tv Master + FM",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xc00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MODTEC_205] = {
                .name           = "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, -1 },
-               .digital_mode   = DIGITAL_MODE_CAMERA,
+               /* .digital_mode= DIGITAL_MODE_CAMERA, */
                .gpiomux        = { 0, 0, 0, 0 },
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_ALPS_TSBB5_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x18 ---------------------------------- */
        [BTTV_BOARD_MAGICTVIEW061] = {
                .name           = "Askey CPH05X/06X (bt878) [many vendors]",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xe00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,
        },
        [BTTV_BOARD_VOBIS_BOOSTAR] = {
                .name           = "Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x1f0fff,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= terratv_audio,
        },
        [BTTV_BOARD_HAUPPAUG_WCAM] = {
                .name           = "Hauppauge WinCam newer (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .gpiomask       = 7,
                .muxsel         = { 2, 0, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MAXI] = {
                .name           = "Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50",
                .video_inputs   = 4,
-               .audio_inputs   = 2,
+               /* .audio_inputs= 2, */
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_SECAM,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x1c ---------------------------------- */
        [BTTV_BOARD_TERRATV] = {
                .name           = "Terratec TerraTV+ Version 1.1 (bt878)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x1f0fff,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= terratv_audio,
                /* GPIO wiring:
                External 20 pin connector (for Active Radio Upgrade board)
                /* Jannik Fritsch <jannik@techfak.uni-bielefeld.de> */
                .name           = "Imagenation PXC200",
                .video_inputs   = 5,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 1, /* was: 4 */
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 0, 0},
                .needs_tvaudio  = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .muxsel_hook    = PXC200_muxsel,
 
        },
        [BTTV_BOARD_FLYVIDEO_98] = {
                .name           = "Lifeview FlyVideo 98 LR50",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x1800,  /* 0x8dfe00 */
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_IPROTV] = {
                .name           = "Formac iProTV, Formac ProTV I (bt848)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .gpiomask       = 1,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x20 ---------------------------------- */
        [BTTV_BOARD_INTEL_C_S_PCI] = {
                .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_TERRATVALUE] = {
                .name           = "Terratec TerraTValue Version Bt878",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xffff00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_WINFAST2000] = {
                .name           = "Leadtek WinFast 2000/ WinFast 2000 XP",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 1, 0 }, /* TV, CVid, SVid, CVid over SVid connector */
                /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
                .has_radio      = 1,
                .tuner_type     = TUNER_PHILIPS_PAL, /* default for now, gpio reads BFFF06 for Pal bg+dk */
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= winfast2000_audio,
                .has_remote     = 1,
        },
        [BTTV_BOARD_CHRONOS_VS2] = {
                .name           = "Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II",
                .video_inputs   = 4,
-               .audio_inputs   = 3,
+               /* .audio_inputs= 3, */
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x24 ---------------------------------- */
        [BTTV_BOARD_TYPHOON_TVIEW] = {
                .name           = "Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner",
                .video_inputs   = 4,
-               .audio_inputs   = 3,
+               /* .audio_inputs= 3, */
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 1,
        },
        [BTTV_BOARD_PXELVWPLTVPRO] = {
                .name           = "Prolink PixelView PlayTV pro",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xff,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MAGICTVIEW063] = {
                .name           = "Askey CPH06X TView99",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x551e00,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,
        },
        [BTTV_BOARD_PINNACLE] = {
                .name           = "Pinnacle PCTV Studio/Rave",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x03000F,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x28 ---------------------------------- */
        [BTTV_BOARD_STB2] = {
                .name           = "STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
        },
        [BTTV_BOARD_AVPHONE98] = {
                .name           = "AVerMedia TVPhone 98",
                .video_inputs   = 3,
-               .audio_inputs   = 4,
+               /* .audio_inputs= 4, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 1,
                .audio_mode_gpio= avermedia_tvphone_audio,
        },
        [BTTV_BOARD_PV951] = {
                .name           = "ProVideo PV951", /* pic16c54 */
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 1},
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_ONAIR_TV] = {
                .name           = "Little OnAir TV",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xe00b,
                .muxsel         = { 2, 3, 1, 1 },
                .no_msp34xx     = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x2c ---------------------------------- */
        [BTTV_BOARD_SIGMA_TVII_FM] = {
                .name           = "Sigma TVII-FM",
                .video_inputs   = 2,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 3,
                .muxsel         = { 2, 3, 1, 1 },
                .gpiomux        = { 1, 1, 0, 2 },
                .pll            = PLL_NONE,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MATRIX_VISION2] = {
                .name           = "MATRIX-Vision MV-Delta 2",
                .video_inputs   = 5,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 0, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_ZOLTRIX_GENIE] = {
                .name           = "Zoltrix Genie TV/FM",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xbcf03f,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4039FR5_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_TERRATVRADIO] = {
                .name           = "Terratec TV/Radio+",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x70000,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_35,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 1,
        },
 
        [BTTV_BOARD_DYNALINK] = {
                .name           = "Askey CPH03x/ Dynalink Magic TView",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_GVBCTV3PCI] = {
                .name           = "IODATA GV-BCTV3/PCI",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x010f00,
                .muxsel         = {2, 3, 0, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ALPS_TSHC6_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= gvbctv3pci_audio,
        },
        [BTTV_BOARD_PXELVWPLTVPAK] = {
                .name           = "Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP",
                .video_inputs   = 5,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .gpiomask       = 0xAA0000,
-               .muxsel         = { 2,3,1,1,-1 },
-               .digital_mode   = DIGITAL_MODE_CAMERA,
+               .muxsel         = { 2, 3, 1, 1, -1 },
+               /* .digital_mode= DIGITAL_MODE_CAMERA, */
                .gpiomux        = { 0x20000, 0, 0x80000, 0x80000 },
                .gpiomute       = 0xa8000,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,
                /* GPIO wiring: (different from Rev.4C !)
                        GPIO17: U4.A0 (first hef4052bt)
        [BTTV_BOARD_EAGLE] = {
                .name           = "Eagle Wireless Capricorn2 (bt878A)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = { 2, 0, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET /* TUNER_ALPS_TMDH2_NTSC */,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x34 ---------------------------------- */
                /* David Härdeman <david@2gen.com> */
                .name           = "Pinnacle PCTV Studio Pro",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .gpiomask       = 0x03000F,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_TVIEW_RDS_FM] = {
                /* Claas Langbehn <claas@bigfoot.com>,
                Sven Grothklags <sven@upb.de> */
                .name           = "Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS",
                .video_inputs   = 4,
-               .audio_inputs   = 3,
+               /* .audio_inputs= 3, */
                .svhs           = 2,
                .gpiomask       = 0x1c,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 1,
        },
        [BTTV_BOARD_LIFETEC_9415] = {
                        options tuner type=5 */
                .name           = "Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x18e0,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_BESTBUY_EASYTV] = {
                /* Miguel Angel Alvarez <maacruz@navegalia.com>
                old Easy TV BT848 version (model CPH031) */
                .name           = "Askey CPH031/ BESTBUY Easy TV",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xF,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x38 ---------------------------------- */
                /* Gordon Heydon <gjheydon@bigfoot.com ('98) */
                .name           = "Lifeview FlyVideo 98FM LR50",
                .video_inputs   = 4,
-               .audio_inputs   = 3,
+               /* .audio_inputs= 3, */
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
                /* This is the ultimate cheapo capture card
                * just a BT848A on a small PCB!
        [BTTV_BOARD_GRANDTEC] = {
                .name           = "GrandTec 'Grand Video Capture' (Bt848)",
                .video_inputs   = 2,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 1,
                .gpiomask       = 0,
                .muxsel         = { 3, 1 },
                .pll            = PLL_35,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_ASKEY_CPH060] = {
                /* Daniel Herrington <daniel.herrington@home.com> */
                .name           = "Askey CPH060/ Phoebe TV Master Only (No FM)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xe00,
                .muxsel         = { 2, 3, 1, 1},
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4036FY5_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_ASKEY_CPH03X] = {
                /* Matti Mottus <mottus@physic.ut.ee> */
                .name           = "Askey CPH03x TV Capturer",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x03000F,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x3c ---------------------------------- */
                /* Philip Blundell <philb@gnu.org> */
                .name           = "Modular Technology MM100PCTV",
                .video_inputs   = 2,
-               .audio_inputs   = 2,
-               .svhs           = UNSET,
+               /* .audio_inputs= 2, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 11,
                .muxsel         = { 2, 3, 1, 1 },
                .gpiomux        = { 2, 0, 0, 1 },
                .pll            = PLL_35,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_GMV1] = {
                /* Adrian Cox <adrian@humboldt.co.uk */
                .name           = "AG Electronics GMV1",
                .video_inputs   = 2,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 1,
                .gpiomask       = 0xF,
                .muxsel         = { 2, 2 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_BESTBUY_EASYTV2] = {
                /* Miguel Angel Alvarez <maacruz@navegalia.com>
                special thanks to Informatica Mieres for providing the card */
                .name           = "Askey CPH061/ BESTBUY Easy TV (bt878)",
                .video_inputs   = 3,
-               .audio_inputs   = 2,
+               /* .audio_inputs= 2, */
                .svhs           = 2,
                .gpiomask       = 0xFF,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_ATI_TVWONDER] = {
                /* Lukas Gebauer <geby@volny.cz> */
                .name           = "ATI TV-Wonder",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xf03f,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x40 ---------------------------------- */
                /* Lukas Gebauer <geby@volny.cz> */
                .name           = "ATI TV-Wonder VE",
                .video_inputs   = 2,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 1,
                .muxsel         = { 2, 3, 0, 1 },
                .gpiomux        = { 0, 0, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_FLYVIDEO2000] = {
                /* DeeJay <deejay@westel900.net (2000S) */
                .name           = "Lifeview FlyVideo 2000S LR90",
                .video_inputs   = 3,
-               .audio_inputs   = 3,
+               /* .audio_inputs= 3, */
                .svhs           = 2,
                .gpiomask       = 0x18e0,
                .muxsel         = { 2, 3, 0, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_TERRATVALUER] = {
                .name           = "Terratec TValueRadio",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0xffff00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 1,
        },
        [BTTV_BOARD_GVBCTV4PCI] = {
                /* TANAKA Kei <peg00625@nifty.com> */
                .name           = "IODATA GV-BCTV4/PCI",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x010f00,
                .muxsel         = {2, 3, 0, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_SHARP_2U5JF5540_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= gvbctv3pci_audio,
        },
 
                /* try "insmod msp3400 simple=0" if you have
                * sound problems with this card. */
                .video_inputs   = 4,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0x4f8a00,
                /* 0x100000: 1=MSP enabled (0=disable again)
                * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
                .muxsel         = { 2, 3 ,0 ,1 },
                .tuner_type     = TUNER_MT2032,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
        },
                /* try "insmod msp3400 simple=0" if you have
                * sound problems with this card. */
                .video_inputs   = 4,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0x4f8a00,
                /* 0x100000: 1=MSP enabled (0=disable again)
                * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
                .muxsel         = { 2, 3 ,0 ,1 },
                .tuner_type     = TUNER_MT2032,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
        },
                /* Philip Blundell <pb@nexus.co.uk> */
                .name           = "Active Imaging AIMMS",
                .video_inputs   = 1,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .muxsel         = { 2 },
                .gpiomask       = 0
                /* Tomasz Pyra <hellfire@sedez.iq.pl> */
                .name           = "Prolink Pixelview PV-BT878P+ (Rev.4C,8E)",
                .video_inputs   = 3,
-               .audio_inputs   = 4,
+               /* .audio_inputs= 4, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_LG_PAL_I_FM,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,
                /* GPIO wiring:
                        GPIO0: U4.A0 (hef4052bt)
        [BTTV_BOARD_FLYVIDEO98EZ] = {
                .name           = "Lifeview FlyVideo 98EZ (capture only) LR51",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 1 }, /* AV1, AV2, SVHS, CVid adapter on SVHS */
                .pll            = PLL_28,
                .no_msp34xx     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
        /* ---- card 0x48 ---------------------------------- */
                /* Dariusz Kowalewski <darekk@automex.pl> */
                .name           = "Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x3f,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= pvbt878p9b_audio, /* Note: not all cards have stereo */
                .has_radio      = 1,  /* Note: not all cards have radio */
                .has_remote     = 1,
                /* you must jumper JP5 for the card to work */
                .name           = "Sensoray 311",
                .video_inputs   = 5,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 4,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 0, 0 },
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_RV605] = {
                /* Miguel Freitas <miguel@cetuc.puc-rio.br> */
                .name           = "RemoteVision MX (RV605)",
                .video_inputs   = 16,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0x00,
                .gpiomask2      = 0x07ff,
                .muxsel         = { 0x33, 0x13, 0x23, 0x43, 0xf3, 0x73, 0xe3, 0x03,
                .no_tda9875     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .muxsel_hook    = rv605_muxsel,
        },
        [BTTV_BOARD_POWERCLR_MTV878] = {
                .name           = "Powercolor MTV878/ MTV878R/ MTV878F",
                .video_inputs   = 3,
-               .audio_inputs   = 2,
+               /* .audio_inputs= 2, */
                .svhs           = 2,
                .gpiomask       = 0x1C800F,  /* Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset */
                .muxsel         = { 2, 1, 1, },
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
        },
                /* Masaki Suzuki <masaki@btree.org> */
                .name           = "Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x140007,
                .muxsel         = { 2, 3, 1, 1 },
                .gpiomute       = 4,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= windvr_audio,
        },
        [BTTV_BOARD_GRANDTEC_MULTI] = {
                .name           = "GrandTec Multi Capture Card (Bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 0 },
                .gpiomux        = { 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_KWORLD] = {
                .name           = "Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF",
                .video_inputs   = 4,
-               .audio_inputs   = 3,
+               /* .audio_inputs= 3, */
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, 1, 1 },   /* Tuner, SVid, SVHS, SVid to SVHS connector */
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                /* Samsung TCPA9095PC27A (BG+DK), philips compatible, w/FM, stereo and
                radio signal strength indicators work fine. */
                .has_radio      = 1,
                /* Arthur Tetzlaff-Deas, DSP Design Ltd <software@dspdesign.com> */
                .name           = "DSP Design TCVIDEO",
                .video_inputs   = 4,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
                /* ---- card 0x50 ---------------------------------- */
        [BTTV_BOARD_HAUPPAUGEPVR] = {
                .name           = "Hauppauge WinTV PVR",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 0, 1, 1 },
                .needs_tvaudio  = 1,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
 
                .gpiomask       = 7,
                .gpiomux        = {7},
        [BTTV_BOARD_GVBCTV5PCI] = {
                .name           = "IODATA GV-BCTV5/PCI",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x0f0f80,
                .muxsel         = {2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC_M,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= gvbctv5pci_audio,
                .has_radio      = 1,
        },
        [BTTV_BOARD_OSPREY1x0] = {
                .name           = "Osprey 100/150 (878)", /* 0x1(2|3)-45C6-C1 */
                .video_inputs   = 4,                  /* id-inputs-clock */
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 3,
                .muxsel         = { 3, 2, 0, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY1x0_848] = {
                .name           = "Osprey 100/150 (848)", /* 0x04-54C0-C1 & older boards */
                .video_inputs   = 3,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY101_848] = {
                .name           = "Osprey 101 (848)", /* 0x05-40C0-C1 */
                .video_inputs   = 2,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 1,
                .muxsel         = { 3, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY1x1] = {
                .name           = "Osprey 101/151",       /* 0x1(4|5)-0004-C4 */
                .video_inputs   = 1,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .muxsel         = { 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY1x1_SVID] = {
                .name           = "Osprey 101/151 w/ svid",  /* 0x(16|17|20)-00C4-C1 */
                .video_inputs   = 2,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 1,
                .muxsel         = { 0, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY2xx] = {
                .name           = "Osprey 200/201/250/251",  /* 0x1(8|9|E|F)-0004-C4 */
                .video_inputs   = 1,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .muxsel         = { 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY2x0_SVID] = {
                .name           = "Osprey 200/250",   /* 0x1(A|B)-00C4-C1 */
                .video_inputs   = 2,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 1,
                .muxsel         = { 0, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY2x0] = {
                .name           = "Osprey 210/220/230",   /* 0x1(A|B)-04C0-C1 */
                .video_inputs   = 2,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 1,
                .muxsel         = { 2, 3 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY500] = {
                .name           = "Osprey 500",   /* 500 */
                .video_inputs   = 2,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 1,
                .muxsel         = { 2, 3 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY540] = {
                .name           = "Osprey 540",   /* 540 */
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_OSPREY2000] = {
                .name           = "Osprey 2000",  /* 2000 */
                .video_inputs   = 2,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 1,
                .muxsel         = { 2, 3 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,      /* must avoid, conflicts with the bt860 */
                /* M G Berberich <berberic@forwiss.uni-passau.de> */
                .name           = "IDS Eagle",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                .gpiomask       = 0,
                .muxsel         = { 0, 1, 2, 3 },
                .muxsel_hook    = eagle_muxsel,
        [BTTV_BOARD_PINNACLESAT] = {
                .name           = "Pinnacle PCTV Sat",
                .video_inputs   = 2,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_FORMAC_PROTV] = {
                .name           = "Formac ProTV II (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 3,
                .gpiomask       = 2,
                /* TV, Comp1, Composite over SVID con, SVID */
                .has_radio      = 1,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        /* sound routing:
                GPIO=0x00,0x01,0x03: mute (?)
                0x02: both TV and radio (tuner: FM1216/I)
        [BTTV_BOARD_MACHTV] = {
                .name           = "MachTV",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, 1, 1},
                .gpiomux        = { 0, 1, 2, 3},
                .needs_tvaudio  = 1,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
        },
        [BTTV_BOARD_EURESYS_PICOLO] = {
                .name           = "Euresys Picolo",
                .video_inputs   = 3,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 2,
                .gpiomask       = 0,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_PV150] = {
                /* Luc Van Hoeylandt <luc@e-magic.be> */
                .name           = "ProVideo PV150", /* 0x4f */
                .video_inputs   = 2,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0,
                .muxsel         = { 2, 3 },
                .gpiomux        = { 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_AD_TVK503] = {
                /* Hiroshi Takekawa <sian@big.or.jp> */
                /* This card lacks subsystem ID */
                .name           = "AD-TVK503", /* 0x63 */
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x001e8007,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .audio_mode_gpio= adtvk503_audio,
        },
 
        [BTTV_BOARD_HERCULES_SM_TV] = {
                .name           = "Hercules Smart TV Stereo",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                /* Notes:
                - card lacks subsystem ID
                - stereo variant w/ daughter board with tda9874a @0xb0
        [BTTV_BOARD_PACETV] = {
                .name           = "Pace TV & Radio Card",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 1 }, /* Tuner, CVid, SVid, CVid over SVid connector */
                .gpiomask       = 0,
                .no_tda7432     = 1,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 1,
                .pll            = PLL_28,
                /* Bt878, Bt832, FI1246 tuner; no pci subsystem id
                /* Chris Willing <chris@vislab.usyd.edu.au> */
                .name           = "IVC-200",
                .video_inputs   = 1,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                .gpiomask       = 0xdf,
                .muxsel         = { 2 },
                .pll            = PLL_28,
        [BTTV_BOARD_IVCE8784] = {
                .name           = "IVCE-8784",
                .video_inputs   = 1,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                .gpiomask       = 0xdf,
                .muxsel         = { 2 },
                .pll            = PLL_28,
        [BTTV_BOARD_XGUARD] = {
                .name           = "Grand X-Guard / Trust 814PCI",
                .video_inputs   = 16,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .gpiomask2      = 0xff,
                .muxsel         = { 2,2,2,2, 3,3,3,3, 1,1,1,1, 0,0,0,0 },
                .muxsel_hook    = xguard_muxsel,
        [BTTV_BOARD_NEBULA_DIGITV] = {
                .name           = "Nebula Electronics DigiTV",
                .video_inputs   = 1,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                .muxsel         = { 2, 3, 1, 0 },
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_dvb        = 1,
                .has_remote     = 1,
                .gpiomask       = 0x1b,
                /* Jorge Boncompte - DTI2 <jorge@dti2.net> */
                .name           = "ProVideo PV143",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0,
                .muxsel         = { 2, 3, 1, 0 },
                .gpiomux        = { 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_VD009X1_VD011_MINIDIN] = {
                /* M.Klahr@phytec.de */
                .name           = "PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 3,
                .gpiomask       = 0x00,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_VD009X1_VD011_COMBI] = {
                .name           = "PHYTEC VD-009-X1 VD-011 Combi (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 3,
                .gpiomask       = 0x00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
 
                /* ---- card 0x6c ---------------------------------- */
        [BTTV_BOARD_VD009_MINIDIN] = {
                .name           = "PHYTEC VD-009 MiniDIN (bt878)",
                .video_inputs   = 10,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 9,
                .gpiomask       = 0x00,
                .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_VD009_COMBI] = {
                .name           = "PHYTEC VD-009 Combi (bt878)",
                .video_inputs   = 10,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 9,
                .gpiomask       = 0x00,
                .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_IVC100] = {
                .name           = "IVC-100",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                .gpiomask       = 0xdf,
                .muxsel         = { 2, 3, 1, 0 },
                .pll            = PLL_28,
                /* IVC-120G - Alan Garfield <alan@fromorbit.com> */
                .name           = "IVC-120G",
                .video_inputs   = 16,
-               .audio_inputs   = 0,    /* card has no audio */
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .svhs           = UNSET,   /* card has no svhs */
+               .svhs           = NO_SVHS,   /* card has no svhs */
                .needs_tvaudio  = 0,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
        [BTTV_BOARD_PC_HDTV] = {
                .name           = "pcHDTV HD-2000 TV",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 0 },
                .tuner_type     = TUNER_PHILIPS_FCV1236D,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_dvb        = 1,
        },
        [BTTV_BOARD_TWINHAN_DST] = {
                .no_tda7432     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_video       = 1,
                .has_dvb        = 1,
        },
        [BTTV_BOARD_WINFASTVC100] = {
                .name           = "Winfast VC100",
                .video_inputs   = 3,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 1,
                .muxsel         = { 3, 1, 1, 3 }, /* Vid In, SVid In, Vid over SVid in connector */
                .no_msp34xx     = 1,
                .no_tda7432     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
        },
        [BTTV_BOARD_TEV560] = {
                .name           = "Teppro TEV-560/InterVision IV-560",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 3,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 1,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_35,
        },
 
        [BTTV_BOARD_SIMUS_GVC1100] = {
                .name           = "SIMUS GVC1100",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .muxsel         = { 2, 2, 2, 2 },
                .gpiomask       = 0x3F,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,
        },
        [BTTV_BOARD_LMLBT4] = {
                /* http://linuxmedialabs.com */
                .name           = "LMLBT4",
                .video_inputs   = 4, /* IN1,IN2,IN3,IN4 */
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .muxsel         = { 2, 3, 1, 0 },
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_TEKRAM_M205] = {
                /* Helmroos Harri <harri.helmroos@pp.inet.fi> */
                .name           = "Tekram M205 PRO",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .svhs           = 2,
                .needs_tvaudio  = 0,
                .gpiomask       = 0x68,
                /* bt878 TV + FM without subsystem ID */
                .name           = "Conceptronic CONTVFMi",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x008007,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,
                .has_radio      = 1,
        },
                /*0x79 in bttv.h*/
                .name           = "Euresys Picolo Tetra",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0,
                .gpiomask2      = 0x3C<<16,/*Set the GPIO[18]->GPIO[21] as output pin.==> drive the video inputs through analog multiplexers*/
                .no_msp34xx     = 1,
                .muxsel_hook    = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_SPIRIT_TV] = {
                /* Spirit TV Tuner from http://spiritmodems.com.au */
                /* Stafford Goodsell <surge@goliath.homeunix.org> */
                .name           = "Spirit TV Tuner",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x0000000f,
                .muxsel         = { 2, 1, 1 },
                .gpiomux        = { 0x02, 0x00, 0x00, 0x00 },
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
        },
                .svhs           = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .muxsel         = { 3 , 3 },
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_dvb        = 1,
                .no_gpioirq     = 1,
                .has_remote     = 1,
        },
        [BTTV_BOARD_MATRIX_VISIONSQ] = {
                /* andre.schwarz@matrix-vision.de */
-               .name             = "MATRIX Vision Sigma-SQ",
-               .video_inputs     = 16,
-               .audio_inputs     = 0,
-               .svhs             = UNSET,
-               .gpiomask         = 0x0,
-               .muxsel           = { 2, 2, 2, 2, 2, 2, 2, 2,
-                               3, 3, 3, 3, 3, 3, 3, 3 },
-               .muxsel_hook      = sigmaSQ_muxsel,
-               .gpiomux          = { 0 },
-               .no_msp34xx       = 1,
-               .pll              = PLL_28,
-               .tuner_type       = TUNER_ABSENT,
-               .tuner_addr       = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
+               .name           = "MATRIX Vision Sigma-SQ",
+               .video_inputs   = 16,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
+               .gpiomask       = 0x0,
+               .muxsel         = { 2, 2, 2, 2, 2, 2, 2, 2,
+                                   3, 3, 3, 3, 3, 3, 3, 3 },
+               .muxsel_hook    = sigmaSQ_muxsel,
+               .gpiomux        = { 0 },
+               .no_msp34xx     = 1,
+               .pll            = PLL_28,
+               .tuner_type     = TUNER_ABSENT,
+               .tuner_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MATRIX_VISIONSLC] = {
                /* andre.schwarz@matrix-vision.de */
-               .name             = "MATRIX Vision Sigma-SLC",
-               .video_inputs     = 4,
-               .audio_inputs     = 0,
-               .svhs             = UNSET,
-               .gpiomask         = 0x0,
-               .muxsel           = { 2, 2, 2, 2 },
-               .muxsel_hook      = sigmaSLC_muxsel,
-               .gpiomux          = { 0 },
-               .no_msp34xx       = 1,
-               .pll              = PLL_28,
-               .tuner_type       = TUNER_ABSENT,
-               .tuner_addr       = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
+               .name           = "MATRIX Vision Sigma-SLC",
+               .video_inputs   = 4,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
+               .gpiomask       = 0x0,
+               .muxsel         = { 2, 2, 2, 2 },
+               .muxsel_hook    = sigmaSLC_muxsel,
+               .gpiomux        = { 0 },
+               .no_msp34xx     = 1,
+               .pll            = PLL_28,
+               .tuner_type     = TUNER_ABSENT,
+               .tuner_addr     = ADDR_UNSET,
        },
                /* BTTV_BOARD_APAC_VIEWCOMP */
        [BTTV_BOARD_APAC_VIEWCOMP] = {
                /* bt878 TV + FM 0x00000000 subsystem ID */
                .name           = "APAC Viewcomp 878(AMAX)",
                .video_inputs   = 2,
-               .audio_inputs   = 1,
-               .svhs           = UNSET,
+               /* .audio_inputs= 1, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0xFF,
                .muxsel         = { 2, 3, 1, 1 },
                .gpiomux        = { 2, 0, 0, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,   /* miniremote works, see ir-kbd-gpio.c */
                .has_radio      = 1,   /* not every card has radio */
        },
                .has_dvb        = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_VGEAR_MYVCD] = {
                /* Steven <photon38@pchome.com.tw> */
                .name           = "V-Gear MyVCD",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x3f,
                .muxsel         = {2, 3, 1, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC_M,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 0,
        },
        [BTTV_BOARD_SUPER_TV] = {
                /* Rick C <cryptdragoon@gmail.com> */
                .name           = "Super TV Tuner",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 0 },
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .gpiomask       = 0x008007,
                .gpiomux        = { 0, 0x000001,0,0 },
                .needs_tvaudio  = 1,
                /* Chris Fanning <video4linux@haydon.net> */
                .name           = "Tibet Systems 'Progress DVR' CS16",
                .video_inputs   = 16,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .muxsel         = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
                .pll            = PLL_28,
                .no_msp34xx     = 1,
                .no_tda7432     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .muxsel_hook    = tibetCS16_muxsel,
        },
        [BTTV_BOARD_KODICOM_4400R] = {
                */
                .name           = "Kodicom 4400R (master)",
                .video_inputs   = 16,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                /* GPIO bits 0-9 used for analog switch:
                *   00 - 03:    camera selector
                *   04 - 06:    channel (controller) selector
                */
                .name           = "Kodicom 4400R (slave)",
                .video_inputs   = 16,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .svhs           = UNSET,
+               .svhs           = NO_SVHS,
                .gpiomask       = 0x010000,
                .no_gpioirq     = 1,
                .muxsel         = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
                /* Adlink RTV24 with special unlock codes */
                .name           = "Adlink RTV24",
                .video_inputs   = 4,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1, 0 },
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
        },
                /* ---- card 0x87---------------------------------- */
                .name           = "DViCO FusionHDTV 5 Lite",
                .tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1 },
                .gpiomask       = 0x00e00007,
                /* Mauro Carvalho Chehab <mchehab@infradead.org> */
                .name           = "Acorp Y878F",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x01fe00,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_YMEC_TVF66T5_B_DFF,
                .tuner_addr     = 0xc1 >>1,
-               .radio_addr     = 0xc1 >>1,
                .has_radio      = 1,
        },
                /* ---- card 0x89 ---------------------------------- */
        [BTTV_BOARD_CONCEPTRONIC_CTVFMI2] = {
                .name           = "Conceptronic CTVFMi v2",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x001c0007,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TENA_9533_DI,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_remote     = 1,
                .has_radio      = 1,
        },
                /* ---- card 0x8a ---------------------------------- */
        [BTTV_BOARD_PV_BT878P_2E] = {
-               .name          = "Prolink Pixelview PV-BT878P+ (Rev.2E)",
-               .video_inputs  = 5,
-               .audio_inputs  = 1,
-               .svhs          = 3,
-               .gpiomask      = 0x01fe00,
-               .muxsel        = { 2,3,1,1,-1 },
-               .digital_mode  = DIGITAL_MODE_CAMERA,
-               .gpiomux       = { 0x00400, 0x10400, 0x04400, 0x80000 },
-               .gpiomute      = 0x12400,
-               .no_msp34xx    = 1,
-               .pll           = PLL_28,
-               .tuner_type    = TUNER_LG_PAL_FM,
-               .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .has_remote    = 1,
+               .name           = "Prolink Pixelview PV-BT878P+ (Rev.2E)",
+               .video_inputs   = 5,
+               /* .audio_inputs= 1, */
+               .svhs           = 3,
+               .gpiomask       = 0x01fe00,
+               .muxsel         = { 2, 3, 1, 1, -1 },
+               /* .digital_mode= DIGITAL_MODE_CAMERA, */
+               .gpiomux        = { 0x00400, 0x10400, 0x04400, 0x80000 },
+               .gpiomute       = 0x12400,
+               .no_msp34xx     = 1,
+               .pll            = PLL_28,
+               .tuner_type     = TUNER_LG_PAL_FM,
+               .tuner_addr     = ADDR_UNSET,
+               .has_remote     = 1,
        },
                /* ---- card 0x8b ---------------------------------- */
        [BTTV_BOARD_PV_M4900] = {
                /* Sérgio Fortier <sergiofortier@yahoo.com.br> */
                .name           = "Prolink PixelView PlayTV MPEG2 PV-M4900",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x3f,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_YMEC_TVF_5533MF,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .has_radio      = 1,
                .has_remote     = 1,
        },
        [BTTV_BOARD_OSPREY440]  = {
                .name           = "Osprey 440",
                .video_inputs   = 4,
-               .audio_inputs   = 2, /* this is meaningless */
-               .svhs           = UNSET,
+               /* .audio_inputs= 2, */
+               .svhs           = NO_SVHS,
                .muxsel         = { 2, 3, 0, 1 }, /* 3,0,1 are guesses */
                .gpiomask       = 0x303,
                .gpiomute       = 0x000, /* int + 32kHz */
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .no_msp34xx     = 1,
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        [BTTV_BOARD_ASOUND_SKYEYE] = {
                .name           = "Asound Skyeye PCTV",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
                /* ---- card 0x8e ---------------------------------- */
        [BTTV_BOARD_SABRENT_TVFM] = {
                .name           = "Sabrent TV-FM (bttv version)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x108007,
                .muxsel         = { 2, 3, 1, 1 },
        [BTTV_BOARD_HAUPPAUGE_IMPACTVCB] = {
                .name           = "Hauppauge ImpactVCB (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0x0f, /* old: 7 */
                .muxsel         = { 0, 1, 3, 2 }, /* Composite 0-3 */
                .no_msp34xx     = 1,
                .no_tda7432     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_MACHTV_MAGICTV] = {
                /* Julian Calaby <julian.calaby@gmail.com>
 
                .name           = "MagicTV", /* rebranded MachTV */
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = { 2, 3, 1, 1 },
                .gpiomute       = 4,
                .tuner_type     = TUNER_TEMIC_4009FR5_PAL,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
                .has_remote     = 1,
        [BTTV_BOARD_SSAI_SECURITY] = {
                .name           = "SSAI Security Video Interface",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
-               .svhs           = UNSET,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .muxsel         = { 0, 1, 2, 3 },
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_SSAI_ULTRASOUND] = {
                .name           = "SSAI Ultrasound Video Interface",
                .video_inputs   = 2,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 1,
                .muxsel         = { 2, 0, 1, 3 },
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        /* ---- card 0x94---------------------------------- */
        [BTTV_BOARD_DVICO_FUSIONHDTV_2] = {
                .name           = "DViCO FusionHDTV 2",
                .tuner_type     = TUNER_PHILIPS_FCV1236D,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .muxsel         = { 2, 3, 1 },
                .gpiomask       = 0x00e00007,
        [BTTV_BOARD_TYPHOON_TVTUNERPCI] = {
                .name           = "Typhoon TV-Tuner PCI (50684)",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x3014f,
                .muxsel         = { 2, 3, 1, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_GEOVISION_GV600] = {
                /* emhn@usb.ve */
-               .name             = "Geovision GV-600",
-               .video_inputs     = 16,
-               .audio_inputs     = 0,
-               .svhs             = UNSET,
-               .gpiomask         = 0x0,
-               .muxsel           = { 2, 2, 2, 2, 2, 2, 2, 2,
-                                     2, 2, 2, 2, 2, 2, 2, 2 },
-               .muxsel_hook      = geovision_muxsel,
-               .gpiomux          = { 0 },
-               .no_msp34xx       = 1,
-               .pll              = PLL_28,
-               .tuner_type       = TUNER_ABSENT,
-               .tuner_addr       = ADDR_UNSET,
-               .radio_addr       = ADDR_UNSET,
+               .name           = "Geovision GV-600",
+               .video_inputs   = 16,
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
+               .gpiomask       = 0x0,
+               .muxsel         = { 2, 2, 2, 2, 2, 2, 2, 2,
+                                   2, 2, 2, 2, 2, 2, 2, 2 },
+               .muxsel_hook    = geovision_muxsel,
+               .gpiomux        = { 0 },
+               .no_msp34xx     = 1,
+               .pll            = PLL_28,
+               .tuner_type     = TUNER_ABSENT,
+               .tuner_addr     = ADDR_UNSET,
        },
        [BTTV_BOARD_KOZUMI_KTV_01C] = {
                /* Mauro Lacy <mauro@lacy.com.ar>
 
                .name           = "Kozumi KTV-01C",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                .gpiomask       = 0x008007,
                .muxsel         = { 2, 3, 1, 1 },
                .needs_tvaudio  = 0,
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
                .has_remote     = 1,
                   Mauro Carvalho Chehab <mchehab@infradead.org */
                .name           = "Encore ENL TV-FM-2",
                .video_inputs   = 3,
-               .audio_inputs   = 1,
+               /* .audio_inputs= 1, */
                .svhs           = 2,
                /* bit 6          -> IR disabled
                   bit 18/17 = 00 -> mute
                .gpiomute       = 0,
                .tuner_type     = TUNER_TCL_MF02GIP_5N,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
                .pll            = PLL_28,
                .has_radio      = 1,
                .has_remote     = 1,
                /* D.Heer@Phytec.de */
                .name           = "PHYTEC VD-012 (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
-               .svhs           = UNSET, /* card has no s-video */
+               /* .audio_inputs= 0, */
+               .svhs           = NO_SVHS,
                .gpiomask       = 0x00,
                .muxsel         = { 0, 2, 3, 1 },
                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
                [BTTV_BOARD_VD012_X1] = {
                /* D.Heer@Phytec.de */
                .name           = "PHYTEC VD-012-X1 (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 3,
                .gpiomask       = 0x00,
                .muxsel         = { 2, 3, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        },
                [BTTV_BOARD_VD012_X2] = {
                /* D.Heer@Phytec.de */
                .name           = "PHYTEC VD-012-X2 (bt878)",
                .video_inputs   = 4,
-               .audio_inputs   = 0,
+               /* .audio_inputs= 0, */
                .svhs           = 3,
                .gpiomask       = 0x00,
                .muxsel         = { 3, 2, 1 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
        }
 };
 
                bttv_call_i2c_clients(btv, TUNER_SET_CONFIG, &tda9887_cfg);
        }
 
-       btv->svhs = bttv_tvcards[btv->c.type].svhs;
+       btv->svhs = bttv_tvcards[btv->c.type].svhs == NO_SVHS ?
+                   UNSET : bttv_tvcards[btv->c.type].svhs;
        if (svhs[btv->c.nr] != UNSET)
                btv->svhs = svhs[btv->c.nr];
        if (remote[btv->c.nr] != UNSET)