Commit 1a5b4bf2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Linux DVB: conditionally enable DVB-T2

The missing definitions are 3-days old...
parent 422238b7
...@@ -707,7 +707,7 @@ static int dvb_parse_transmit_mode (int i) ...@@ -707,7 +707,7 @@ static int dvb_parse_transmit_mode (int i)
{ {
static const dvb_int_map_t tab[] = { static const dvb_int_map_t tab[] = {
{ -1, TRANSMISSION_MODE_AUTO }, { -1, TRANSMISSION_MODE_AUTO },
#if 0 #if DVBv5(3)
{ 1, TRANSMISSION_MODE_1K }, { 1, TRANSMISSION_MODE_1K },
#endif #endif
{ 2, TRANSMISSION_MODE_2K }, { 2, TRANSMISSION_MODE_2K },
...@@ -715,7 +715,7 @@ static int dvb_parse_transmit_mode (int i) ...@@ -715,7 +715,7 @@ static int dvb_parse_transmit_mode (int i)
{ 4, TRANSMISSION_MODE_4K }, { 4, TRANSMISSION_MODE_4K },
#endif #endif
{ 8, TRANSMISSION_MODE_8K }, { 8, TRANSMISSION_MODE_8K },
#if 0 #if DVBv5(3)
{ 16, TRANSMISSION_MODE_16K }, { 16, TRANSMISSION_MODE_16K },
{ 32, TRANSMISSION_MODE_32K }, { 32, TRANSMISSION_MODE_32K },
#endif #endif
...@@ -731,7 +731,7 @@ static int dvb_parse_guard (uint32_t guard) ...@@ -731,7 +731,7 @@ static int dvb_parse_guard (uint32_t guard)
{ VLC_GUARD(1,8), GUARD_INTERVAL_1_8 }, { VLC_GUARD(1,8), GUARD_INTERVAL_1_8 },
{ VLC_GUARD(1,16), GUARD_INTERVAL_1_16 }, { VLC_GUARD(1,16), GUARD_INTERVAL_1_16 },
{ VLC_GUARD(1,32), GUARD_INTERVAL_1_32 }, { VLC_GUARD(1,32), GUARD_INTERVAL_1_32 },
#if 0 #if DVBv5(3)
{ VLC_GUARD(1,128), GUARD_INTERVAL_1_128 }, { VLC_GUARD(1,128), GUARD_INTERVAL_1_128 },
{ VLC_GUARD(19,128), GUARD_INTERVAL_19_128 }, { VLC_GUARD(19,128), GUARD_INTERVAL_19_128 },
{ VLC_GUARD(19,256), GUARD_INTERVAL_19_256 }, { VLC_GUARD(19,256), GUARD_INTERVAL_19_256 },
...@@ -780,7 +780,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr, ...@@ -780,7 +780,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
uint32_t fec, uint32_t bandwidth, uint32_t fec, uint32_t bandwidth,
int transmit_mode, uint32_t guard) int transmit_mode, uint32_t guard)
{ {
#if 0 #if DVBv5(3)
uint32_t mod = dvb_parse_modulation (modstr, QAM_AUTO); uint32_t mod = dvb_parse_modulation (modstr, QAM_AUTO);
fec = dvb_parse_fec (fec); fec = dvb_parse_fec (fec);
bandwidth *= 1000000; bandwidth *= 1000000;
...@@ -793,6 +793,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr, ...@@ -793,6 +793,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
DTV_TRANSMISSION_MODE, transmit_mode, DTV_TRANSMISSION_MODE, transmit_mode,
DTV_GUARD_INTERVAL, guard); DTV_GUARD_INTERVAL, guard);
#else #else
# warning DVB-T2 needs Linux DVB version 5.3 or later.
msg_Err (d->obj, "DVB-T2 support not compiled-in"); msg_Err (d->obj, "DVB-T2 support not compiled-in");
(void) freq; (void) modstr; (void) fec; (void) bandwidth; (void) freq; (void) modstr; (void) fec; (void) bandwidth;
(void) transmit_mode; (void) guard; (void) transmit_mode; (void) guard;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment