From patchwork Wed Apr 4 11:47:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 10576 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SFOhc-00076R-BD for patchwork@linuxtv.org; Wed, 04 Apr 2012 13:48:40 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SFOhb-0005ca-DY; Wed, 04 Apr 2012 13:48:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756151Ab2DDLsg (ORCPT ); Wed, 4 Apr 2012 07:48:36 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:64612 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755807Ab2DDLsf (ORCPT ); Wed, 4 Apr 2012 07:48:35 -0400 Received: by eekc41 with SMTP id c41so62294eek.19 for ; Wed, 04 Apr 2012 04:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=EoYZbu4zTxUHWGjoToeEs6KV+vjGQx+lF5gUd5zVD80=; b=qx6JspLtB3vOW5ropws4y9mUsY3Z3le9VJ/TrPq4QqXtM17YZAiOEoWb67oc7S9Clr ZaA6Zy19hg09YPCI/n2PS2PVanRHDleooJia/Lq0TXucdep4OxpGyQd6XV2DvtN4UFvm LNIgyGKKWfsrL4iPl6jgqvuH2o3/UGkyU1kPTS0h9L0C8UcnyBUGhC4LtgbCdBoE466b wfqz4XQUX0LbOJJePOOSED21RwCfY4QwZAh9sNJSAw9BlhvYGZ7zuHmi31fuydzVCb4f 5MZ6VpWj82P90QF7gJWccj648WBaCgbzyp7LcnvtY1Aq9o9qPsmuGCysFQmtJhET0q1n uzUg== Received: by 10.14.98.143 with SMTP id v15mr3049455eef.90.1333540114455; Wed, 04 Apr 2012 04:48:34 -0700 (PDT) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPS id x8sm1504520eea.10.2012.04.04.04.48.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Apr 2012 04:48:33 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, crope@iki.fi Cc: m@bues.ch, hfvogt@gmx.net, mchehab@redhat.com, Gianluca Gennari Subject: [PATCH] af9035: add several new USB IDs Date: Wed, 4 Apr 2012 13:47:14 +0200 Message-Id: <1333540034-14002-1-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.7.5.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.4.4.113618 X-PMX-Spam: Gauge=XI, Probability=11%, Report=' HASHBUSTER_BLOCK_V2 0.5, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, LINES_OF_YELLING_3 0.05, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HASHBUSTER_BLOCK_V2_1 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NS ' Add several new USB IDs extracted from the Windows and Linux drivers published by the manufacturers (Terratec and AVerMedia). Terratec Cinergy T Stick rev. 2 (tua9001): http://linux.terratec.de/tv_en.html AVerMedia AverTV TwinStar A825 (2 x mxl5007t): http://www.avermedia.com/Support/DownloadCount.aspx?FDFId=3145 AVerMedia A835 (tda18218): http://www.avermedia.com/Support/DownloadCount.aspx?FDFId=4528 Afatech Sticks and AVerMedia A867 (mxl5007t): http://www.avermedia.com/Support/DownloadCount.aspx?FDFId=5172 http://www.avermedia.com/Support/DownloadCount.aspx?FDFId=5171 http://www.avermedia.com/Support/DownloadCount.aspx?FDFId=4591 (Linux driver) The AVerMedia A825 is a dual tuner stick that was reported as fully working on the OpenPli forum, using a modified version of the old af9035 driver: http://openpli.org/forums/topic/22295-is-the-avertv-twinstar-a825-dvb-t-usb-twin-tuner-supported-by-the-newest-openpli/page__view__findpost__p__254634 so I think it should work also on the new driver version, at least in single-tuner mode. Signed-off-by: Gianluca Gennari --- drivers/media/dvb/dvb-usb/af9035.c | 60 +++++++++++++++++++++++++++++- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 15 +++++++- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/dvb/dvb-usb/af9035.c index 26b4ead..e2107cd 100644 --- a/drivers/media/dvb/dvb-usb/af9035.c +++ b/drivers/media/dvb/dvb-usb/af9035.c @@ -821,29 +821,68 @@ err: enum af9035_id_entry { AF9035_0CCD_0093, + AF9035_0CCD_00AA, AF9035_15A4_9035, + AF9035_15A4_1000, AF9035_15A4_1001, + AF9035_15A4_1002, + AF9035_15A4_1003, + AF9035_07CA_0825, + AF9035_07CA_A825, + AF9035_07CA_0835, AF9035_07CA_A835, AF9035_07CA_B835, + AF9035_07CA_A333, + AF9035_07CA_0337, + AF9035_07CA_F337, + AF9035_07CA_0867, AF9035_07CA_1867, + AF9035_07CA_3867, AF9035_07CA_A867, + AF9035_07CA_B867, }; static struct usb_device_id af9035_id[] = { [AF9035_0CCD_0093] = { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)}, + [AF9035_0CCD_00AA] = { + USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_2)}, [AF9035_15A4_9035] = { USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)}, - [AF9035_15A4_1001] = { + [AF9035_15A4_1000] = { USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)}, + [AF9035_15A4_1001] = { + USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_3)}, + [AF9035_15A4_1002] = { + USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_4)}, + [AF9035_15A4_1003] = { + USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_5)}, + [AF9035_07CA_0825] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_0825)}, + [AF9035_07CA_A825] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A825)}, + [AF9035_07CA_0835] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_0835)}, [AF9035_07CA_A835] = { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A835)}, [AF9035_07CA_B835] = { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_B835)}, + [AF9035_07CA_A333] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A333)}, + [AF9035_07CA_0337] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_0337)}, + [AF9035_07CA_F337] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_F337)}, + [AF9035_07CA_0867] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_0867)}, [AF9035_07CA_1867] = { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_1867)}, + [AF9035_07CA_3867] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_3867)}, [AF9035_07CA_A867] = { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A867)}, + [AF9035_07CA_B867] = { + USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_B867)}, {}, }; @@ -886,30 +925,47 @@ static struct dvb_usb_device_properties af9035_properties[] = { .i2c_algo = &af9035_i2c_algo, - .num_device_descs = 4, + .num_device_descs = 5, .devices = { { .name = "TerraTec Cinergy T Stick", .cold_ids = { &af9035_id[AF9035_0CCD_0093], + &af9035_id[AF9035_0CCD_00AA], }, }, { .name = "Afatech Technologies DVB-T stick", .cold_ids = { &af9035_id[AF9035_15A4_9035], + &af9035_id[AF9035_15A4_1000], &af9035_id[AF9035_15A4_1001], + &af9035_id[AF9035_15A4_1002], + &af9035_id[AF9035_15A4_1003], + }, + }, { + .name = "AVerMedia AVerTV TwinStar (A825)", + .cold_ids = { + &af9035_id[AF9035_07CA_0825], + &af9035_id[AF9035_07CA_A825], }, }, { .name = "AVerMedia AVerTV Volar HD/PRO (A835)", .cold_ids = { + &af9035_id[AF9035_07CA_0835], &af9035_id[AF9035_07CA_A835], &af9035_id[AF9035_07CA_B835], }, }, { .name = "AVerMedia HD Volar (A867)", .cold_ids = { + &af9035_id[AF9035_07CA_A333], + &af9035_id[AF9035_07CA_0337], + &af9035_id[AF9035_07CA_F337], + &af9035_id[AF9035_07CA_0867], &af9035_id[AF9035_07CA_1867], + &af9035_id[AF9035_07CA_3867], &af9035_id[AF9035_07CA_A867], + &af9035_id[AF9035_07CA_B867], }, }, } diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 6a761c5..b7e46c7 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -77,7 +77,10 @@ #define USB_PID_AFATECH_AF9015_9015 0x9015 #define USB_PID_AFATECH_AF9015_9016 0x9016 #define USB_PID_AFATECH_AF9035 0x9035 -#define USB_PID_AFATECH_AF9035_2 0x1001 +#define USB_PID_AFATECH_AF9035_2 0x1000 +#define USB_PID_AFATECH_AF9035_3 0x1001 +#define USB_PID_AFATECH_AF9035_4 0x1002 +#define USB_PID_AFATECH_AF9035_5 0x1003 #define USB_PID_TREKSTOR_DVBT 0x901b #define USB_VID_ALINK_DTU 0xf170 #define USB_PID_ANSONIC_DVBT_USB 0x6000 @@ -155,6 +158,7 @@ #define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055 #define USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2 0x0069 #define USB_PID_TERRATEC_CINERGY_T_STICK 0x0093 +#define USB_PID_TERRATEC_CINERGY_T_STICK_2 0x00aa #define USB_PID_TERRATEC_CINERGY_T_STICK_RC 0x0097 #define USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC 0x0099 #define USB_PID_TWINHAN_VP7041_COLD 0x3201 @@ -224,10 +228,19 @@ #define USB_PID_AVERMEDIA_A850T 0x850b #define USB_PID_AVERMEDIA_A805 0xa805 #define USB_PID_AVERMEDIA_A815M 0x815a +#define USB_PID_AVERMEDIA_0825 0x0825 +#define USB_PID_AVERMEDIA_A825 0xa825 +#define USB_PID_AVERMEDIA_0835 0x0835 #define USB_PID_AVERMEDIA_A835 0xa835 #define USB_PID_AVERMEDIA_B835 0xb835 +#define USB_PID_AVERMEDIA_A333 0xa333 +#define USB_PID_AVERMEDIA_0337 0x0337 +#define USB_PID_AVERMEDIA_F337 0xf337 +#define USB_PID_AVERMEDIA_0867 0x0867 #define USB_PID_AVERMEDIA_1867 0x1867 +#define USB_PID_AVERMEDIA_3867 0x3867 #define USB_PID_AVERMEDIA_A867 0xa867 +#define USB_PID_AVERMEDIA_B867 0xb867 #define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 #define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a