Commit d9f41e06 authored by Christophe Massiot's avatar Christophe Massiot

* dvb.c: Diseqc support (based on patch #5 with extended msleep()s).

parent d0885e01
...@@ -9,3 +9,4 @@ Changes between 1.0 and 1.1: ...@@ -9,3 +9,4 @@ Changes between 1.0 and 1.1:
* EIT and SDT pass-through for EPG information * EIT and SDT pass-through for EPG information
* Original TSID kept (randomized TSID via -T) * Original TSID kept (randomized TSID via -T)
* Miscellaneous CAM and tuning fixes * Miscellaneous CAM and tuning fixes
* DVB-S diseqc support
This diff is collapsed.
...@@ -50,6 +50,7 @@ int i_adapter = 0; ...@@ -50,6 +50,7 @@ int i_adapter = 0;
int i_fenum = 0; int i_fenum = 0;
int i_frequency = 0; int i_frequency = 0;
int i_srate = 27500000; int i_srate = 27500000;
int i_satnum = 0;
int i_voltage = 13; int i_voltage = 13;
int b_tone = 0; int b_tone = 0;
int i_bandwidth = 8; int i_bandwidth = 8;
...@@ -192,10 +193,11 @@ static void SigHandler( int i_signal ) ...@@ -192,10 +193,11 @@ static void SigHandler( int i_signal )
*****************************************************************************/ *****************************************************************************/
void usage() void usage()
{ {
msg_Raw( NULL, "Usage: dvblast [-q] -c <config file> [-r <remote socket>] [-t <ttl>] [-o <SSRC IP>] [-i <RT priority>] [-a <adapter>][-n <frontend_num>] -f <frequency> [-s <symbol rate>] [-v <0|13|18>] [-p] [-b <bandwidth>] [-m <modulation] [-u] [-U] [-d <dest IP:port>] [-e] [-T]" ); msg_Raw( NULL, "Usage: dvblast [-q] -c <config file> [-r <remote socket>] [-t <ttl>] [-o <SSRC IP>] [-i <RT priority>] [-a <adapter>] [-n <frontend number>] [-S <diseqc>] -f <frequency> [-s <symbol rate>] [-v <0|13|18>] [-p] [-b <bandwidth>] [-m <modulation] [-u] [-U] [-d <dest IP:port>] [-e] [-T]" );
msg_Raw( NULL, " -q: be quiet (less verbosity, repeat or use number for even quieter)" ); msg_Raw( NULL, " -q: be quiet (less verbosity, repeat or use number for even quieter)" );
msg_Raw( NULL, " -v: voltage to apply to the LNB (QPSK)" ); msg_Raw( NULL, " -v: voltage to apply to the LNB (QPSK)" );
msg_Raw( NULL, " -p: force 22kHz pulses for high-band selection (DVB-S)" ); msg_Raw( NULL, " -p: force 22kHz pulses for high-band selection (DVB-S)" );
msg_Raw( NULL, " -S: satellite number for diseqc (0: no diseqc, 1-4, A or B)" );
msg_Raw( NULL, " -m: DVB-C qpsk|qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)" ); msg_Raw( NULL, " -m: DVB-C qpsk|qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)" );
msg_Raw( NULL, " DVB-T qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)" ); msg_Raw( NULL, " DVB-T qam_16|qam_32|qam_64|qam_128|qam_256 (default qam_auto)" );
msg_Raw( NULL, " DVB-S2 qpsk|psk_8 (default legacy DVB-S)" ); msg_Raw( NULL, " DVB-S2 qpsk|psk_8 (default legacy DVB-S)" );
...@@ -218,7 +220,7 @@ int main( int i_argc, char **pp_argv ) ...@@ -218,7 +220,7 @@ int main( int i_argc, char **pp_argv )
msg_Warn( NULL, "restarting" ); msg_Warn( NULL, "restarting" );
while ( ( c = getopt(i_argc, pp_argv, "q::c:r:t:o:i:a:n:f:s:v:pb:m:uUTd:eh")) != (int)EOF ) while ( ( c = getopt(i_argc, pp_argv, "q::c:r:t:o:i:a:n:f:s:S:v:pb:m:uUTd:eh")) != (int)EOF )
{ {
switch ( c ) switch ( c )
{ {
...@@ -286,6 +288,10 @@ int main( int i_argc, char **pp_argv ) ...@@ -286,6 +288,10 @@ int main( int i_argc, char **pp_argv )
i_srate = strtol( optarg, NULL, 0 ); i_srate = strtol( optarg, NULL, 0 );
break; break;
case 'S':
i_satnum = strtol( optarg, NULL, 16 );
break;
case 'v': case 'v':
i_voltage = strtol( optarg, NULL, 0 ); i_voltage = strtol( optarg, NULL, 0 );
break; break;
......
...@@ -89,6 +89,7 @@ extern int i_adapter; ...@@ -89,6 +89,7 @@ extern int i_adapter;
extern int i_fenum; extern int i_fenum;
extern int i_frequency; extern int i_frequency;
extern int i_srate; extern int i_srate;
extern int i_satnum;
extern int i_voltage; extern int i_voltage;
extern int b_tone; extern int b_tone;
extern int i_bandwidth; extern int i_bandwidth;
......
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