From patchwork Tue Sep 7 15:50:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Boettcher X-Patchwork-Id: 161501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o87Fp8Tp008105 for ; Tue, 7 Sep 2010 15:51:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932080Ab0IGPvG (ORCPT ); Tue, 7 Sep 2010 11:51:06 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:33475 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932078Ab0IGPvF (ORCPT ); Tue, 7 Sep 2010 11:51:05 -0400 Received: by wyf22 with SMTP id 22so4384130wyf.19 for ; Tue, 07 Sep 2010 08:51:03 -0700 (PDT) Received: by 10.227.7.131 with SMTP id d3mr267109wbd.83.1283874653693; Tue, 07 Sep 2010 08:50:53 -0700 (PDT) Received: from localhost.localdomain (bny92-5-82-232-56-222.fbx.proxad.net [82.232.56.222]) by mx.google.com with ESMTPS id k15sm4267323wer.23.2010.09.07.08.50.51 (version=SSLv3 cipher=RC4-MD5); Tue, 07 Sep 2010 08:50:52 -0700 (PDT) From: pboettcher@kernellabs.com To: linux-media@vger.kernel.org Cc: Olivier Grenie , Patrick Boettcher Subject: [PATCH 2/2] V4L/DVB: dib7000p: add disable sample and hold, and diversity delay parameter Date: Tue, 7 Sep 2010 17:50:46 +0200 Message-Id: <1283874646-20770-2-git-send-email-Patrick.Boettcher@dibcom.fr> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283874646-20770-1-git-send-email-Patrick.Boettcher@dibcom.fr> References: <1283874646-20770-1-git-send-email-Patrick.Boettcher@dibcom.fr> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Sep 2010 15:51:08 +0000 (UTC) diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index f9766c7..6015cfd 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -956,6 +956,7 @@ static struct dib7000p_config dib7770p_dib7000p_config = { .hostbus_diversity = 1, .enable_current_mirror = 1, + .disable_sample_and_hold = 0, }; static int stk7770p_frontend_attach(struct dvb_usb_adapter *adap) diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 73f59ab..3aed0d4 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c @@ -260,6 +260,7 @@ static void dib7000p_set_adc_state(struct dib7000p_state *state, enum dibx000_ad // dprintk( "908: %x, 909: %x\n", reg_908, reg_909); + reg_909 |= (state->cfg.disable_sample_and_hold & 1) << 4; reg_908 |= (state->cfg.enable_current_mirror & 1) << 7; dib7000p_write_word(state, 908, reg_908); @@ -780,7 +781,10 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte default: case GUARD_INTERVAL_1_32: value *= 1; break; } - state->div_sync_wait = (value * 3) / 2 + 32; // add 50% SFN margin + compensate for one DVSY-fifo TODO + if (state->cfg.diversity_delay == 0) + state->div_sync_wait = (value * 3) / 2 + 48; // add 50% SFN margin + compensate for one DVSY-fifo + else + state->div_sync_wait = (value * 3) / 2 + state->cfg.diversity_delay; // add 50% SFN margin + compensate for one DVSY-fifo /* deactive the possibility of diversity reception if extended interleaver */ state->div_force_off = !1 && ch->u.ofdm.transmission_mode != TRANSMISSION_MODE_8K; diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h index 04a7449..da17345 100644 --- a/drivers/media/dvb/frontends/dib7000p.h +++ b/drivers/media/dvb/frontends/dib7000p.h @@ -33,8 +33,10 @@ struct dib7000p_config { int (*agc_control) (struct dvb_frontend *, u8 before); u8 output_mode; + u8 disable_sample_and_hold : 1; u8 enable_current_mirror : 1; + u8 diversity_delay; };