*
* Authors: Damien Lucas <nitrox@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
- * Jean-Paul Saman <jpsaman@wxs.nl>
+ * Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
* Christopher Ross <chris@tebibyte.org>
* Christophe Massiot <massiot@via.ecp.fr>
*
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/input.h>
-
+#include <vlc_access.h>
#include <sys/ioctl.h>
#include <errno.h>
static int FrontendSetQPSK( access_t * );
static int FrontendSetQAM( access_t * );
static int FrontendSetOFDM( access_t * );
+static int FrontendSetATSC( access_t * );
/*****************************************************************************
* FrontendOpen : Determine frontend device information and capabilities
if( b_probe )
{
- char * psz_expected = NULL;
- char * psz_real;
+ const char * psz_expected = NULL;
+ const char * psz_real;
if( FrontendInfo( p_access ) < 0 )
{
case FE_QPSK:
psz_real = "DVB-S";
break;
+ case FE_ATSC:
+ psz_real = "ATSC";
+ break;
default:
psz_real = "unknown";
}
psz_expected = "DVB-T";
}
+ if( (!strncmp( p_access->psz_access, "usdigital", 9 ) ||
+ !strncmp( p_access->psz_access, "atsc", 4 ) ) &&
+ (p_frontend->info.type != FE_ATSC) )
+ {
+ psz_expected = "ATSC";
+ }
+
if( psz_expected != NULL )
{
msg_Err( p_access, "the user asked for %s, and the tuner is %s",
else if( !strncmp( p_access->psz_access, "terrestrial", 11 ) ||
!strncmp( p_access->psz_access, "dvb-t", 5 ) )
p_frontend->info.type = FE_OFDM;
+ else if( !strncmp( p_access->psz_access, "usdigital", 9 ) ||
+ !strncmp( p_access->psz_access, "atsc", 4 ) )
+ p_frontend->info.type = FE_ATSC;
}
return VLC_SUCCESS;
}
break;
+ /* ATSC */
+ case FE_ATSC:
+ if( FrontendSetATSC( p_access ) < 0 )
+ {
+ msg_Err( p_access, "ATSC: tuning failed" );
+ return VLC_EGENERIC;
+ }
+ break;
+
default:
msg_Err( p_access, "Could not determine frontend type on %s",
p_sys->p_frontend->info.name );
IF_UP( FE_HAS_LOCK )
{
- int32_t i_value;
+ int32_t i_value = 0;
msg_Dbg( p_access, "frontend has acquired lock" );
p_sys->i_frontend_timeout = 0;
CHECK_CAPS( CAN_HIERARCHY_AUTO );
CHECK_CAPS( CAN_MUTE_TS );
CHECK_CAPS( CAN_RECOVER );
+#if 0 /* Disabled because of older distributions */
CHECK_CAPS( CAN_CLEAN_SETUP );
+#endif
#undef CHECK_CAPS
p += sprintf( p, "</table><p>Current frontend status:\n<table border=1>" );
CHECK_STATUS( HAS_SYNC );
CHECK_STATUS( HAS_LOCK );
CHECK_STATUS( REINIT );
+ if( i_status == 0 )
+ p += sprintf( p, "<tr><td>Tuning failed</td></tr>\n" );
#undef CHECK_STATUS
if ( i_status & FE_HAS_LOCK )
case FE_OFDM:
msg_Dbg( p_access, " type = OFDM (DVB-T)" );
break;
+ case FE_ATSC:
+ msg_Dbg( p_access, " type = ATSC (USA)" );
+ break;
#if 0 /* DVB_API_VERSION == 3 */
case FE_MEMORY:
msg_Dbg(p_access, " type = MEMORY" );
msg_Dbg(p_access, " card can mute TS");
if( p_frontend->info.caps & FE_CAN_RECOVER)
msg_Dbg(p_access, " card can recover from a cable unplug");
+ if( p_frontend->info.caps & FE_CAN_8VSB)
+ msg_Dbg(p_access, " card can do 8vsb");
+ if( p_frontend->info.caps & FE_CAN_16VSB)
+ msg_Dbg(p_access, " card can do 16vsb");
msg_Dbg(p_access, "End of capability list");
return VLC_SUCCESS;
return fe_fec;
}
-static fe_modulation_t DecodeModulation( access_t *p_access )
+static fe_modulation_t DecodeModulationQAM( access_t *p_access )
{
- vlc_value_t val;
- fe_modulation_t fe_modulation = 0;
-
- var_Get( p_access, "dvb-modulation", &val );
-
- switch( val.i_int )
+ switch( var_GetInteger( p_access, "dvb-modulation" ) )
{
- case -1: fe_modulation = QPSK; break;
- case 0: fe_modulation = QAM_AUTO; break;
- case 16: fe_modulation = QAM_16; break;
- case 32: fe_modulation = QAM_32; break;
- case 64: fe_modulation = QAM_64; break;
- case 128: fe_modulation = QAM_128; break;
- case 256: fe_modulation = QAM_256; break;
+ case 0: return QAM_AUTO;
+ case 16: return QAM_16;
+ case 32: return QAM_32;
+ case 64: return QAM_64;
+ case 128: return QAM_128;
+ case 256: return QAM_256;
default:
- msg_Dbg( p_access, "terrestrial/cable dvb has constellation/modulation not set, using auto");
- fe_modulation = QAM_AUTO;
- break;
+ msg_Dbg( p_access, "QAM modulation not set, using auto");
+ return QAM_AUTO;
+ }
+}
+static fe_modulation_t DecodeModulationOFDM( access_t *p_access )
+{
+ switch( var_GetInteger( p_access, "dvb-modulation" ) )
+ {
+ case -1: return QPSK;
+ case 0: return QAM_AUTO;
+ case 16: return QAM_16;
+ case 32: return QAM_32;
+ case 64: return QAM_64;
+ case 128: return QAM_128;
+ case 256: return QAM_256;
+ default:
+ msg_Dbg( p_access, "OFDM modulation not set, using QAM auto");
+ return QAM_AUTO;
+ }
+}
+static fe_modulation_t DecodeModulationATSC( access_t *p_access )
+{
+ switch( var_GetInteger( p_access, "dvb-modulation" ) )
+ {
+ case 8: return VSB_8;
+ case 16: return VSB_16;
+ default:
+ msg_Dbg( p_access, "ATSC modulation not set, using VSB 8");
+ return VSB_8;
}
- return fe_modulation;
}
/*****************************************************************************
var_Get( p_access, "dvb-fec", &val );
fep.u.qam.fec_inner = DecodeFEC( p_access, val.i_int );
- fep.u.qam.modulation = DecodeModulation( p_access );
+ fep.u.qam.modulation = DecodeModulationQAM( p_access );
/* Empty the event queue */
for( ; ; )
fep.u.ofdm.code_rate_HP = DecodeFEC( p_access, val.i_int );
var_Get( p_access, "dvb-code-rate-lp", &val );
fep.u.ofdm.code_rate_LP = DecodeFEC( p_access, val.i_int );
- fep.u.ofdm.constellation = DecodeModulation( p_access );
+ fep.u.ofdm.constellation = DecodeModulationOFDM( p_access );
fep.u.ofdm.transmission_mode = DecodeTransmission( p_access );
fep.u.ofdm.guard_interval = DecodeGuardInterval( p_access );
fep.u.ofdm.hierarchy_information = DecodeHierarchy( p_access );
return VLC_SUCCESS;
}
+/*****************************************************************************
+ * FrontendSetATSC : controls the FE device
+ *****************************************************************************/
+static int FrontendSetATSC( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ struct dvb_frontend_parameters fep;
+ vlc_value_t val;
+ int i_ret;
+
+ /* Prepare the fep structure */
+
+ var_Get( p_access, "dvb-frequency", &val );
+ fep.frequency = val.i_int;
+
+ fep.u.vsb.modulation = DecodeModulationATSC( p_access );
+
+ /* Empty the event queue */
+ for( ; ; )
+ {
+ struct dvb_frontend_event event;
+ if ( ioctl( p_sys->i_frontend_handle, FE_GET_EVENT, &event ) < 0
+ && errno == EWOULDBLOCK )
+ break;
+ }
+
+ /* Now send it all to the frontend device */
+ if( (i_ret = ioctl( p_sys->i_frontend_handle, FE_SET_FRONTEND, &fep )) < 0 )
+ {
+ msg_Err( p_access, "ATSC: setting frontend failed (%d) %s", i_ret,
+ strerror(errno) );
+ return VLC_EGENERIC;
+ }
+
+ return VLC_SUCCESS;
+}
+
/*
* Demux
}
/* Output CA capabilities */
- msg_Dbg( p_access, "CAMInit: CA interface with %d %s", caps.slot_num,
+ msg_Dbg( p_access, "CAMInit: CA interface with %d %s", caps.slot_num,
caps.slot_num == 1 ? "slot" : "slots" );
if ( caps.slot_type & CA_CI )
msg_Dbg( p_access, "CAMInit: CI high level interface type" );
return VLC_EGENERIC;
}
- p_sys->i_ca_type = caps.slot_type;
- if ( !(caps.slot_type & CA_CI_LINK) &&
- !(caps.slot_type & CA_CI) )
+ if( caps.slot_type & CA_CI_LINK )
{
+ p_sys->i_ca_type = CA_CI_LINK;
+ }
+ else if( caps.slot_type & CA_CI )
+ {
+ p_sys->i_ca_type = CA_CI;
+ }
+ else {
+ p_sys->i_ca_type = -1;
msg_Err( p_access, "CAMInit: incompatible CAM interface" );
close( p_sys->i_ca_handle );
p_sys->i_ca_handle = 0;
p_sys->i_nb_slots = caps.slot_num;
memset( p_sys->pb_active_slot, 0, sizeof(vlc_bool_t) * MAX_CI_SLOTS );
+ memset( p_sys->pb_slot_mmi_expected, 0, sizeof(vlc_bool_t) * MAX_CI_SLOTS );
+ memset( p_sys->pb_slot_mmi_undisplayed, 0,
+ sizeof(vlc_bool_t) * MAX_CI_SLOTS );
return E_(en50221_Init)( p_access );
}
#define CHECK_TYPE( x, s ) \
if ( sinfo.type & (CA_##x) ) \
- p += sprintf( p, s );
+ p += sprintf( p, "%s", s );
CHECK_TYPE( CI, "high level, " );
CHECK_TYPE( CI_LINK, "link layer level, " );
{
access_sys_t *p_sys = p_access->p_sys;
- if ( p_sys->i_ca_handle == 0 )
+ if( p_sys->i_ca_handle == 0 )
{
+ dvbpsi_DeletePMT( p_pmt );
return VLC_EGENERIC;
}
projects / vlc / blobdiff