/*****************************************************************************
* linux_dvb.c : functions to control a DVB card under Linux with v4l2
*****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2005 the VideoLAN team
*
* 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>
*
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <vlc_common.h>
+#include <vlc_access.h>
#include <sys/ioctl.h>
#include <errno.h>
# include <dvbpsi/pmt.h>
# include <dvbpsi/dr.h>
# include <dvbpsi/psi.h>
+# include <dvbpsi/demux.h>
+# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
+# include "demux.h"
+# include "tables/sdt.h"
+#endif
+
+#ifdef ENABLE_HTTPD
+# include <vlc_httpd.h>
#endif
#include "dvb.h"
#define FRONTEND_LOCK_TIMEOUT 10000000 /* 10 s */
-#define RESET_CAM_SLOTS 1 /* Do we want to reset cam upon opening */
-
/* Local prototypes */
static int FrontendInfo( access_t * );
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
*****************************************************************************/
-int E_(FrontendOpen)( access_t *p_access )
+int FrontendOpen( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
frontend_t * p_frontend;
unsigned int i_adapter, i_device;
- vlc_bool_t b_probe;
+ bool b_probe;
char frontend[128];
i_adapter = var_GetInteger( p_access, "dvb-adapter" );
}
p_sys->p_frontend = p_frontend = malloc( sizeof(frontend_t) );
+ if( !p_frontend )
+ return VLC_ENOMEM;
msg_Dbg( p_access, "Opening device %s", frontend );
- if( (p_sys->i_frontend_handle = open(frontend, O_RDWR | O_NONBLOCK)) < 0 )
+ if( (p_sys->i_frontend_handle = utf8_open(frontend, O_RDWR | O_NONBLOCK)) < 0 )
{
- msg_Err( p_access, "FrontEndOpen: opening device failed (%s)",
- strerror(errno) );
+ msg_Err( p_access, "FrontEndOpen: opening device failed (%m)" );
free( p_frontend );
return VLC_EGENERIC;
}
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;
/*****************************************************************************
* FrontendClose : Close the frontend
*****************************************************************************/
-void E_(FrontendClose)( access_t *p_access )
+void FrontendClose( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
/*****************************************************************************
* FrontendSet : Tune !
*****************************************************************************/
-int E_(FrontendSet)( access_t *p_access )
+int FrontendSet( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
}
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 );
/*****************************************************************************
* FrontendPoll : Poll for frontend events
*****************************************************************************/
-void E_(FrontendPoll)( access_t *p_access )
+void FrontendPoll( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
frontend_t * p_frontend = p_sys->p_frontend;
if( i_ret < 0 )
{
if( errno == EWOULDBLOCK )
- return;
+ return; /* no more events */
- msg_Err( p_access, "reading frontend status failed (%d) %s",
- i_ret, strerror(errno) );
- continue;
+ msg_Err( p_access, "reading frontend event failed (%d): %m",
+ i_ret );
+ return;
}
i_status = event.status;
i_diff = i_status ^ p_frontend->i_last_status;
p_frontend->i_last_status = i_status;
+ {
#define IF_UP( x ) \
- } \
- if ( i_diff & (x) ) \
- { \
- if ( i_status & (x) )
+ } \
+ if ( i_diff & (x) ) \
+ { \
+ if ( i_status & (x) )
- {
IF_UP( FE_HAS_SIGNAL )
msg_Dbg( p_access, "frontend has acquired signal" );
else
IF_UP( FE_HAS_LOCK )
{
- int32_t i_value;
+ frontend_statistic_t stat;
+
msg_Dbg( p_access, "frontend has acquired lock" );
p_sys->i_frontend_timeout = 0;
/* Read some statistics */
- if( ioctl( p_sys->i_frontend_handle, FE_READ_BER, &i_value ) >= 0 )
- msg_Dbg( p_access, "- Bit error rate: %d", i_value );
- if( ioctl( p_sys->i_frontend_handle, FE_READ_SIGNAL_STRENGTH, &i_value ) >= 0 )
- msg_Dbg( p_access, "- Signal strength: %d", i_value );
- if( ioctl( p_sys->i_frontend_handle, FE_READ_SNR, &i_value ) >= 0 )
- msg_Dbg( p_access, "- SNR: %d", i_value );
+ if( !FrontendGetStatistic( p_access, &stat ) )
+ {
+ if( stat.i_ber >= 0 )
+ msg_Dbg( p_access, "- Bit error rate: %d", stat.i_ber );
+ if( stat.i_signal_strenth >= 0 )
+ msg_Dbg( p_access, "- Signal strength: %d", stat.i_signal_strenth );
+ if( stat.i_snr >= 0 )
+ msg_Dbg( p_access, "- SNR: %d", stat.i_snr );
+ }
}
else
{
{
/* The frontend was reinited. */
msg_Warn( p_access, "reiniting frontend");
- E_(FrontendSet)( p_access );
+ FrontendSet( p_access );
}
}
+#undef IF_UP
}
}
+int FrontendGetStatistic( access_t *p_access, frontend_statistic_t *p_stat )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ frontend_t * p_frontend = p_sys->p_frontend;
+
+ if( (p_frontend->i_last_status & FE_HAS_LOCK) == 0 )
+ return VLC_EGENERIC;
+
+ memset( p_stat, 0, sizeof(*p_stat) );
+ if( ioctl( p_sys->i_frontend_handle, FE_READ_BER, &p_stat->i_ber ) < 0 )
+ p_stat->i_ber = -1;
+ if( ioctl( p_sys->i_frontend_handle, FE_READ_SIGNAL_STRENGTH, &p_stat->i_signal_strenth ) < 0 )
+ p_stat->i_signal_strenth = -1;
+ if( ioctl( p_sys->i_frontend_handle, FE_READ_SNR, &p_stat->i_snr ) < 0 )
+ p_stat->i_snr = -1;
+
+ return VLC_SUCCESS;
+}
+void FrontendGetStatus( access_t *p_access, frontend_status_t *p_status )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ frontend_t * p_frontend = p_sys->p_frontend;
+
+ p_status->b_has_signal = (p_frontend->i_last_status & FE_HAS_SIGNAL) != 0;
+ p_status->b_has_carrier = (p_frontend->i_last_status & FE_HAS_CARRIER) != 0;
+ p_status->b_has_lock = (p_frontend->i_last_status & FE_HAS_LOCK) != 0;
+}
+static int ScanParametersDvbC( access_t *p_access, scan_parameter_t *p_scan )
+{
+ const frontend_t *p_frontend = p_access->p_sys->p_frontend;
+
+
+ memset( p_scan, 0, sizeof(*p_scan) );
+ p_scan->type = SCAN_DVB_C;
+ p_scan->b_exhaustive = false;
+
+ /* */
+ p_scan->frequency.i_min = p_frontend->info.frequency_min;
+ p_scan->frequency.i_max = p_frontend->info.frequency_max;
+ p_scan->frequency.i_step = p_frontend->info.frequency_stepsize
+ ? p_frontend->info.frequency_stepsize : 166667;
+ p_scan->frequency.i_count = (p_scan->frequency.i_max-p_scan->frequency.i_min)/p_scan->frequency.i_step;
+
+ /* */
+ p_scan->bandwidth.i_min = 6;
+ p_scan->bandwidth.i_max = 8;
+ p_scan->bandwidth.i_step = 1;
+ p_scan->bandwidth.i_count = 3;
+ return VLC_SUCCESS;
+}
+static int ScanParametersDvbT( access_t *p_access, scan_parameter_t *p_scan )
+{
+ const frontend_t *p_frontend = p_access->p_sys->p_frontend;
+
+
+ memset( p_scan, 0, sizeof(*p_scan) );
+ p_scan->type = SCAN_DVB_T;
+ p_scan->b_exhaustive = false;
+
+ /* */
+ p_scan->frequency.i_min = p_frontend->info.frequency_min;
+ p_scan->frequency.i_max = p_frontend->info.frequency_max;
+ p_scan->frequency.i_step = p_frontend->info.frequency_stepsize
+ ? p_frontend->info.frequency_stepsize : 166667;
+ p_scan->frequency.i_count = (p_scan->frequency.i_max-p_scan->frequency.i_min)/p_scan->frequency.i_step;
+
+ /* */
+ p_scan->bandwidth.i_min = 6;
+ p_scan->bandwidth.i_max = 8;
+ p_scan->bandwidth.i_step = 1;
+ p_scan->bandwidth.i_count = 3;
+ return VLC_SUCCESS;
+}
+int FrontendGetScanParameter( access_t *p_access, scan_parameter_t *p_scan )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ const frontend_t *p_frontend = p_sys->p_frontend;
+
+ if( p_frontend->info.type == FE_OFDM ) // DVB-T
+ return ScanParametersDvbT( p_access, p_scan );
+ else if( p_frontend->info.type == FE_QAM ) // DVB-C
+ return ScanParametersDvbC( p_access, p_scan );
+
+ msg_Err( p_access, "Frontend type not supported for scanning" );
+ return VLC_EGENERIC;
+}
+
+#ifdef ENABLE_HTTPD
+/*****************************************************************************
+ * FrontendStatus : Read frontend status
+ *****************************************************************************/
+void FrontendStatus( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ frontend_t *p_frontend = p_sys->p_frontend;
+ char *p = p_sys->psz_frontend_info = malloc( 10000 );
+ fe_status_t i_status;
+ int i_ret;
+
+ /* Determine type of frontend */
+ if( (i_ret = ioctl( p_sys->i_frontend_handle, FE_GET_INFO,
+ &p_frontend->info )) < 0 )
+ {
+ char buf[1000];
+ strerror_r( errno, buf, sizeof( buf ) );
+ p += sprintf( p, "ioctl FE_GET_INFO failed (%d) %s\n", i_ret, buf );
+ goto out;
+ }
+
+ /* Print out frontend capabilities. */
+ p += sprintf( p, "<table border=1><tr><th>name</th><td>%s</td></tr>\n",
+ p_frontend->info.name );
+ switch( p_frontend->info.type )
+ {
+ case FE_QPSK:
+ p += sprintf( p, "<tr><th>type</th><td>QPSK (DVB-S)</td></tr>\n" );
+ break;
+ case FE_QAM:
+ p += sprintf( p, "<tr><th>type</th><td>QAM (DVB-C)</td></tr>\n" );
+ break;
+ case FE_OFDM:
+ p += sprintf( p, "<tr><th>type</th><td>OFDM (DVB-T)</td></tr>\n" );
+ break;
+#if 0 /* DVB_API_VERSION == 3 */
+ case FE_MEMORY:
+ p += sprintf( p, "<tr><th>type</th><td>MEMORY</td></tr>\n" );
+ break;
+ case FE_NET:
+ p += sprintf( p, "<tr><th>type</th><td>NETWORK</td></tr>\n" );
+ break;
+#endif
+ default:
+ p += sprintf( p, "<tr><th>type</th><td>UNKNOWN (%d)</td></tr>\n",
+ p_frontend->info.type );
+ goto out;
+ }
+#define CHECK_INFO( x ) \
+ p += sprintf( p, \
+ "<tr><th>" STRINGIFY(x) "</th><td>%u</td></tr>\n", \
+ p_frontend->info.x );
+
+ CHECK_INFO( frequency_min );
+ CHECK_INFO( frequency_max );
+ CHECK_INFO( frequency_stepsize );
+ CHECK_INFO( frequency_tolerance );
+ CHECK_INFO( symbol_rate_min );
+ CHECK_INFO( symbol_rate_max );
+ CHECK_INFO( symbol_rate_tolerance );
+ CHECK_INFO( notifier_delay );
+#undef CHECK_INFO
+
+ p += sprintf( p, "</table><p>Frontend capability list:\n<table border=1>" );
+
+#define CHECK_CAPS( x ) \
+ if ( p_frontend->info.caps & (FE_##x) ) \
+ p += sprintf( p, "<tr><td>" STRINGIFY(x) "</td></tr>\n" );
+
+ CHECK_CAPS( IS_STUPID );
+ CHECK_CAPS( CAN_INVERSION_AUTO );
+ CHECK_CAPS( CAN_FEC_1_2 );
+ CHECK_CAPS( CAN_FEC_2_3 );
+ CHECK_CAPS( CAN_FEC_3_4 );
+ CHECK_CAPS( CAN_FEC_4_5 );
+ CHECK_CAPS( CAN_FEC_5_6 );
+ CHECK_CAPS( CAN_FEC_6_7 );
+ CHECK_CAPS( CAN_FEC_7_8 );
+ CHECK_CAPS( CAN_FEC_8_9 );
+ CHECK_CAPS( CAN_FEC_AUTO );
+ CHECK_CAPS( CAN_QPSK );
+ CHECK_CAPS( CAN_QAM_16 );
+ CHECK_CAPS( CAN_QAM_32 );
+ CHECK_CAPS( CAN_QAM_64 );
+ CHECK_CAPS( CAN_QAM_128 );
+ CHECK_CAPS( CAN_QAM_256 );
+ CHECK_CAPS( CAN_QAM_AUTO );
+ CHECK_CAPS( CAN_TRANSMISSION_MODE_AUTO );
+ CHECK_CAPS( CAN_BANDWIDTH_AUTO );
+ CHECK_CAPS( CAN_GUARD_INTERVAL_AUTO );
+ 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>" );
+
+ if( (i_ret = ioctl( p_sys->i_frontend_handle, FE_READ_STATUS, &i_status ))
+ < 0 )
+ {
+ char buf[1000];
+ strerror_r( errno, buf, sizeof( buf ) );
+ p += sprintf( p, "</table>ioctl FE_READ_STATUS failed (%d) %s\n",
+ i_ret, buf );
+ goto out;
+ }
+
+#define CHECK_STATUS( x ) \
+ if ( i_status & (FE_##x) ) \
+ p += sprintf( p, "<tr><td>" STRINGIFY(x) "</td></tr>\n" );
+
+ CHECK_STATUS( HAS_SIGNAL );
+ CHECK_STATUS( HAS_CARRIER );
+ CHECK_STATUS( HAS_VITERBI );
+ 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 )
+ {
+ int32_t i_value;
+ p += sprintf( p, "</table><p>Signal status:\n<table border=1>" );
+ if( ioctl( p_sys->i_frontend_handle, FE_READ_BER, &i_value ) >= 0 )
+ p += sprintf( p, "<tr><th>Bit error rate</th><td>%d</td></tr>\n",
+ i_value );
+ if( ioctl( p_sys->i_frontend_handle, FE_READ_SIGNAL_STRENGTH,
+ &i_value ) >= 0 )
+ p += sprintf( p, "<tr><th>Signal strength</th><td>%d</td></tr>\n",
+ i_value );
+ if( ioctl( p_sys->i_frontend_handle, FE_READ_SNR, &i_value ) >= 0 )
+ p += sprintf( p, "<tr><th>SNR</th><td>%d</td></tr>\n",
+ i_value );
+ }
+ p += sprintf( p, "</table>" );
+
+out:
+ vlc_mutex_lock( &p_sys->httpd_mutex );
+ p_sys->b_request_frontend_info = false;
+ vlc_cond_signal( &p_sys->httpd_cond );
+ vlc_mutex_unlock( &p_sys->httpd_mutex );
+}
+#endif
+
/*****************************************************************************
* FrontendInfo : Return information about given frontend
*****************************************************************************/
if( (i_ret = ioctl( p_sys->i_frontend_handle, FE_GET_INFO,
&p_frontend->info )) < 0 )
{
- msg_Err( p_access, "ioctl FE_GET_INFO failed (%d) %s", i_ret,
- strerror(errno) );
+ msg_Err( p_access, "ioctl FE_GET_INFO failed (%d): %m", i_ret );
return VLC_EGENERIC;
}
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;
*****************************************************************************/
static fe_spectral_inversion_t DecodeInversion( access_t *p_access )
{
- vlc_value_t val;
+ int i_val;
fe_spectral_inversion_t fe_inversion = 0;
- var_Get( p_access, "dvb-inversion", &val );
- msg_Dbg( p_access, "using inversion=%d", val.i_int );
+ i_val = var_GetInteger( p_access, "dvb-inversion" );
+ msg_Dbg( p_access, "using inversion=%d", i_val );
- switch( val.i_int )
+ switch( i_val )
{
case 0: fe_inversion = INVERSION_OFF; break;
case 1: fe_inversion = INVERSION_ON; break;
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 0: return QAM_AUTO;
+ case 8: return VSB_8;
+ case 16: return VSB_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, "ATSC modulation not set, using VSB 8");
+ return VSB_8;
}
- return fe_modulation;
}
/*****************************************************************************
*****************************************************************************/
static fe_sec_voltage_t DecodeVoltage( access_t *p_access )
{
- vlc_value_t val;
+ int i_val;
fe_sec_voltage_t fe_voltage;
- var_Get( p_access, "dvb-voltage", &val );
- msg_Dbg( p_access, "using voltage=%d", val.i_int );
+ i_val = var_GetInteger( p_access, "dvb-voltage" );
+ msg_Dbg( p_access, "using voltage=%d", i_val );
- switch( val.i_int )
+ switch( i_val )
{
case 0: fe_voltage = SEC_VOLTAGE_OFF; break;
case 13: fe_voltage = SEC_VOLTAGE_13; break;
case 18: fe_voltage = SEC_VOLTAGE_18; break;
default:
fe_voltage = SEC_VOLTAGE_OFF;
- msg_Err( p_access, "argument has invalid voltage (%d)", val.i_int );
+ msg_Err( p_access, "argument has invalid voltage (%d)", i_val );
break;
}
return fe_voltage;
static fe_sec_tone_mode_t DecodeTone( access_t *p_access )
{
- vlc_value_t val;
+ int i_val;
fe_sec_tone_mode_t fe_tone;
- var_Get( p_access, "dvb-tone", &val );
- msg_Dbg( p_access, "using tone=%d", val.i_int );
+ i_val = var_GetInteger( p_access, "dvb-tone" );
+ msg_Dbg( p_access, "using tone=%d", i_val );
- switch( val.i_int )
+ switch( i_val )
{
case 0: fe_tone = SEC_TONE_OFF; break;
case 1: fe_tone = SEC_TONE_ON; break;
default:
fe_tone = SEC_TONE_OFF;
- msg_Err( p_access, "argument has invalid tone mode (%d)", val.i_int);
+ msg_Err( p_access, "argument has invalid tone mode (%d)", i_val );
break;
}
return fe_tone;
static int DoDiseqc( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
- vlc_value_t val;
+ int i_val;
+ bool b_val;
int i_frequency, i_lnb_slof;
fe_sec_voltage_t fe_voltage;
fe_sec_tone_mode_t fe_tone;
int i_err;
- var_Get( p_access, "dvb-frequency", &val );
- i_frequency = val.i_int;
- var_Get( p_access, "dvb-lnb-slof", &val );
- i_lnb_slof = val.i_int;
+ i_frequency = var_GetInteger( p_access, "dvb-frequency" );
+ i_lnb_slof = var_GetInteger( p_access, "dvb-lnb-slof" );
- var_Get( p_access, "dvb-tone", &val );
- if( val.i_int == -1 /* auto */ )
+ i_val = var_GetInteger( p_access, "dvb-tone" );
+ if( i_val == -1 /* auto */ )
{
if( i_frequency >= i_lnb_slof )
- val.i_int = 1;
+ i_val = 1;
else
- val.i_int = 0;
- var_Set( p_access, "dvb-tone", val );
+ i_val = 0;
+ var_SetInteger( p_access, "dvb-tone", i_val );
}
fe_voltage = DecodeVoltage( p_access );
/* Switch off continuous tone. */
if( (i_err = ioctl( p_sys->i_frontend_handle, FE_SET_TONE, SEC_TONE_OFF )) < 0 )
{
- msg_Err( p_access, "ioctl FE_SET_TONE failed, tone=%s (%d) %s",
- fe_tone == SEC_TONE_ON ? "on" : "off", i_err,
- strerror(errno) );
+ msg_Err( p_access, "ioctl FE_SET_TONE failed, tone=%s (%d) %m",
+ fe_tone == SEC_TONE_ON ? "on" : "off", i_err );
return i_err;
}
/* Configure LNB voltage. */
if( (i_err = ioctl( p_sys->i_frontend_handle, FE_SET_VOLTAGE, fe_voltage )) < 0 )
{
- msg_Err( p_access, "ioctl FE_SET_VOLTAGE failed, voltage=%d (%d) %s",
- fe_voltage, i_err, strerror(errno) );
+ msg_Err( p_access, "ioctl FE_SET_VOLTAGE failed, voltage=%d (%d) %m",
+ fe_voltage, i_err );
return i_err;
}
- var_Get( p_access, "dvb-high-voltage", &val );
+ b_val = var_GetBool( p_access, "dvb-high-voltage" );
if( (i_err = ioctl( p_sys->i_frontend_handle, FE_ENABLE_HIGH_LNB_VOLTAGE,
- val.b_bool )) < 0 && val.b_bool )
+ b_val )) < 0 && b_val )
{
msg_Err( p_access,
- "ioctl FE_ENABLE_HIGH_LNB_VOLTAGE failed, val=%d (%d) %s",
- val.b_bool, i_err, strerror(errno) );
+ "ioctl FE_ENABLE_HIGH_LNB_VOLTAGE failed, val=%d (%d) %m",
+ b_val, i_err );
}
/* Wait for at least 15 ms. */
msleep(15000);
- var_Get( p_access, "dvb-satno", &val );
- if( val.i_int > 0 && val.i_int < 5 )
+ i_val = var_GetInteger( p_access, "dvb-satno" );
+ if( i_val > 0 && i_val < 5 )
{
/* digital satellite equipment control,
* specification is available from http://www.eutelsat.com/
* bits are: option, position, polarization, band
*/
cmd.cmd.msg[3] = 0xf0 /* reset bits */
- | (((val.i_int - 1) * 4) & 0xc)
+ | (((i_val - 1) * 4) & 0xc)
| (fe_voltage == SEC_VOLTAGE_13 ? 0 : 2)
| (fe_tone == SEC_TONE_ON ? 1 : 0);
if( (i_err = ioctl( p_sys->i_frontend_handle, FE_DISEQC_SEND_MASTER_CMD,
&cmd.cmd )) < 0 )
{
- msg_Err( p_access, "ioctl FE_SEND_MASTER_CMD failed (%d) %s",
- i_err, strerror(errno) );
+ msg_Err( p_access, "ioctl FE_SEND_MASTER_CMD failed (%d) %m",
+ i_err );
return i_err;
}
/* A or B simple diseqc ("diseqc-compatible") */
if( (i_err = ioctl( p_sys->i_frontend_handle, FE_DISEQC_SEND_BURST,
- ((val.i_int - 1) % 2) ? SEC_MINI_B : SEC_MINI_A )) < 0 )
+ ((i_val - 1) % 2) ? SEC_MINI_B : SEC_MINI_A )) < 0 )
{
- msg_Err( p_access, "ioctl FE_SEND_BURST failed (%d) %s",
- i_err, strerror(errno) );
+ msg_Err( p_access, "ioctl FE_SEND_BURST failed (%d) %m",
+ i_err );
return i_err;
}
if( (i_err = ioctl( p_sys->i_frontend_handle, FE_SET_TONE, fe_tone )) < 0 )
{
- msg_Err( p_access, "ioctl FE_SET_TONE failed, tone=%s (%d) %s",
- fe_tone == SEC_TONE_ON ? "on" : "off", i_err,
- strerror(errno) );
+ msg_Err( p_access, "ioctl FE_SET_TONE failed, tone=%s (%d) %m",
+ fe_tone == SEC_TONE_ON ? "on" : "off", i_err );
return i_err;
}
access_sys_t *p_sys = p_access->p_sys;
struct dvb_frontend_parameters fep;
int i_ret;
- vlc_value_t val;
+ int i_val;
int i_frequency, i_lnb_slof = 0, i_lnb_lof1, i_lnb_lof2 = 0;
/* Prepare the fep structure */
- var_Get( p_access, "dvb-frequency", &val );
- i_frequency = val.i_int;
+ i_frequency = var_GetInteger( p_access, "dvb-frequency" );
- var_Get( p_access, "dvb-lnb-lof1", &val );
- if ( val.i_int == 0 )
+ i_val = var_GetInteger( p_access, "dvb-lnb-lof1" );
+ if( i_val == 0 )
{
/* Automatic mode. */
if ( i_frequency >= 950000 && i_frequency <= 2150000 )
"oscillator frequency" );
return VLC_EGENERIC;
}
- val.i_int = i_lnb_lof1;
- var_Set( p_access, "dvb-lnb-lof1", val );
- val.i_int = i_lnb_lof2;
- var_Set( p_access, "dvb-lnb-lof2", val );
- val.i_int = i_lnb_slof;
- var_Set( p_access, "dvb-lnb-slof", val );
+ var_SetInteger( p_access, "dvb-lnb-lof1", i_lnb_lof1 );
+ var_SetInteger( p_access, "dvb-lnb-lof2", i_lnb_lof2 );
+ var_SetInteger( p_access, "dvb-lnb-slof", i_lnb_slof );
}
else
{
- i_lnb_lof1 = val.i_int;
- var_Get( p_access, "dvb-lnb-lof2", &val );
- i_lnb_lof2 = val.i_int;
- var_Get( p_access, "dvb-lnb-slof", &val );
- i_lnb_slof = val.i_int;
+ i_lnb_lof1 = i_val;
+ i_lnb_lof2 = var_GetInteger( p_access, "dvb-lnb-lof2" );
+ i_lnb_slof = var_GetInteger( p_access, "dvb-lnb-slof" );
}
if( i_lnb_slof && i_frequency >= i_lnb_slof )
fep.inversion = DecodeInversion( p_access );
- var_Get( p_access, "dvb-srate", &val );
- fep.u.qpsk.symbol_rate = val.i_int;
+ fep.u.qpsk.symbol_rate = var_GetInteger( p_access, "dvb-srate" );
- var_Get( p_access, "dvb-fec", &val );
- fep.u.qpsk.fec_inner = DecodeFEC( p_access, val.i_int );
+ fep.u.qpsk.fec_inner = DecodeFEC( p_access, var_GetInteger( p_access, "dvb-fec" ) );
if( DoDiseqc( p_access ) < 0 )
{
/* 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, "DVB-S: setting frontend failed (%d) %s", i_ret,
- strerror(errno) );
+ msg_Err( p_access, "DVB-S: setting frontend failed (%d) %m", i_ret );
return VLC_EGENERIC;
}
static int FrontendSetQAM( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
+ frontend_t *p_frontend = p_sys->p_frontend;
struct dvb_frontend_parameters fep;
- vlc_value_t val;
+ int i_val;
int i_ret;
/* Prepare the fep structure */
- var_Get( p_access, "dvb-frequency", &val );
- fep.frequency = val.i_int;
+ fep.frequency = var_GetInteger( p_access, "dvb-frequency" );
fep.inversion = DecodeInversion( p_access );
- var_Get( p_access, "dvb-srate", &val );
- fep.u.qam.symbol_rate = val.i_int;
+ /* Default symbol-rate is for dvb-s, and doesn't fit
+ * for dvb-c, so if it's over the limit of frontend, default to
+ * somewhat common value
+ */
+ i_val = var_GetInteger( p_access, "dvb-srate" );
+ if( i_val < p_frontend->info.symbol_rate_max &&
+ i_val > p_frontend->info.symbol_rate_min )
+ fep.u.qam.symbol_rate = i_val;
+ else
+ fep.u.qam.symbol_rate = 6875000;
- var_Get( p_access, "dvb-fec", &val );
- fep.u.qam.fec_inner = DecodeFEC( p_access, val.i_int );
+ fep.u.qam.fec_inner = DecodeFEC( p_access, var_GetInteger( p_access,
+ "dvb-fec" ) );
- fep.u.qam.modulation = DecodeModulation( p_access );
+ fep.u.qam.modulation = DecodeModulationQAM( p_access );
/* Empty the event queue */
for( ; ; )
/* 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, "DVB-C: setting frontend failed (%d) %s", i_ret,
- strerror(errno) );
+ msg_Err( p_access, "DVB-C: setting frontend failed (%d): %m", i_ret );
return VLC_EGENERIC;
}
*****************************************************************************/
static fe_bandwidth_t DecodeBandwidth( access_t *p_access )
{
- vlc_value_t val;
fe_bandwidth_t fe_bandwidth = 0;
+ int i_bandwith = var_GetInteger( p_access, "dvb-bandwidth" );
- var_Get( p_access, "dvb-bandwidth", &val );
- msg_Dbg( p_access, "using bandwidth=%d", val.i_int );
+ msg_Dbg( p_access, "using bandwidth=%d", i_bandwith );
- switch( val.i_int )
+ switch( i_bandwith )
{
case 0: fe_bandwidth = BANDWIDTH_AUTO; break;
case 6: fe_bandwidth = BANDWIDTH_6_MHZ; break;
static fe_transmit_mode_t DecodeTransmission( access_t *p_access )
{
- vlc_value_t val;
fe_transmit_mode_t fe_transmission = 0;
+ int i_transmission = var_GetInteger( p_access, "dvb-transmission" );
- var_Get( p_access, "dvb-transmission", &val );
- msg_Dbg( p_access, "using transmission=%d", val.i_int );
+ msg_Dbg( p_access, "using transmission=%d", i_transmission );
- switch( val.i_int )
+ switch( i_transmission )
{
case 0: fe_transmission = TRANSMISSION_MODE_AUTO; break;
case 2: fe_transmission = TRANSMISSION_MODE_2K; break;
static fe_guard_interval_t DecodeGuardInterval( access_t *p_access )
{
- vlc_value_t val;
fe_guard_interval_t fe_guard = 0;
+ int i_guard = var_GetInteger( p_access, "dvb-guard" );
- var_Get( p_access, "dvb-guard", &val );
- msg_Dbg( p_access, "using guard=%d", val.i_int );
+ msg_Dbg( p_access, "using guard=%d", i_guard );
- switch( val.i_int )
+ switch( i_guard )
{
case 0: fe_guard = GUARD_INTERVAL_AUTO; break;
case 4: fe_guard = GUARD_INTERVAL_1_4; break;
static fe_hierarchy_t DecodeHierarchy( access_t *p_access )
{
- vlc_value_t val;
fe_hierarchy_t fe_hierarchy = 0;
+ int i_hierarchy = var_GetInteger( p_access, "dvb-hierarchy" );
- var_Get( p_access, "dvb-hierarchy", &val );
- msg_Dbg( p_access, "using hierarchy=%d", val.i_int );
+ msg_Dbg( p_access, "using hierarchy=%d", i_hierarchy );
- switch( val.i_int )
+ switch( i_hierarchy )
{
case -1: fe_hierarchy = HIERARCHY_NONE; break;
case 0: fe_hierarchy = HIERARCHY_AUTO; break;
{
access_sys_t *p_sys = p_access->p_sys;
struct dvb_frontend_parameters fep;
- vlc_value_t val;
int ret;
/* Prepare the fep structure */
- var_Get( p_access, "dvb-frequency", &val );
- fep.frequency = val.i_int;
+ fep.frequency = var_GetInteger( p_access, "dvb-frequency" );
fep.inversion = DecodeInversion( p_access );
fep.u.ofdm.bandwidth = DecodeBandwidth( p_access );
- var_Get( p_access, "dvb-code-rate-hp", &val );
- 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.code_rate_HP = DecodeFEC( p_access, var_GetInteger( p_access,
+ "dvb-code-rate-hp" ) );
+ fep.u.ofdm.code_rate_LP = DecodeFEC( p_access, var_GetInteger( p_access,
+ "dvb-code-rate-lp" ) );
+ 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 );
/* Now send it all to the frontend device */
if( (ret = ioctl( p_sys->i_frontend_handle, FE_SET_FRONTEND, &fep )) < 0 )
{
- msg_Err( p_access, "DVB-T: setting frontend failed (%d) %s", ret,
- strerror(errno) );
+ msg_Err( p_access, "DVB-T: setting frontend failed (%d): %m", ret );
return -1;
}
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;
+ int i_ret;
+
+ /* Prepare the fep structure */
+
+ fep.frequency = var_GetInteger( p_access, "dvb-frequency" );
+
+ 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): %m", i_ret );
+ return VLC_EGENERIC;
+ }
+
+ return VLC_SUCCESS;
+}
+
/*
* Demux
/*****************************************************************************
* DMXSetFilter : controls the demux to add a filter
*****************************************************************************/
-int E_(DMXSetFilter)( access_t * p_access, int i_pid, int * pi_fd, int i_type )
+int DMXSetFilter( access_t * p_access, int i_pid, int * pi_fd, int i_type )
{
struct dmx_pes_filter_params s_filter_params;
int i_ret;
unsigned int i_adapter, i_device;
char dmx[128];
- vlc_value_t val;
- var_Get( p_access, "dvb-adapter", &val );
- i_adapter = val.i_int;
- var_Get( p_access, "dvb-device", &val );
- i_device = val.i_int;
+ i_adapter = var_GetInteger( p_access, "dvb-adapter" );
+ i_device = var_GetInteger( p_access, "dvb-device" );
if( snprintf( dmx, sizeof(dmx), DMX, i_adapter, i_device )
>= (int)sizeof(dmx) )
msg_Dbg( p_access, "Opening device %s", dmx );
if( (*pi_fd = open(dmx, O_RDWR)) < 0 )
{
- msg_Err( p_access, "DMXSetFilter: opening device failed (%s)",
- strerror(errno) );
+ msg_Err( p_access, "DMXSetFilter: opening device failed (%m)" );
return VLC_EGENERIC;
}
/* We then give the order to the device : */
if( (i_ret = ioctl( *pi_fd, DMX_SET_PES_FILTER, &s_filter_params )) < 0 )
{
- msg_Err( p_access, "DMXSetFilter: failed with %d (%s)", i_ret,
- strerror(errno) );
+ msg_Err( p_access, "DMXSetFilter: failed with %d (%m)", i_ret );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
/*****************************************************************************
* DMXUnsetFilter : removes a filter
*****************************************************************************/
-int E_(DMXUnsetFilter)( access_t * p_access, int i_fd )
+int DMXUnsetFilter( access_t * p_access, int i_fd )
{
int i_ret;
if( (i_ret = ioctl( i_fd, DMX_STOP )) < 0 )
{
- msg_Err( p_access, "DMX_STOP failed for demux (%d) %s",
- i_ret, strerror(errno) );
+ msg_Err( p_access, "DMX_STOP failed for demux (%d): %m", i_ret );
return i_ret;
}
/*****************************************************************************
* DVROpen :
*****************************************************************************/
-int E_(DVROpen)( access_t * p_access )
+int DVROpen( access_t * p_access )
{
access_sys_t *p_sys = p_access->p_sys;
unsigned int i_adapter, i_device;
char dvr[128];
- vlc_value_t val;
- var_Get( p_access, "dvb-adapter", &val );
- i_adapter = val.i_int;
- var_Get( p_access, "dvb-device", &val );
- i_device = val.i_int;
+ i_adapter = var_GetInteger( p_access, "dvb-adapter" );
+ i_device = var_GetInteger( p_access, "dvb-device" );
if( snprintf( dvr, sizeof(dvr), DVR, i_adapter, i_device )
>= (int)sizeof(dvr) )
msg_Dbg( p_access, "Opening device %s", dvr );
if( (p_sys->i_handle = open(dvr, O_RDONLY)) < 0 )
{
- msg_Err( p_access, "DVROpen: opening device failed (%s)",
- strerror(errno) );
+ msg_Err( p_access, "DVROpen: opening device failed (%m)" );
return VLC_EGENERIC;
}
if( fcntl( p_sys->i_handle, F_SETFL, O_NONBLOCK ) == -1 )
{
- msg_Warn( p_access, "DVROpen: couldn't set non-blocking mode (%s)",
- strerror(errno) );
+ msg_Warn( p_access, "DVROpen: couldn't set non-blocking mode (%m)" );
}
return VLC_SUCCESS;
/*****************************************************************************
* DVRClose :
*****************************************************************************/
-void E_(DVRClose)( access_t * p_access )
+void DVRClose( access_t * p_access )
{
access_sys_t *p_sys = p_access->p_sys;
/*****************************************************************************
* CAMOpen :
*****************************************************************************/
-int E_(CAMOpen)( access_t *p_access )
+int CAMOpen( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
char ca[128];
- int i_adapter, i_device, i_slot;
+ int i_adapter, i_device;
ca_caps_t caps;
- struct ca_slot_info info;
i_adapter = var_GetInteger( p_access, "dvb-adapter" );
i_device = var_GetInteger( p_access, "dvb-device" );
msg_Dbg( p_access, "Opening device %s", ca );
if( (p_sys->i_ca_handle = open(ca, O_RDWR | O_NONBLOCK)) < 0 )
{
- msg_Warn( p_access, "CAMInit: opening CAM device failed (%s)",
- strerror(errno) );
+ msg_Warn( p_access, "CAMInit: opening CAM device failed (%m)" );
p_sys->i_ca_handle = 0;
return VLC_EGENERIC;
}
}
/* 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 (not supported)" );
+ msg_Dbg( p_access, "CAMInit: CI high level interface type" );
if ( caps.slot_type & CA_CI_LINK )
msg_Dbg( p_access, "CAMInit: CI link layer level interface type" );
if ( caps.slot_type & CA_CI_PHYS )
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 )
{
- msg_Err( p_access, "CAMInit: incompatible CAM module" );
- close( p_sys->i_ca_handle );
- p_sys->i_ca_handle = 0;
- return VLC_EGENERIC;
+ p_sys->i_ca_type = CA_CI_LINK;
}
- if( ioctl( p_sys->i_ca_handle, CA_GET_SLOT_INFO, &info ) < 0 )
+ else if( caps.slot_type & CA_CI )
{
- msg_Err( p_access, "CAMInit: Couldn't get slot info" );
- close( p_sys->i_ca_handle );
- p_sys->i_ca_handle = 0;
- return VLC_EGENERIC;
+ p_sys->i_ca_type = CA_CI;
}
- if( info.flags == 0 )
+ else
{
- msg_Err( p_access, "CAMInit: No CAM inserted" );
+ 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;
return VLC_EGENERIC;
}
-
- p_sys->i_nb_slots = caps.slot_num;
- memset( p_sys->pb_active_slot, 0, sizeof(vlc_bool_t) * MAX_CI_SLOTS );
-#if(RESET_CAM_SLOTS)
- for ( i_slot = 0; i_slot < p_sys->i_nb_slots; i_slot++ )
- {
- if ( ioctl( p_sys->i_ca_handle, CA_RESET, 1 << i_slot) != 0 )
- {
- msg_Err( p_access, "CAMInit: couldn't reset slot %d", i_slot );
- }
- }
-#endif
- p_sys->i_ca_timeout = 100000;
- /* Wait a bit otherwise it doesn't initialize properly... */
- msleep( 1000000 );
+ p_sys->i_nb_slots = caps.slot_num;
+ memset( p_sys->pb_active_slot, 0, sizeof(bool) * MAX_CI_SLOTS );
+ memset( p_sys->pb_slot_mmi_expected, 0, sizeof(bool) * MAX_CI_SLOTS );
+ memset( p_sys->pb_slot_mmi_undisplayed, 0,
+ sizeof(bool) * MAX_CI_SLOTS );
- return E_(en50221_Init)( p_access );
+ return en50221_Init( p_access );
}
/*****************************************************************************
* CAMPoll :
*****************************************************************************/
-int E_(CAMPoll)( access_t * p_access )
+int CAMPoll( access_t * p_access )
{
access_sys_t *p_sys = p_access->p_sys;
int i_ret = VLC_EGENERIC;
switch( p_sys->i_ca_type )
{
case CA_CI_LINK:
- i_ret = E_(en50221_Poll)( p_access );
+ i_ret = en50221_Poll( p_access );
break;
case CA_CI:
i_ret = VLC_SUCCESS;
return i_ret;
}
+#ifdef ENABLE_HTTPD
+/*****************************************************************************
+ * CAMStatus :
+ *****************************************************************************/
+void CAMStatus( access_t * p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ char *p;
+ ca_caps_t caps;
+ int i_slot, i;
+
+ if ( p_sys->psz_request != NULL && *p_sys->psz_request )
+ {
+ /* Check if we have an undisplayed MMI message : in that case we ignore
+ * the user input to avoid confusing the CAM. */
+ for ( i_slot = 0; i_slot < p_sys->i_nb_slots; i_slot++ )
+ {
+ if ( p_sys->pb_slot_mmi_undisplayed[i_slot] == true )
+ {
+ p_sys->psz_request = NULL;
+ msg_Dbg( p_access,
+ "ignoring user request because of a new MMI object" );
+ break;
+ }
+ }
+ }
+
+ if ( p_sys->psz_request != NULL && *p_sys->psz_request )
+ {
+ /* We have a mission to accomplish. */
+ en50221_mmi_object_t mmi_object;
+ char *psz_request = p_sys->psz_request;
+ char psz_value[255];
+ int i_slot;
+ bool b_ok = false;
+
+ p_sys->psz_request = NULL;
+
+ if ( HTTPExtractValue( psz_request, "slot", psz_value,
+ sizeof(psz_value) ) == NULL )
+ {
+ p_sys->psz_mmi_info = strdup( "invalid request parameter\n" );
+ goto out;
+ }
+ i_slot = atoi(psz_value);
+
+ if ( HTTPExtractValue( psz_request, "open", psz_value,
+ sizeof(psz_value) ) != NULL )
+ {
+ en50221_OpenMMI( p_access, i_slot );
+ return;
+ }
+
+ if ( HTTPExtractValue( psz_request, "close", psz_value,
+ sizeof(psz_value) ) != NULL )
+ {
+ en50221_CloseMMI( p_access, i_slot );
+ return;
+ }
+
+ if ( HTTPExtractValue( psz_request, "cancel", psz_value,
+ sizeof(psz_value) ) == NULL )
+ {
+ b_ok = true;
+ }
+
+ if ( HTTPExtractValue( psz_request, "type", psz_value,
+ sizeof(psz_value) ) == NULL )
+ {
+ p_sys->psz_mmi_info = strdup( "invalid request parameter\n" );
+ goto out;
+ }
+
+ if ( !strcmp( psz_value, "enq" ) )
+ {
+ mmi_object.i_object_type = EN50221_MMI_ANSW;
+ mmi_object.u.answ.b_ok = b_ok;
+ if ( b_ok == false )
+ {
+ mmi_object.u.answ.psz_answ = strdup("");
+ }
+ else
+ {
+ if ( HTTPExtractValue( psz_request, "answ", psz_value,
+ sizeof(psz_value) ) == NULL )
+ {
+ p_sys->psz_mmi_info = strdup( "invalid request parameter\n" );
+ goto out;
+ }
+
+ mmi_object.u.answ.psz_answ = strdup(psz_value);
+ }
+ }
+ else
+ {
+ mmi_object.i_object_type = EN50221_MMI_MENU_ANSW;
+ if ( b_ok == false )
+ {
+ mmi_object.u.menu_answ.i_choice = 0;
+ }
+ else
+ {
+ if ( HTTPExtractValue( psz_request, "choice", psz_value,
+ sizeof(psz_value) ) == NULL )
+ mmi_object.u.menu_answ.i_choice = 0;
+ else
+ mmi_object.u.menu_answ.i_choice = atoi(psz_value);
+ }
+ }
+
+ en50221_SendMMIObject( p_access, i_slot, &mmi_object );
+ return;
+ }
+
+ /* Check that we have all necessary MMI information. */
+ for ( i_slot = 0; i_slot < p_sys->i_nb_slots; i_slot++ )
+ {
+ if ( p_sys->pb_slot_mmi_expected[i_slot] == true )
+ return;
+ }
+
+ p = p_sys->psz_mmi_info = malloc( 10000 );
+
+ if ( ioctl( p_sys->i_ca_handle, CA_GET_CAP, &caps ) != 0 )
+ {
+ char buf[1000];
+ strerror_r( errno, buf, sizeof( buf ) );
+ p += sprintf( p, "ioctl CA_GET_CAP failed (%s)\n", buf );
+ goto out;
+ }
+
+ /* Output CA capabilities */
+ p += sprintf( p, "CA interface with %d %s, type:\n<table>", caps.slot_num,
+ caps.slot_num == 1 ? "slot" : "slots" );
+#define CHECK_CAPS( x, s ) \
+ if ( caps.slot_type & (CA_##x) ) \
+ p += sprintf( p, "<tr><td>" s "</td></tr>\n" );
+
+ CHECK_CAPS( CI, "CI high level interface" );
+ CHECK_CAPS( CI_LINK, "CI link layer level interface" );
+ CHECK_CAPS( CI_PHYS, "CI physical layer level interface (not supported)" );
+ CHECK_CAPS( DESCR, "built-in descrambler" );
+ CHECK_CAPS( SC, "simple smartcard interface" );
+#undef CHECK_CAPS
+
+ p += sprintf( p, "</table>%d available %s\n<table>", caps.descr_num,
+ caps.descr_num == 1 ? "descrambler (key)" : "descramblers (keys)" );
+#define CHECK_DESC( x ) \
+ if ( caps.descr_type & (CA_##x) ) \
+ p += sprintf( p, "<tr><td>" STRINGIFY(x) "</td></tr>\n" );
+
+ CHECK_DESC( ECD );
+ CHECK_DESC( NDS );
+ CHECK_DESC( DSS );
+#undef CHECK_DESC
+
+ p += sprintf( p, "</table>" );
+
+ for ( i_slot = 0; i_slot < p_sys->i_nb_slots; i_slot++ )
+ {
+ ca_slot_info_t sinfo;
+
+ p_sys->pb_slot_mmi_undisplayed[i_slot] = false;
+ p += sprintf( p, "<p>CA slot #%d: ", i_slot );
+
+ sinfo.num = i_slot;
+ if ( ioctl( p_sys->i_ca_handle, CA_GET_SLOT_INFO, &sinfo ) != 0 )
+ {
+ char buf[1000];
+ strerror_r( errno, buf, sizeof( buf ) );
+ p += sprintf( p, "ioctl CA_GET_SLOT_INFO failed (%s)<br>\n", buf );
+ continue;
+ }
+
+#define CHECK_TYPE( x, s ) \
+ if ( sinfo.type & (CA_##x) ) \
+ p += sprintf( p, "%s", s );
+
+ CHECK_TYPE( CI, "high level, " );
+ CHECK_TYPE( CI_LINK, "link layer level, " );
+ CHECK_TYPE( CI_PHYS, "physical layer level, " );
+#undef CHECK_TYPE
+
+ if ( sinfo.flags & CA_CI_MODULE_READY )
+ {
+ en50221_mmi_object_t *p_object = en50221_GetMMIObject( p_access,
+ i_slot );
+
+ p += sprintf( p, "module present and ready<p>\n" );
+ p += sprintf( p, "<form action=index.html method=get>\n" );
+ p += sprintf( p, "<input type=hidden name=slot value=\"%d\">\n",
+ i_slot );
+
+ if ( p_object == NULL )
+ {
+ p += sprintf( p, "<input type=submit name=open value=\"Open session\">\n" );
+ }
+ else
+ {
+ switch ( p_object->i_object_type )
+ {
+ case EN50221_MMI_ENQ:
+ p += sprintf( p, "<input type=hidden name=type value=enq>\n" );
+ p += sprintf( p, "<table border=1><tr><th>%s</th></tr>\n",
+ p_object->u.enq.psz_text );
+ if ( p_object->u.enq.b_blind == false )
+ p += sprintf( p, "<tr><td><input type=text name=answ></td></tr>\n" );
+ else
+ p += sprintf( p, "<tr><td><input type=password name=answ></td></tr>\n" );
+ break;
+
+ case EN50221_MMI_MENU:
+ p += sprintf( p, "<input type=hidden name=type value=menu>\n" );
+ p += sprintf( p, "<table border=1><tr><th>%s</th></tr>\n",
+ p_object->u.menu.psz_title );
+ p += sprintf( p, "<tr><td>%s</td></tr><tr><td>\n",
+ p_object->u.menu.psz_subtitle );
+ for ( i = 0; i < p_object->u.menu.i_choices; i++ )
+ p += sprintf( p, "<input type=radio name=choice value=\"%d\">%s<br>\n", i + 1, p_object->u.menu.ppsz_choices[i] );
+ p += sprintf( p, "</td></tr><tr><td>%s</td></tr>\n",
+ p_object->u.menu.psz_bottom );
+ break;
+
+ case EN50221_MMI_LIST:
+ p += sprintf( p, "<input type=hidden name=type value=menu>\n" );
+ p += sprintf( p, "<input type=hidden name=choice value=0>\n" );
+ p += sprintf( p, "<table border=1><tr><th>%s</th></tr>\n",
+ p_object->u.menu.psz_title );
+ p += sprintf( p, "<tr><td>%s</td></tr><tr><td>\n",
+ p_object->u.menu.psz_subtitle );
+ for ( i = 0; i < p_object->u.menu.i_choices; i++ )
+ p += sprintf( p, "%s<br>\n",
+ p_object->u.menu.ppsz_choices[i] );
+ p += sprintf( p, "</td></tr><tr><td>%s</td></tr>\n",
+ p_object->u.menu.psz_bottom );
+ break;
+
+ default:
+ p += sprintf( p, "<table><tr><th>Unknown MMI object type</th></tr>\n" );
+ }
+
+ p += sprintf( p, "</table><p><input type=submit name=ok value=\"OK\">\n" );
+ p += sprintf( p, "<input type=submit name=cancel value=\"Cancel\">\n" );
+ p += sprintf( p, "<input type=submit name=close value=\"Close Session\">\n" );
+ }
+ p += sprintf( p, "</form>\n" );
+ }
+ else if ( sinfo.flags & CA_CI_MODULE_PRESENT )
+ p += sprintf( p, "module present, not ready<br>\n" );
+ else
+ p += sprintf( p, "module not present<br>\n" );
+ }
+
+out:
+ vlc_mutex_lock( &p_sys->httpd_mutex );
+ p_sys->b_request_mmi_info = false;
+ vlc_cond_signal( &p_sys->httpd_cond );
+ vlc_mutex_unlock( &p_sys->httpd_mutex );
+}
+#endif
+
/*****************************************************************************
* CAMSet :
*****************************************************************************/
-int E_(CAMSet)( access_t * p_access, dvbpsi_pmt_t *p_pmt )
+int CAMSet( access_t * p_access, dvbpsi_pmt_t *p_pmt )
{
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;
}
- E_(en50221_SetCAPMT)( p_access, p_pmt );
+ en50221_SetCAPMT( p_access, p_pmt );
return VLC_SUCCESS;
}
/*****************************************************************************
* CAMClose :
*****************************************************************************/
-void E_(CAMClose)( access_t * p_access )
+void CAMClose( access_t * p_access )
{
access_sys_t *p_sys = p_access->p_sys;
- E_(en50221_End)( p_access );
+ en50221_End( p_access );
if ( p_sys->i_ca_handle )
{
projects / vlc / blobdiff