aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-08-01 07:02:35 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 15:43:49 -0400
commit5af935cc96a291f90799bf6a2587d87329a91699 (patch)
tree7052ae5a3db8134a092480f96bbf940776d85c36 /drivers/media/dvb
parent8dc09004978538d211ccc36b5046919489e30a55 (diff)
V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
Instead of having one big keytable with 2 protocols inside, break it into two separate tables, being one for NEC and another for RC-5 variants, and properly identify what variant should be used at the boards entries. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c67
1 files changed, 53 insertions, 14 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 6e587cd1f515..ee2a84beb553 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1872,7 +1872,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1872 1872
1873 .rc.core = { 1873 .rc.core = {
1874 .rc_interval = DEFAULT_RC_INTERVAL, 1874 .rc_interval = DEFAULT_RC_INTERVAL,
1875 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1875 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1876 .rc_query = dib0700_rc_query_old_firmware 1876 .rc_query = dib0700_rc_query_old_firmware
1877 }, 1877 },
1878 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1878 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1902,7 +1902,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1902 1902
1903 .rc.core = { 1903 .rc.core = {
1904 .rc_interval = DEFAULT_RC_INTERVAL, 1904 .rc_interval = DEFAULT_RC_INTERVAL,
1905 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1905 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1906 .rc_query = dib0700_rc_query_old_firmware 1906 .rc_query = dib0700_rc_query_old_firmware
1907 }, 1907 },
1908 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1908 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1957,7 +1957,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1957 1957
1958 .rc.core = { 1958 .rc.core = {
1959 .rc_interval = DEFAULT_RC_INTERVAL, 1959 .rc_interval = DEFAULT_RC_INTERVAL,
1960 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1960 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1961 .rc_query = dib0700_rc_query_old_firmware 1961 .rc_query = dib0700_rc_query_old_firmware
1962 }, 1962 },
1963 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1963 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1994,7 +1994,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1994 1994
1995 .rc.core = { 1995 .rc.core = {
1996 .rc_interval = DEFAULT_RC_INTERVAL, 1996 .rc_interval = DEFAULT_RC_INTERVAL,
1997 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1997 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1998 .module_name = "dib0700", 1998 .module_name = "dib0700",
1999 .rc_query = dib0700_rc_query_old_firmware 1999 .rc_query = dib0700_rc_query_old_firmware
2000 }, 2000 },
@@ -2066,7 +2066,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2066 2066
2067 .rc.core = { 2067 .rc.core = {
2068 .rc_interval = DEFAULT_RC_INTERVAL, 2068 .rc_interval = DEFAULT_RC_INTERVAL,
2069 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2069 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2070 .module_name = "dib0700", 2070 .module_name = "dib0700",
2071 .rc_query = dib0700_rc_query_old_firmware 2071 .rc_query = dib0700_rc_query_old_firmware
2072 }, 2072 },
@@ -2106,7 +2106,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2106 2106
2107 .rc.core = { 2107 .rc.core = {
2108 .rc_interval = DEFAULT_RC_INTERVAL, 2108 .rc_interval = DEFAULT_RC_INTERVAL,
2109 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2109 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2110 .module_name = "dib0700", 2110 .module_name = "dib0700",
2111 .rc_query = dib0700_rc_query_old_firmware 2111 .rc_query = dib0700_rc_query_old_firmware
2112 }, 2112 },
@@ -2139,7 +2139,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2139 } 2139 }
2140 }, 2140 },
2141 2141
2142 .num_device_descs = 7, 2142 .num_device_descs = 6,
2143 .devices = { 2143 .devices = {
2144 { "DiBcom STK7070PD reference design", 2144 { "DiBcom STK7070PD reference design",
2145 { &dib0700_usb_id_table[17], NULL }, 2145 { &dib0700_usb_id_table[17], NULL },
@@ -2166,6 +2166,45 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2166 { &dib0700_usb_id_table[44], NULL }, 2166 { &dib0700_usb_id_table[44], NULL },
2167 { NULL }, 2167 { NULL },
2168 }, 2168 },
2169 },
2170
2171 .rc.core = {
2172 .rc_interval = DEFAULT_RC_INTERVAL,
2173 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2174 .module_name = "dib0700",
2175 .rc_query = dib0700_rc_query_old_firmware
2176 },
2177 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
2178
2179 .num_adapters = 2,
2180 .adapter = {
2181 {
2182 .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
2183 .pid_filter_count = 32,
2184 .pid_filter = stk70x0p_pid_filter,
2185 .pid_filter_ctrl = stk70x0p_pid_filter_ctrl,
2186 .frontend_attach = stk7070pd_frontend_attach0,
2187 .tuner_attach = dib7070p_tuner_attach,
2188
2189 DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
2190
2191 .size_of_priv = sizeof(struct dib0700_adapter_state),
2192 }, {
2193 .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
2194 .pid_filter_count = 32,
2195 .pid_filter = stk70x0p_pid_filter,
2196 .pid_filter_ctrl = stk70x0p_pid_filter_ctrl,
2197 .frontend_attach = stk7070pd_frontend_attach1,
2198 .tuner_attach = dib7070p_tuner_attach,
2199
2200 DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
2201
2202 .size_of_priv = sizeof(struct dib0700_adapter_state),
2203 }
2204 },
2205
2206 .num_device_descs = 1,
2207 .devices = {
2169 { "Elgato EyeTV Diversity", 2208 { "Elgato EyeTV Diversity",
2170 { &dib0700_usb_id_table[68], NULL }, 2209 { &dib0700_usb_id_table[68], NULL },
2171 { NULL }, 2210 { NULL },
@@ -2174,7 +2213,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2174 2213
2175 .rc.core = { 2214 .rc.core = {
2176 .rc_interval = DEFAULT_RC_INTERVAL, 2215 .rc_interval = DEFAULT_RC_INTERVAL,
2177 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2216 .rc_codes = RC_MAP_DIB0700_NEC_TABLE,
2178 .module_name = "dib0700", 2217 .module_name = "dib0700",
2179 .rc_query = dib0700_rc_query_old_firmware 2218 .rc_query = dib0700_rc_query_old_firmware
2180 }, 2219 },
@@ -2239,7 +2278,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2239 2278
2240 .rc.core = { 2279 .rc.core = {
2241 .rc_interval = DEFAULT_RC_INTERVAL, 2280 .rc_interval = DEFAULT_RC_INTERVAL,
2242 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2281 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2243 .module_name = "dib0700", 2282 .module_name = "dib0700",
2244 .rc_query = dib0700_rc_query_old_firmware 2283 .rc_query = dib0700_rc_query_old_firmware
2245 }, 2284 },
@@ -2271,7 +2310,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2271 2310
2272 .rc.core = { 2311 .rc.core = {
2273 .rc_interval = DEFAULT_RC_INTERVAL, 2312 .rc_interval = DEFAULT_RC_INTERVAL,
2274 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2313 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2275 .module_name = "dib0700", 2314 .module_name = "dib0700",
2276 .rc_query = dib0700_rc_query_old_firmware 2315 .rc_query = dib0700_rc_query_old_firmware
2277 }, 2316 },
@@ -2335,7 +2374,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2335 2374
2336 .rc.core = { 2375 .rc.core = {
2337 .rc_interval = DEFAULT_RC_INTERVAL, 2376 .rc_interval = DEFAULT_RC_INTERVAL,
2338 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2377 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2339 .module_name = "dib0700", 2378 .module_name = "dib0700",
2340 .rc_query = dib0700_rc_query_old_firmware 2379 .rc_query = dib0700_rc_query_old_firmware
2341 }, 2380 },
@@ -2375,7 +2414,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2375 2414
2376 .rc.core = { 2415 .rc.core = {
2377 .rc_interval = DEFAULT_RC_INTERVAL, 2416 .rc_interval = DEFAULT_RC_INTERVAL,
2378 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2417 .rc_codes = RC_MAP_DIB0700_NEC_TABLE,
2379 .module_name = "dib0700", 2418 .module_name = "dib0700",
2380 .rc_query = dib0700_rc_query_old_firmware 2419 .rc_query = dib0700_rc_query_old_firmware
2381 }, 2420 },
@@ -2420,7 +2459,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2420 2459
2421 .rc.core = { 2460 .rc.core = {
2422 .rc_interval = DEFAULT_RC_INTERVAL, 2461 .rc_interval = DEFAULT_RC_INTERVAL,
2423 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2462 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2424 .module_name = "dib0700", 2463 .module_name = "dib0700",
2425 .rc_query = dib0700_rc_query_old_firmware 2464 .rc_query = dib0700_rc_query_old_firmware
2426 }, 2465 },
@@ -2453,7 +2492,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2453 2492
2454 .rc.core = { 2493 .rc.core = {
2455 .rc_interval = DEFAULT_RC_INTERVAL, 2494 .rc_interval = DEFAULT_RC_INTERVAL,
2456 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2495 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2457 .module_name = "dib0700", 2496 .module_name = "dib0700",
2458 .rc_query = dib0700_rc_query_old_firmware 2497 .rc_query = dib0700_rc_query_old_firmware
2459 }, 2498 },
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-18 06:02:00 -0500