frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2025-03-01 10:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup init for FSM and DVB-T cards

Browse Source
This commit is contained in:
rjkm 2024-09-19 10:51:57 +02:00
parent 59cbab6383
commit 1022b26d7f
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ddbridge/ddbridge-modulator.c
View File

@ -2157,7 +2157,6 @@ static int mod_init_3(struct ddb *dev, u32 Frequency)
return ret; return ret;
} }
static int mod_init_sdr_iq(struct ddb *dev) static int mod_init_sdr_iq(struct ddb *dev)
{ {
int streams = dev->link[0].info->port_num; int streams = dev->link[0].info->port_num;
@ -2174,7 +2173,6 @@ static int mod_init_sdr_iq(struct ddb *dev)
ddbwritel(dev, 0x01, 0x240); ddbwritel(dev, 0x01, 0x240);
//mod3_set_base_frequency(dev, 602000000); //mod3_set_base_frequency(dev, 602000000);
dev->mod_base.frequency = 570000000; dev->mod_base.frequency = 570000000;
for (i = 0; i < streams; i++) { for (i = 0; i < streams; i++) {
@ -2193,39 +2191,35 @@ static int mod_init_sdr_iq(struct ddb *dev)
return ret; return ret;
} }
static int mod_init_dvbt(struct ddb *dev)
{
int i;
dev->mod_base.frequency = 570000000;
for (i = 0; i < dev->link[0].info->port_num; i++)
dev->mod[i].port = &dev->port[i];
return 0;
}
int ddbridge_mod_init(struct ddb *dev) int ddbridge_mod_init(struct ddb *dev)
{ {
dev_info(dev->dev, "Revision: %u\n", dev->link[0].ids.revision); dev_info(dev->dev, "Revision: %u\n", dev->link[0].ids.revision);
if (dev->link[0].ids.revision == 1) {
switch (dev->link[0].info->version) { switch (dev->link[0].info->version) {
case 0: case 0:
case 1: case 1:
return mod_init_1(dev, 722000000); return mod_init_1(dev, 722000000);
case 2: /* FSM */ case 2: /* FSM */
if (dev->link[0].ids.revision == 1) {
if ((dev->link[0].ids.hwid & 0xffffff) >= 9065) if ((dev->link[0].ids.hwid & 0xffffff) >= 9065)
return mod_init_2_1(dev, 114000000); return mod_init_2_1(dev, 114000000);
return mod_init_2(dev, 114000000);
case 16: /* PAL */
return mod_init_3(dev, 503250000);
case 17: /* raw IQ */
case 18: /* IQ+FFT */
return mod_init_sdr_iq(dev);
default:
return -1;
} }
}
switch (dev->link[0].info->version) {
case 0:
case 1:
return mod_init_1(dev, 722000000);
case 2: /* FSM */
return mod_init_2(dev, 114000000); return mod_init_2(dev, 114000000);
case 16: /* PAL */ case 16: /* PAL */
return mod_init_3(dev, 503250000); return mod_init_3(dev, 503250000);
case 17: /* raw IQ */ case 17: /* raw IQ */
return mod_init_sdr_iq(dev); return mod_init_sdr_iq(dev);
case 18: /* IQ+FFT */ case 18: /* IQ+FFT (DVB-T) */
return mod_init_sdr_iq(dev); return mod_init_dvbt(dev);
default: default:
return -1; return -1;
} }