frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'internal'

Browse Source
This commit is contained in:
rjkm 2023-03-03 13:47:11 +01:00
commit a443c3e8de
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apps/modtest.c
View File

@ -1029,8 +1029,8 @@ void set_dvbt_mods(int adapt, int chans, uint32_t start_freq, write_data *wd)
wd->tp[i].code_rate = 4; wd->tp[i].code_rate = 4;
wd->tp[i].trans_mode = MOD_STANDARD_DVBT_8; wd->tp[i].trans_mode = MOD_STANDARD_DVBT_8;
device = malloc(sizeof(char)*25); device = malloc(sizeof(char)*40);
snprintf(device,24,"/dev/dvb/adapter%d/mod%d",adapt,i); snprintf(device,35,"/dev/dvb/adapter%d/mod%d",adapt,i);
fd = open(device, O_RDWR); fd = open(device, O_RDWR);
if( fd < 0 ) if( fd < 0 )
{ {
@ -1109,8 +1109,8 @@ void set_dvbc_mods(int adapt, int chans, uint32_t start_freq, write_data *wd)
wd->tp[i].code_rate = 0; wd->tp[i].code_rate = 0;
wd->tp[i].trans_mode = 0; wd->tp[i].trans_mode = 0;
device = malloc(sizeof(char)*25); device = malloc(sizeof(char)*40);
snprintf(device,24,"/dev/dvb/adapter%d/mod%d",adapt,i); snprintf(device,35,"/dev/dvb/adapter%d/mod%d",adapt,i);
fd = open(device, O_RDWR); fd = open(device, O_RDWR);
if( fd < 0 ) if( fd < 0 )
{ {
@ -1156,11 +1156,12 @@ static void usage(char *progname)
{ {
printf ("usage: %s [options] <input files>\n\n",progname); printf ("usage: %s [options] <input files>\n\n",progname);
printf ("options:\n"); printf ("options:\n");
printf (" --adapter, -a : adapter number of modulator card\n"); printf (" --adapter <n>, -a <n> : adapter number <n> of modulator card (defaults to first found)\n");
printf (" --file, -i : input filename(default test.ts)\n"); printf (" --mods <n>, -m <n> : number <n> of modulators to use (default all)\n");
printf (" --frequency, -f : start frequency in MHz( default DVB_C 114MHz, DVB-T 474MHz)\n"); printf (" --file, -i : input filename (default test.ts)\n");
printf (" --frequency, -f : start frequency in MHz (default DVB_C 114MHz, DVB-T 474MHz)\n");
printf (" --dvbt, -t : modulator is DVB-T\n"); printf (" --dvbt, -t : modulator is DVB-T\n");
printf (" --NIT, -n : write a minimal NIT for fatser scan\n"); printf (" --NIT, -n : write a minimal NIT for faster scan\n");
printf (" --help, -h : print help message\n"); printf (" --help, -h : print help message\n");
printf ("\n"); printf ("\n");
printf ("\n"); printf ("\n");
@ -1168,7 +1169,7 @@ static void usage(char *progname)
} }
static int parse_cl(int argc, char * const argv[], char **filename) static int parse_cl(int argc, char * const argv[], char **filename, int *chans)
{ {
int c; int c;
int fset = 0; int fset = 0;
@ -1184,12 +1185,13 @@ static int parse_cl(int argc, char * const argv[], char **filename)
{"dvbt", no_argument , NULL, 't'}, {"dvbt", no_argument , NULL, 't'},
{"NIT", no_argument , NULL, 'n'}, {"NIT", no_argument , NULL, 'n'},
{"adapter", required_argument , NULL, 'a'}, {"adapter", required_argument , NULL, 'a'},
{"mods", required_argument , NULL, 'm'},
{"file", required_argument , NULL, 'i'}, {"file", required_argument , NULL, 'i'},
{"frequency", required_argument , NULL, 'f'}, {"frequency", required_argument , NULL, 'f'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
c = getopt_long (argc, argv, "ha:i:f:nt",long_options, c = getopt_long (argc, argv, "ha:i:f:ntm:",long_options,
&option_index); &option_index);
if (c == -1) if (c == -1)
@ -1200,6 +1202,10 @@ static int parse_cl(int argc, char * const argv[], char **filename)
adapt = (int)strtol(optarg,(char **)NULL, 0); adapt = (int)strtol(optarg,(char **)NULL, 0);
break; break;
case 'm':
*chans = (int)strtol(optarg,(char **)NULL, 0);
break;
case 'f': case 'f':
fset = 1; fset = 1;
start_freq = strtoul(optarg, NULL, 0)*1000000; start_freq = strtoul(optarg, NULL, 0)*1000000;
@ -1248,9 +1254,10 @@ int main(int argc, char **argv)
write_data wd; write_data wd;
int fd_out; int fd_out;
int fd_in; int fd_in;
int chans = 0;
printf("%s \n\n", progn); printf("%s \n\n", progn);
adapt = parse_cl(argc, argv, &filename); adapt = parse_cl(argc, argv, &filename, &chans);
if (check_dvb(&ddevices)<0){ if (check_dvb(&ddevices)<0){
fprintf(stderr,"No DVB devices found\n"); fprintf(stderr,"No DVB devices found\n");
exit(1); exit(1);
@ -1290,7 +1297,8 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
int chans = ddevices.ndevs[adapt]; if (chans<1 || chans >ddevices.ndevs[adapt] )
chans = ddevices.ndevs[adapt];
if (dvbt){ if (dvbt){
set_dvbt_mods(adapt, chans, start_freq, &wd); set_dvbt_mods(adapt, chans, start_freq, &wd);
@ -1299,9 +1307,9 @@ int main(int argc, char **argv)
} }
fprintf(stderr,"Reading from %s\n", filename); fprintf(stderr,"Reading from %s\n", filename);
device = malloc(sizeof(char)*25); device = malloc(sizeof(char)*40);
for (int m= 0; m < chans; m++){ for (int m= 0; m < chans; m++){
snprintf(device,24,"/dev/dvb/adapter%d/mod%d",adapt,m); snprintf(device,35,"/dev/dvb/adapter%d/mod%d",adapt,m);
fd_out = open(device, O_WRONLY); fd_out = open(device, O_WRONLY);
wd.fd_out[m] = fd_out; wd.fd_out[m] = fd_out;
wd.fd_in = fd_in; wd.fd_in = fd_in;

2
ddbridge/ddbridge-hw.c
View File

@ -616,7 +616,7 @@ static const struct ddb_info ddb_sdr_dvbt = {
.name = "Digital Devices DVBT", .name = "Digital Devices DVBT",
.version = 18, .version = 18,
.regmap = &octopus_sdr_map, .regmap = &octopus_sdr_map,
.port_num = 16, .port_num = 14,
.temp_num = 1, .temp_num = 1,
.tempmon_irq = 8, .tempmon_irq = 8,
}; };