aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:37:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:20 -0500
commit4ac97914c6c35f6bf132071c718e034d0846b9f5 (patch)
tree98c7eb827bb8ba99730ed89d32703a30448fd813 /drivers/media/video/saa7134/saa7134-cards.c
parenta8900fc242406f25f315190a6d650f1d54617c2f (diff)
[PATCH] v4l: 800: whitespace cleanups
- Whitespace Cleanups. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c314
1 files changed, 157 insertions, 157 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 17b0549f2e1b..a60d49af341d 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2114,16 +2114,16 @@ struct saa7134_board saa7134_boards[] = {
2114 }, 2114 },
2115 }, 2115 },
2116 [SAA7134_BOARD_BEHOLD_409FM] = { 2116 [SAA7134_BOARD_BEHOLD_409FM] = {
2117 /* <http://tuner.beholder.ru>, Sergey <skiv@orel.ru> */ 2117 /* <http://tuner.beholder.ru>, Sergey <skiv@orel.ru> */
2118 .name = "Beholder BeholdTV 409 FM", 2118 .name = "Beholder BeholdTV 409 FM",
2119 .audio_clock = 0x00187de7, 2119 .audio_clock = 0x00187de7,
2120 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 2120 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
2121 .radio_type = UNSET, 2121 .radio_type = UNSET,
2122 .tuner_addr = ADDR_UNSET, 2122 .tuner_addr = ADDR_UNSET,
2123 .radio_addr = ADDR_UNSET, 2123 .radio_addr = ADDR_UNSET,
2124 .tda9887_conf = TDA9887_PRESENT, 2124 .tda9887_conf = TDA9887_PRESENT,
2125 .inputs = {{ 2125 .inputs = {{
2126 .name = name_tv, 2126 .name = name_tv,
2127 .vmux = 3, 2127 .vmux = 3,
2128 .amux = TV, 2128 .amux = TV,
2129 .tv = 1, 2129 .tv = 1,
@@ -2131,60 +2131,60 @@ struct saa7134_board saa7134_boards[] = {
2131 .name = name_comp1, 2131 .name = name_comp1,
2132 .vmux = 1, 2132 .vmux = 1,
2133 .amux = LINE1, 2133 .amux = LINE1,
2134 },{ 2134 },{
2135 .name = name_svideo, 2135 .name = name_svideo,
2136 .vmux = 8, 2136 .vmux = 8,
2137 .amux = LINE1, 2137 .amux = LINE1,
2138 }}, 2138 }},
2139 .radio = { 2139 .radio = {
2140 .name = name_radio, 2140 .name = name_radio,
2141 .amux = LINE2, 2141 .amux = LINE2,
2142 }, 2142 },
2143 }, 2143 },
2144 [SAA7134_BOARD_GOTVIEW_7135] = { 2144 [SAA7134_BOARD_GOTVIEW_7135] = {
2145 /* Mike Baikov <mike@baikov.com> */ 2145 /* Mike Baikov <mike@baikov.com> */
2146 /* Andrey Cvetcov <ays14@yandex.ru> */ 2146 /* Andrey Cvetcov <ays14@yandex.ru> */
2147 .name = "GoTView 7135 PCI", 2147 .name = "GoTView 7135 PCI",
2148 .audio_clock = 0x00187de7, 2148 .audio_clock = 0x00187de7,
2149 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 2149 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
2150 .radio_type = UNSET, 2150 .radio_type = UNSET,
2151 .tuner_addr = ADDR_UNSET, 2151 .tuner_addr = ADDR_UNSET,
2152 .radio_addr = ADDR_UNSET, 2152 .radio_addr = ADDR_UNSET,
2153 .tda9887_conf = TDA9887_PRESENT, 2153 .tda9887_conf = TDA9887_PRESENT,
2154 .gpiomask = 0x00200003, 2154 .gpiomask = 0x00200003,
2155 .inputs = {{ 2155 .inputs = {{
2156 .name = name_tv, 2156 .name = name_tv,
2157 .vmux = 1, 2157 .vmux = 1,
2158 .amux = TV, 2158 .amux = TV,
2159 .tv = 1, 2159 .tv = 1,
2160 .gpio = 0x00200003, 2160 .gpio = 0x00200003,
2161 },{ 2161 },{
2162 .name = name_tv_mono, 2162 .name = name_tv_mono,
2163 .vmux = 1, 2163 .vmux = 1,
2164 .amux = LINE2, 2164 .amux = LINE2,
2165 .gpio = 0x00200003, 2165 .gpio = 0x00200003,
2166 },{ 2166 },{
2167 .name = name_comp1, 2167 .name = name_comp1,
2168 .vmux = 3, 2168 .vmux = 3,
2169 .amux = LINE1, 2169 .amux = LINE1,
2170 .gpio = 0x00200003, 2170 .gpio = 0x00200003,
2171 },{ 2171 },{
2172 .name = name_svideo, 2172 .name = name_svideo,
2173 .vmux = 8, 2173 .vmux = 8,
2174 .amux = LINE1, 2174 .amux = LINE1,
2175 .gpio = 0x00200003, 2175 .gpio = 0x00200003,
2176 }}, 2176 }},
2177 .radio = { 2177 .radio = {
2178 .name = name_radio, 2178 .name = name_radio,
2179 .amux = LINE2, 2179 .amux = LINE2,
2180 .gpio = 0x00200003, 2180 .gpio = 0x00200003,
2181 }, 2181 },
2182 .mute = { 2182 .mute = {
2183 .name = name_mute, 2183 .name = name_mute,
2184 .amux = TV, 2184 .amux = TV,
2185 .gpio = 0x00200003, 2185 .gpio = 0x00200003,
2186 }, 2186 },
2187 }, 2187 },
2188 [SAA7134_BOARD_PHILIPS_EUROPA] = { 2188 [SAA7134_BOARD_PHILIPS_EUROPA] = {
2189 .name = "Philips EUROPA V3 reference design", 2189 .name = "Philips EUROPA V3 reference design",
2190 .audio_clock = 0x00187de7, 2190 .audio_clock = 0x00187de7,
@@ -2251,78 +2251,78 @@ struct saa7134_board saa7134_boards[] = {
2251 .amux = LINE1, 2251 .amux = LINE1,
2252 }}, 2252 }},
2253 }, 2253 },
2254 [SAA7134_BOARD_RTD_VFG7350] = { 2254 [SAA7134_BOARD_RTD_VFG7350] = {
2255 .name = "RTD Embedded Technologies VFG7350", 2255 .name = "RTD Embedded Technologies VFG7350",
2256 .audio_clock = 0x00200000, 2256 .audio_clock = 0x00200000,
2257 .tuner_type = TUNER_ABSENT, 2257 .tuner_type = TUNER_ABSENT,
2258 .radio_type = UNSET, 2258 .radio_type = UNSET,
2259 .tuner_addr = ADDR_UNSET, 2259 .tuner_addr = ADDR_UNSET,
2260 .radio_addr = ADDR_UNSET, 2260 .radio_addr = ADDR_UNSET,
2261 .inputs = {{ 2261 .inputs = {{
2262 .name = "Composite 0", 2262 .name = "Composite 0",
2263 .vmux = 0, 2263 .vmux = 0,
2264 .amux = LINE1, 2264 .amux = LINE1,
2265 },{ 2265 },{
2266 .name = "Composite 1", 2266 .name = "Composite 1",
2267 .vmux = 1, 2267 .vmux = 1,
2268 .amux = LINE2, 2268 .amux = LINE2,
2269 },{ 2269 },{
2270 .name = "Composite 2", 2270 .name = "Composite 2",
2271 .vmux = 2, 2271 .vmux = 2,
2272 .amux = LINE1, 2272 .amux = LINE1,
2273 },{ 2273 },{
2274 .name = "Composite 3", 2274 .name = "Composite 3",
2275 .vmux = 3, 2275 .vmux = 3,
2276 .amux = LINE2, 2276 .amux = LINE2,
2277 },{ 2277 },{
2278 .name = "S-Video 0", 2278 .name = "S-Video 0",
2279 .vmux = 8, 2279 .vmux = 8,
2280 .amux = LINE1, 2280 .amux = LINE1,
2281 },{ 2281 },{
2282 .name = "S-Video 1", 2282 .name = "S-Video 1",
2283 .vmux = 9, 2283 .vmux = 9,
2284 .amux = LINE2, 2284 .amux = LINE2,
2285 }}, 2285 }},
2286 .mpeg = SAA7134_MPEG_EMPRESS, 2286 .mpeg = SAA7134_MPEG_EMPRESS,
2287 .video_out = CCIR656, 2287 .video_out = CCIR656,
2288 .vid_port_opts = ( SET_T_CODE_POLARITY_NON_INVERTED | 2288 .vid_port_opts = ( SET_T_CODE_POLARITY_NON_INVERTED |
2289 SET_CLOCK_NOT_DELAYED | 2289 SET_CLOCK_NOT_DELAYED |
2290 SET_CLOCK_INVERTED | 2290 SET_CLOCK_INVERTED |
2291 SET_VSYNC_OFF ), 2291 SET_VSYNC_OFF ),
2292 }, 2292 },
2293 [SAA7134_BOARD_RTD_VFG7330] = { 2293 [SAA7134_BOARD_RTD_VFG7330] = {
2294 .name = "RTD Embedded Technologies VFG7330", 2294 .name = "RTD Embedded Technologies VFG7330",
2295 .audio_clock = 0x00200000, 2295 .audio_clock = 0x00200000,
2296 .tuner_type = TUNER_ABSENT, 2296 .tuner_type = TUNER_ABSENT,
2297 .radio_type = UNSET, 2297 .radio_type = UNSET,
2298 .tuner_addr = ADDR_UNSET, 2298 .tuner_addr = ADDR_UNSET,
2299 .radio_addr = ADDR_UNSET, 2299 .radio_addr = ADDR_UNSET,
2300 .inputs = {{ 2300 .inputs = {{
2301 .name = "Composite 0", 2301 .name = "Composite 0",
2302 .vmux = 0, 2302 .vmux = 0,
2303 .amux = LINE1, 2303 .amux = LINE1,
2304 },{ 2304 },{
2305 .name = "Composite 1", 2305 .name = "Composite 1",
2306 .vmux = 1, 2306 .vmux = 1,
2307 .amux = LINE2, 2307 .amux = LINE2,
2308 },{ 2308 },{
2309 .name = "Composite 2", 2309 .name = "Composite 2",
2310 .vmux = 2, 2310 .vmux = 2,
2311 .amux = LINE1, 2311 .amux = LINE1,
2312 },{ 2312 },{
2313 .name = "Composite 3", 2313 .name = "Composite 3",
2314 .vmux = 3, 2314 .vmux = 3,
2315 .amux = LINE2, 2315 .amux = LINE2,
2316 },{ 2316 },{
2317 .name = "S-Video 0", 2317 .name = "S-Video 0",
2318 .vmux = 8, 2318 .vmux = 8,
2319 .amux = LINE1, 2319 .amux = LINE1,
2320 },{ 2320 },{
2321 .name = "S-Video 1", 2321 .name = "S-Video 1",
2322 .vmux = 9, 2322 .vmux = 9,
2323 .amux = LINE2, 2323 .amux = LINE2,
2324 }}, 2324 }},
2325 }, 2325 },
2326 [SAA7134_BOARD_FLYTVPLATINUM_MINI2] = { 2326 [SAA7134_BOARD_FLYTVPLATINUM_MINI2] = {
2327 .name = "LifeView FlyTV Platinum Mini2", 2327 .name = "LifeView FlyTV Platinum Mini2",
2328 .audio_clock = 0x00200000, 2328 .audio_clock = 0x00200000,
@@ -2760,55 +2760,55 @@ struct pci_device_id saa7134_pci_tbl[] = {
2760 .subvendor = 0x0000, /* It shouldn't break anything, since subdevice id seems unique */ 2760 .subvendor = 0x0000, /* It shouldn't break anything, since subdevice id seems unique */
2761 .subdevice = 0x4091, 2761 .subdevice = 0x4091,
2762 .driver_data = SAA7134_BOARD_BEHOLD_409FM, 2762 .driver_data = SAA7134_BOARD_BEHOLD_409FM,
2763 },{ 2763 },{
2764 .vendor = PCI_VENDOR_ID_PHILIPS, 2764 .vendor = PCI_VENDOR_ID_PHILIPS,
2765 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2765 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2766 .subvendor = 0x5456, /* GoTView */ 2766 .subvendor = 0x5456, /* GoTView */
2767 .subdevice = 0x7135, 2767 .subdevice = 0x7135,
2768 .driver_data = SAA7134_BOARD_GOTVIEW_7135, 2768 .driver_data = SAA7134_BOARD_GOTVIEW_7135,
2769 },{ 2769 },{
2770 .vendor = PCI_VENDOR_ID_PHILIPS, 2770 .vendor = PCI_VENDOR_ID_PHILIPS,
2771 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2771 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2772 .subvendor = PCI_VENDOR_ID_PHILIPS, 2772 .subvendor = PCI_VENDOR_ID_PHILIPS,
2773 .subdevice = 0x2004, 2773 .subdevice = 0x2004,
2774 .driver_data = SAA7134_BOARD_PHILIPS_EUROPA, 2774 .driver_data = SAA7134_BOARD_PHILIPS_EUROPA,
2775 },{ 2775 },{
2776 .vendor = PCI_VENDOR_ID_PHILIPS, 2776 .vendor = PCI_VENDOR_ID_PHILIPS,
2777 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2777 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2778 .subvendor = 0x185b, 2778 .subvendor = 0x185b,
2779 .subdevice = 0xc900, 2779 .subdevice = 0xc900,
2780 .driver_data = SAA7134_BOARD_VIDEOMATE_DVBT_300, 2780 .driver_data = SAA7134_BOARD_VIDEOMATE_DVBT_300,
2781 },{ 2781 },{
2782 .vendor = PCI_VENDOR_ID_PHILIPS, 2782 .vendor = PCI_VENDOR_ID_PHILIPS,
2783 .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 2783 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
2784 .subvendor = 0x185b, 2784 .subvendor = 0x185b,
2785 .subdevice = 0xc901, 2785 .subdevice = 0xc901,
2786 .driver_data = SAA7134_BOARD_VIDEOMATE_DVBT_200, 2786 .driver_data = SAA7134_BOARD_VIDEOMATE_DVBT_200,
2787 },{ 2787 },{
2788 .vendor = PCI_VENDOR_ID_PHILIPS, 2788 .vendor = PCI_VENDOR_ID_PHILIPS,
2789 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2789 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2790 .subvendor = 0x1435, 2790 .subvendor = 0x1435,
2791 .subdevice = 0x7350, 2791 .subdevice = 0x7350,
2792 .driver_data = SAA7134_BOARD_RTD_VFG7350, 2792 .driver_data = SAA7134_BOARD_RTD_VFG7350,
2793 },{ 2793 },{
2794 .vendor = PCI_VENDOR_ID_PHILIPS, 2794 .vendor = PCI_VENDOR_ID_PHILIPS,
2795 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2795 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2796 .subvendor = 0x1435, 2796 .subvendor = 0x1435,
2797 .subdevice = 0x7330, 2797 .subdevice = 0x7330,
2798 .driver_data = SAA7134_BOARD_RTD_VFG7330, 2798 .driver_data = SAA7134_BOARD_RTD_VFG7330,
2799 },{ 2799 },{
2800 .vendor = PCI_VENDOR_ID_PHILIPS, 2800 .vendor = PCI_VENDOR_ID_PHILIPS,
2801 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2801 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2802 .subvendor = 0x1461, 2802 .subvendor = 0x1461,
2803 .subdevice = 0x1044, 2803 .subdevice = 0x1044,
2804 .driver_data = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180, 2804 .driver_data = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180,
2805 },{ 2805 },{
2806 .vendor = PCI_VENDOR_ID_PHILIPS, 2806 .vendor = PCI_VENDOR_ID_PHILIPS,
2807 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2807 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2808 .subvendor = 0x1131, 2808 .subvendor = 0x1131,
2809 .subdevice = 0x4ee9, 2809 .subdevice = 0x4ee9,
2810 .driver_data = SAA7134_BOARD_MONSTERTV_MOBILE, 2810 .driver_data = SAA7134_BOARD_MONSTERTV_MOBILE,
2811 },{ 2811 },{
2812 /* --- boards without eeprom + subsystem ID --- */ 2812 /* --- boards without eeprom + subsystem ID --- */
2813 .vendor = PCI_VENDOR_ID_PHILIPS, 2813 .vendor = PCI_VENDOR_ID_PHILIPS,
2814 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2814 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3051,7 +3051,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
3051 case SAA7134_BOARD_VIDEOMATE_DVBT_300: 3051 case SAA7134_BOARD_VIDEOMATE_DVBT_300:
3052 /* The Philips EUROPA based hybrid boards have the tuner connected through 3052 /* The Philips EUROPA based hybrid boards have the tuner connected through
3053 * the channel decoder. We have to make it transparent to find it 3053 * the channel decoder. We have to make it transparent to find it
3054 */ 3054 */
3055 { 3055 {
3056 struct tuner_setup tun_setup; 3056 struct tuner_setup tun_setup;
3057 u8 data[] = { 0x07, 0x02}; 3057 u8 data[] = { 0x07, 0x02};
@@ -3063,7 +3063,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
3063 tun_setup.addr = dev->tuner_addr; 3063 tun_setup.addr = dev->tuner_addr;
3064 3064
3065 saa7134_i2c_call_clients (dev, TUNER_SET_TYPE_ADDR,&tun_setup); 3065 saa7134_i2c_call_clients (dev, TUNER_SET_TYPE_ADDR,&tun_setup);
3066 } 3066 }
3067 break; 3067 break;
3068 } 3068 }
3069 return 0; 3069 return 0;
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-15 04:43:03 -0500