diff --git a/ddbridge/ddbridge-core.c b/ddbridge/ddbridge-core.c index 51bc255..071ab7d 100644 --- a/ddbridge/ddbridge-core.c +++ b/ddbridge/ddbridge-core.c @@ -5254,13 +5254,13 @@ static void tempmon_setfan(struct ddb_link *link) pwm -= 1; } ddblwritel(link, (pwm << 8), TEMPMON_FANCONTROL); - } +} static void temp_handler(unsigned long data) { struct ddb_link *link = (struct ddb_link *) data; - + spin_lock(&link->temp_lock); tempmon_setfan(link); spin_unlock(&link->temp_lock); @@ -5308,7 +5308,6 @@ static int ddb_init_tempmon(struct ddb_link *link) if (link->ids.regmapid < 0x00010002) return; spin_lock_init(&link->temp_lock); - printk("init_tempmon\n"); tempmon_init(link, 1); } diff --git a/ddbridge/ddbridge-mod.c b/ddbridge/ddbridge-mod.c index ef3fdcf..141a046 100644 --- a/ddbridge/ddbridge-mod.c +++ b/ddbridge/ddbridge-mod.c @@ -374,11 +374,13 @@ int ddbridge_mod_output_start(struct ddb_output *output) if (mod_SendChannelCommand(dev, Channel, CHANNEL_CONTROL_CMD_SETUP)) return -EINVAL; mod->Control |= CHANNEL_CONTROL_ENABLE_DVB; - } else { + } else if (dev->link[0].info->version == 1) { /* QAM: 600 601 602 903 604 = 16 32 64 128 256 */ /* ddbwritel(dev, 0x604, CHANNEL_SETTINGS(output->nr)); */ ddbwritel(dev, qamtab[mod->modulation], CHANNEL_SETTINGS(output->nr)); mod->Control |= (CHANNEL_CONTROL_ENABLE_IQ | CHANNEL_CONTROL_ENABLE_DVB); + } else if (dev->link[0].info->version == 3) { + mod->Control |= (CHANNEL_CONTROL_ENABLE_IQ | CHANNEL_CONTROL_ENABLE_DVB); } if (dev->link[0].info->version < 3) { mod_set_rateinc(dev, output->nr); @@ -1618,7 +1620,7 @@ static int mod_init_3(struct ddb *dev, u32 Frequency) { int status, i; - printk("%s\n", __func__); + //printk("%s\n", __func__); return 0; }