Merge c97004d65dc4bb3de0559d9e388dd00d2ccb6540 into 6b73faeee56da38ce46af3d7752da422cf3d38f9

This commit is contained in:
Neil 2016-07-10 21:19:22 +00:00 committed by GitHub
commit f928cc2c6f

View File

@ -670,10 +670,10 @@ static int read_ber(struct dvb_frontend *fe, u32 *ber)
default: default:
break; break;
} }
pr_info("mxl5xx: ber %08x %08x %08x %08x %08x %08x %08x\n", //pr_info("mxl5xx: ber %08x %08x %08x %08x %08x %08x %08x\n",
reg[0], reg[1], reg[2], reg[3], reg[4], reg[5], reg[6]); // reg[0], reg[1], reg[2], reg[3], reg[4], reg[5], reg[6]);
pr_info("mxl5xx: ber2 %08x %08x %08x %08x\n", //pr_info("mxl5xx: ber2 %08x %08x %08x %08x\n",
reg[0], reg[1], reg[2], reg[3]); // reg[0], reg[1], reg[2], reg[3]);
//pre_bit_error, pre_bit_count //pre_bit_error, pre_bit_count
//post_bit_error, post_bit_count; //post_bit_error, post_bit_count;
//block_error block_count; //block_error block_count;
@ -755,9 +755,9 @@ static int get_frontend(struct dvb_frontend *fe)
HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod); HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod);
mutex_unlock(&state->base->status_lock); mutex_unlock(&state->base->status_lock);
pr_info("mxl5xx: freq=%u delsys=%u srate=%u\n", //pr_info("mxl5xx: freq=%u delsys=%u srate=%u\n",
freq * 1000, regData[DMD_STANDARD_ADDR], // freq * 1000, regData[DMD_STANDARD_ADDR],
regData[DMD_SYMBOL_RATE_ADDR]); // regData[DMD_SYMBOL_RATE_ADDR]);
p->symbol_rate = regData[DMD_SYMBOL_RATE_ADDR]; p->symbol_rate = regData[DMD_SYMBOL_RATE_ADDR];
p->frequency = freq; p->frequency = freq;
//p->delivery_system = (MXL_HYDRA_BCAST_STD_E )regData[DMD_STANDARD_ADDR]; //p->delivery_system = (MXL_HYDRA_BCAST_STD_E )regData[DMD_STANDARD_ADDR];