From patchwork Tue Dec 23 20:49:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 5534941 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9404EBEEA8 for ; Tue, 23 Dec 2014 20:50:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAB1920121 for ; Tue, 23 Dec 2014 20:50:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B40992011D for ; Tue, 23 Dec 2014 20:50:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756666AbaLWUuh (ORCPT ); Tue, 23 Dec 2014 15:50:37 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:58303 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756645AbaLWUue (ORCPT ); Tue, 23 Dec 2014 15:50:34 -0500 Received: from dyn3-82-128-190-202.psoas.suomi.net ([82.128.190.202] helo=localhost.localdomain.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Y3WPY-0004tE-NZ; Tue, 23 Dec 2014 22:50:32 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari Subject: [PATCH 40/66] rtl28xxu: add support for RTL2832U/RTL2832 PID filter Date: Tue, 23 Dec 2014 22:49:33 +0200 Message-Id: <1419367799-14263-40-git-send-email-crope@iki.fi> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1419367799-14263-1-git-send-email-crope@iki.fi> References: <1419367799-14263-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.190.202 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP RTL2832 demod integrated into RTL2832U has PID filter. PID filtering is provided by rtl2832 demod driver. Add support for it. Signed-off-by: Antti Palosaari --- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c index ef27ad0..c64b5ed 100644 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c @@ -1599,7 +1599,7 @@ static int rtl2832u_get_rc_config(struct dvb_usb_device *d, #define rtl2832u_get_rc_config NULL #endif -static int rtl28xxu_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff) +static int rtl2831u_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff) { struct dvb_usb_device *d = adap_to_d(adap); struct rtl28xxu_priv *priv = d_to_priv(d); @@ -1608,7 +1608,16 @@ static int rtl28xxu_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff) return pdata->pid_filter_ctrl(adap->fe[0], onoff); } -static int rtl28xxu_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff) +static int rtl2832u_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff) +{ + struct dvb_usb_device *d = adap_to_d(adap); + struct rtl28xxu_priv *priv = d_to_priv(d); + struct rtl2832_platform_data *pdata = &priv->rtl2832_platform_data; + + return pdata->pid_filter_ctrl(adap->fe[0], onoff); +} + +static int rtl2831u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff) { struct dvb_usb_device *d = adap_to_d(adap); struct rtl28xxu_priv *priv = d_to_priv(d); @@ -1617,6 +1626,15 @@ static int rtl28xxu_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, return pdata->pid_filter(adap->fe[0], index, pid, onoff); } +static int rtl2832u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff) +{ + struct dvb_usb_device *d = adap_to_d(adap); + struct rtl28xxu_priv *priv = d_to_priv(d); + struct rtl2832_platform_data *pdata = &priv->rtl2832_platform_data; + + return pdata->pid_filter(adap->fe[0], index, pid, onoff); +} + static const struct dvb_usb_device_properties rtl2831u_props = { .driver_name = KBUILD_MODNAME, .owner = THIS_MODULE, @@ -1639,8 +1657,8 @@ static const struct dvb_usb_device_properties rtl2831u_props = { DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, .pid_filter_count = 32, - .pid_filter_ctrl = rtl28xxu_pid_filter_ctrl, - .pid_filter = rtl28xxu_pid_filter, + .pid_filter_ctrl = rtl2831u_pid_filter_ctrl, + .pid_filter = rtl2831u_pid_filter, .stream = DVB_USB_STREAM_BULK(0x81, 6, 8 * 512), }, @@ -1667,6 +1685,13 @@ static const struct dvb_usb_device_properties rtl2832u_props = { .num_adapters = 1, .adapter = { { + .caps = DVB_USB_ADAP_HAS_PID_FILTER | + DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, + + .pid_filter_count = 32, + .pid_filter_ctrl = rtl2832u_pid_filter_ctrl, + .pid_filter = rtl2832u_pid_filter, + .stream = DVB_USB_STREAM_BULK(0x81, 6, 8 * 512), }, },