mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-06 21:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorder the properties for cable. Changing FEC in menu could lead to

Browse Source 
corrupted command list.



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1250 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: d4b483155c
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2011-03-06 (Sun, 06 Mar 2011)
This commit is contained in:
nightshad
2011-03-06 14:39:52 +00:00
parent 20ea6472c0
commit b71fd044ad
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/zapit/src/frontend.cpp
View File

@@ -55,12 +55,14 @@ extern int uni_qrg;
#define WEST 1 #define WEST 1
#define USALS #define USALS
// Common properties
#define FREQUENCY 1 #define FREQUENCY 1
#define MODULATION 2 #define MODULATION 2
#define INVERSION 3 #define INVERSION 3
#define SYMBOL_RATE 4 #define SYMBOL_RATE 4
#define INNER_FEC 5 #define DELIVERY_SYSTEM 5
#define DELIVERY_SYSTEM 6 #define INNER_FEC 6
// DVB-S/S2 specific
#define PILOTS 7 #define PILOTS 7
#define ROLLOFF 8 #define ROLLOFF 8
@@ -79,8 +81,8 @@ static struct dtv_property dvbs_cmdargs[] = {
{ DTV_MODULATION, {0,0,0}, { QPSK },0 }, { DTV_MODULATION, {0,0,0}, { QPSK },0 },
{ DTV_INVERSION, {0,0,0}, { INVERSION_AUTO },0 }, { DTV_INVERSION, {0,0,0}, { INVERSION_AUTO },0 },
{ DTV_SYMBOL_RATE, {0,0,0}, { 27500000 },0 }, { DTV_SYMBOL_RATE, {0,0,0}, { 27500000 },0 },
{ DTV_INNER_FEC, {0,0,0}, { FEC_AUTO },0 },
{ DTV_DELIVERY_SYSTEM, {0,0,0}, { SYS_DVBS },0 }, { DTV_DELIVERY_SYSTEM, {0,0,0}, { SYS_DVBS },0 },
{ DTV_INNER_FEC, {0,0,0}, { FEC_AUTO },0 },
{ DTV_TUNE, {0,0,0}, { 0 },0 }, { DTV_TUNE, {0,0,0}, { 0 },0 },
}; };
@@ -94,8 +96,8 @@ static struct dtv_property dvbs2_cmdargs[] = {
{ DTV_MODULATION, {}, { PSK_8 } ,0}, { DTV_MODULATION, {}, { PSK_8 } ,0},
{ DTV_INVERSION, {}, { INVERSION_AUTO } ,0}, { DTV_INVERSION, {}, { INVERSION_AUTO } ,0},
{ DTV_SYMBOL_RATE, {}, { 27500000 } ,0}, { DTV_SYMBOL_RATE, {}, { 27500000 } ,0},
{ DTV_INNER_FEC, {}, { FEC_AUTO } ,0},
{ DTV_DELIVERY_SYSTEM, {}, { SYS_DVBS2 } ,0}, { DTV_DELIVERY_SYSTEM, {}, { SYS_DVBS2 } ,0},
{ DTV_INNER_FEC, {}, { FEC_AUTO } ,0},
{ DTV_PILOT, {}, { PILOT_AUTO } ,0}, { DTV_PILOT, {}, { PILOT_AUTO } ,0},
{ DTV_ROLLOFF, {}, { ROLLOFF_AUTO } ,0}, { DTV_ROLLOFF, {}, { ROLLOFF_AUTO } ,0},
{ DTV_TUNE, {}, { 0 } ,0 }, { DTV_TUNE, {}, { 0 } ,0 },
@@ -112,7 +114,8 @@ static struct dtv_property dvbc_cmdargs[] = {
{ DTV_INVERSION, {}, { INVERSION_AUTO } ,0}, { DTV_INVERSION, {}, { INVERSION_AUTO } ,0},
{ DTV_SYMBOL_RATE, {}, { 27500000 } ,0}, { DTV_SYMBOL_RATE, {}, { 27500000 } ,0},
{ DTV_DELIVERY_SYSTEM, {}, { SYS_DVBC_ANNEX_AC } ,0}, { DTV_DELIVERY_SYSTEM, {}, { SYS_DVBC_ANNEX_AC } ,0},
{ DTV_TUNE, {}, { 0 },0 }, { DTV_INNER_FEC, {}, { FEC_AUTO } ,0},
{ DTV_TUNE, {}, { 0 }, 0},
}; };
static struct dtv_properties dvbc_cmdseq = { static struct dtv_properties dvbc_cmdseq = {
@@ -680,10 +683,6 @@ int CFrontend::setFrontend(const struct dvb_frontend_parameters *feparams, bool
} else { } else {
p = &dvbs_cmdseq; p = &dvbs_cmdseq;
} }
#if 0 // we set this before
p->props[VOLTAGE].u.data = currentVoltage;
p->props[TONE].u.data = currentToneMode;
#endif
p->props[FREQUENCY].u.data = feparams->frequency; p->props[FREQUENCY].u.data = feparams->frequency;
p->props[SYMBOL_RATE].u.data = feparams->u.qpsk.symbol_rate; p->props[SYMBOL_RATE].u.data = feparams->u.qpsk.symbol_rate;
p->props[INNER_FEC].u.data = fec; /*_inner*/ ; p->props[INNER_FEC].u.data = fec; /*_inner*/ ;
@@ -692,8 +691,8 @@ int CFrontend::setFrontend(const struct dvb_frontend_parameters *feparams, bool
p = &dvbc_cmdseq; p = &dvbc_cmdseq;
p->props[FREQUENCY].u.data = feparams->frequency; p->props[FREQUENCY].u.data = feparams->frequency;
p->props[MODULATION].u.data = modulation; p->props[MODULATION].u.data = modulation;
p->props[INNER_FEC].u.data = fec_inner;
p->props[SYMBOL_RATE].u.data = feparams->u.qam.symbol_rate; p->props[SYMBOL_RATE].u.data = feparams->u.qam.symbol_rate;
p->props[INNER_FEC].u.data = fec_inner;
break; break;
default: default:
printf("frontend: unknown frontend type, exiting\n"); printf("frontend: unknown frontend type, exiting\n");