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

fixed regression for FSM modulators

Browse Source
This commit is contained in:
Ralph Metzler 2017-08-04 17:50:03 +02:00
parent bf0315bcc0
commit 7602ecf3e5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ddbridge/ddbridge-main.c
View File

@ -286,7 +286,7 @@ static int __devinit ddb_probe(struct pci_dev *pdev,
ddbwritel(dev, 0, DMA_BASE_WRITE); ddbwritel(dev, 0, DMA_BASE_WRITE);
if (dev->link[0].info->type == DDB_MOD) { if (dev->link[0].info->type == DDB_MOD) {
if (dev->link[0].info->version == 1) if (dev->link[0].info->version <= 1)
if (ddbreadl(dev, 0x1c) == 4) if (ddbreadl(dev, 0x1c) == 4)
dev->link[0].info->port_num = 4; dev->link[0].info->port_num = 4;
} }

8
ddbridge/ddbridge-modulator.c
View File

@ -516,6 +516,7 @@ static int mod_fsm_setup(struct ddb *dev, u32 FrequencyPlan,
else else
ddbwritel(dev, FSM_GAIN_N96, FSM_GAIN); ddbwritel(dev, FSM_GAIN_N96, FSM_GAIN);
ddbwritel(dev, FSM_CONTROL_ENABLE, FSM_CONTROL);
dev->link[0].info->port_num = MaxUsedChannels; dev->link[0].info->port_num = MaxUsedChannels;
return status; return status;
@ -1644,6 +1645,13 @@ static int mod_init_2(struct ddb *dev, u32 Frequency)
mod_set_symbolrate(mod, 6900000); mod_set_symbolrate(mod, 6900000);
mod_set_frequency(mod, dev->mod_base.frequency + i * 8000000); mod_set_frequency(mod, dev->mod_base.frequency + i * 8000000);
} }
if (streams <= 8)
mod_set_vga(dev, RF_VGA_GAIN_N8);
else if (streams <= 16)
mod_set_vga(dev, RF_VGA_GAIN_N16);
else
mod_set_vga(dev, RF_VGA_GAIN_N24);
mod_set_attenuator(dev, 0); mod_set_attenuator(dev, 0);
return 0; return 0;
} }