Message ID | 4B69DE57.4030509@arcor.de (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Return-path: <linux-media-owner@vger.kernel.org> Envelope-to: mchehab@infradead.org Delivery-date: Wed, 03 Feb 2010 20:37:14 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for <mchehab@localhost> (single-drop); Wed, 03 Feb 2010 18:41:05 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NclyM-0008AK-L0; Wed, 03 Feb 2010 20:37:14 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932672Ab0BCUhM (ORCPT <rfc822;kmpark@infradead.org> + 1 other); Wed, 3 Feb 2010 15:37:12 -0500 Received: from mail-in-09.arcor-online.net ([151.189.21.49]:42521 "EHLO mail-in-09.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932343Ab0BCUhL (ORCPT <rfc822;linux-media@vger.kernel.org>); Wed, 3 Feb 2010 15:37:11 -0500 Received: from mail-in-01-z2.arcor-online.net (mail-in-01-z2.arcor-online.net [151.189.8.13]) by mx.arcor.de (Postfix) with ESMTP id 7DD441AF940; Wed, 3 Feb 2010 21:37:09 +0100 (CET) Received: from mail-in-06.arcor-online.net (mail-in-06.arcor-online.net [151.189.21.46]) by mail-in-01-z2.arcor-online.net (Postfix) with ESMTP id 73FD92BFB6E; Wed, 3 Feb 2010 21:37:09 +0100 (CET) Received: from [192.168.2.102] (dslb-188-103-200-201.pools.arcor-ip.net [188.103.200.201]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-06.arcor-online.net (Postfix) with ESMTPA id 284DB39A3B7; Wed, 3 Feb 2010 21:37:09 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-06.arcor-online.net 284DB39A3B7 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1265229429; bh=YM9ZS1P/xNalRhVhiunH7Gk0obyxzcqiU+Z5iq0lbl4=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=rBOP/4OkDPTfClaQ9lwQ1qtWbISzyWB+NrLJGV35kmKSBdAw6/2TlZePzuBDEuv/u 0hXc+U0LrIYh3hxnJtOan4eUPUrdOKrNxCDH1Thw2mtXGxheIOmQHG1Qcz1Rgx98N+ QpkwfsJwqnHAejh4LG7iQVdZ5MOkD5Ptxm0CNvB8= Message-ID: <4B69DE57.4030509@arcor.de> Date: Wed, 03 Feb 2010 21:36:39 +0100 From: Stefan Ringel <stefan.ringel@arcor.de> User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 MIME-Version: 1.0 To: Mauro Carvalho Chehab <mchehab@redhat.com> CC: linux-media@vger.kernel.org, Devin Heitmueller <dheitmueller@kernellabs.com> Subject: [PATCH 13/15] - xc2028 bugfix for firmware 3.6 -> Zarlink use without shift in DTV8 or DTV78 References: <4B673790.3030706@arcor.de> <4B673B2D.6040507@arcor.de> <4B675B19.3080705@redhat.com> <4B685FB9.1010805@arcor.de> <4B688507.606@redhat.com> <4B688E41.2050806@arcor.de> <4B689094.2070204@redhat.com> <4B6894FE.6010202@arcor.de> <4B69D83D.5050809@arcor.de> <4B69D8CC.2030008@arcor.de> In-Reply-To: <4B69D8CC.2030008@arcor.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Stefan Ringel
Feb. 3, 2010, 8:36 p.m. UTC
signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
* Thanks to Terry Wu <terrywu2009@gmail.com> for reporting this
@@ -1123,8 +1135,8 @@ static int xc2028_set_params(struct dvb_frontend *fe,
* use this firmware after initialization, but a tune to a UHF
* channel should then cause DTV78 to be used.
*/
- if (type & DTV7)
- demod += 500;
+ if (type & DTV7)
+ demod += 500;
}
return generic_set_freq(fe, p->frequency,
@@ -1240,6 +1252,10 @@ static const struct dvb_tuner_ops
xc2028_dvb_tuner_ops = {
.get_rf_strength = xc2028_signal,
.set_params = xc2028_set_params,
.sleep = xc2028_sleep,
+#if 0
+ int (*get_bandwidth)(struct dvb_frontend *fe, u32 *bandwidth);
+ int (*get_status)(struct dvb_frontend *fe, u32 *status);
+#endif
};
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Comments
On Wed, Feb 3, 2010 at 3:36 PM, Stefan Ringel <stefan.ringel@arcor.de> wrote: > signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> > --- a/drivers/media/common/tuners/tuner-xc2028.c > +++ b/drivers/media/common/tuners/tuner-xc2028.c > @@ -1114,7 +1122,11 @@ static int xc2028_set_params(struct dvb_frontend *fe, > > /* All S-code tables need a 200kHz shift */ > if (priv->ctrl.demod) { > - demod = priv->ctrl.demod + 200; > + if ((priv->ctrl.fname == "xc3028L-v36.fw") && (priv->ctrl.demod > == XC3028_FE_ZARLINK456) && ((type & DTV78) | (type & DTV8)) ) { > + demod = priv->ctrl.demod; > + } else { > + demod = priv->ctrl.demod + 200; > + } > /* > * The DTV7 S-code table needs a 700 kHz shift. > * Thanks to Terry Wu <terrywu2009@gmail.com> for reporting this > @@ -1123,8 +1135,8 @@ static int xc2028_set_params(struct dvb_frontend *fe, > * use this firmware after initialization, but a tune to a UHF > * channel should then cause DTV78 to be used. > */ > - if (type & DTV7) > - demod += 500; > + if (type & DTV7) > + demod += 500; > } Independent of the validity of this patch, you should not be submitting patches that have a mix of whitespace changes and actual changes. In the above case (the if type & DTV7 part), it looks like these shouldn't have been included at all since it makes no functional change. It sounds like a nit-pick, but the reality is that its inclusion had me staring at it for 30 seconds trying to figure out whether there was an *actual* difference there or if it was purely whitespace. > > return generic_set_freq(fe, p->frequency, > @@ -1240,6 +1252,10 @@ static const struct dvb_tuner_ops > xc2028_dvb_tuner_ops = { > .get_rf_strength = xc2028_signal, > .set_params = xc2028_set_params, > .sleep = xc2028_sleep, > +#if 0 > + int (*get_bandwidth)(struct dvb_frontend *fe, u32 *bandwidth); > + int (*get_status)(struct dvb_frontend *fe, u32 *status); > +#endif > }; Likewise, you should not be including unrelated changes in patches - the above "#if 0" section not only is never compiled in to the code (presumably it is debug code), but it has nothing to do with the fix this patch is claiming to address. Devin
--- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c @@ -1114,7 +1122,11 @@ static int xc2028_set_params(struct dvb_frontend *fe, /* All S-code tables need a 200kHz shift */ if (priv->ctrl.demod) { - demod = priv->ctrl.demod + 200; + if ((priv->ctrl.fname == "xc3028L-v36.fw") && (priv->ctrl.demod == XC3028_FE_ZARLINK456) && ((type & DTV78) | (type & DTV8)) ) { + demod = priv->ctrl.demod; + } else { + demod = priv->ctrl.demod + 200; + } /* * The DTV7 S-code table needs a 700 kHz shift.