From patchwork Mon Oct 31 16:24:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 8254 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RKugN-0003tv-UF; Mon, 31 Oct 2011 17:26:05 +0100 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 id 1RKugN-0001y5-E5; Mon, 31 Oct 2011 17:25:55 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754575Ab1JaQZt (ORCPT + 3 others); Mon, 31 Oct 2011 12:25:49 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:58562 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753823Ab1JaQZs (ORCPT ); Mon, 31 Oct 2011 12:25:48 -0400 Received: by mail-ey0-f174.google.com with SMTP id 27so5444327eye.19 for ; Mon, 31 Oct 2011 09:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=K0RlO7xDvzIedmscZFdVgrdkP6gtTLP5M6nIedFMsvE=; b=kNEWKj63gdZIgYKds11DUhrN9dAVFPggv45m905vtfoy4GtSb/dfqPFjCP13bLokuX XsDwip4hg8D5cLfde73xnQdT4+afErM5VVG2jAtSxsd5o1ABaW1vyQMdTEFGTg7IAAeg tsN/lUHQ0pQw00iJYHRIjce2ghIn//BhhSFHU= Received: by 10.14.9.198 with SMTP id 46mr1313297eet.176.1320078347669; Mon, 31 Oct 2011 09:25:47 -0700 (PDT) Received: from localhost.localdomain (84-dzi-26.acn.waw.pl. [85.222.29.84]) by mx.google.com with ESMTPS id z58sm52444586eea.3.2011.10.31.09.25.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 31 Oct 2011 09:25:47 -0700 (PDT) From: Sylwester Nawrocki To: devel@driverdev.osuosl.org, linux-media@vger.kernel.org Cc: Piotr Chmura , Devin Heitmueller , Mauro Carvalho Chehab , Sylwester Nawrocki , Stefan Richter , Greg KH Subject: [PATCH 09/17] staging: as102: Add Elgato EyeTV DTT Deluxe Date: Mon, 31 Oct 2011 17:24:47 +0100 Message-Id: <1320078295-3379-10-git-send-email-snjw23@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1320078295-3379-1-git-send-email-snjw23@gmail.com> References: <1320078295-3379-1-git-send-email-snjw23@gmail.com> 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: 2011.10.31.161514 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 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, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -4.2 (----) X-LSpam-Report: No, score=-4.2 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_MED=-2.3, T_DKIM_INVALID=0.01 autolearn=ham From: Devin Heitmueller Add support for the Elgato EyeTV DTT Deluxe. Note that the product name field has not yet been abstracted out, so it will still identify itself as a PCTV 74e. The driver was originally built by the chipset manufacturer so that the product vendor can specify the device name via a #define, but wasn't setup to support multiple products from the same build of the driver. Thanks to Joerg Unglaub for suggesting this change. Suggested-by: Joerg Unglaub Signed-off-by: Devin Heitmueller Signed-off-by: Piotr Chmura Signed-off-by: Sylwester Nawrocki --- drivers/staging/media/as102/as102_usb_drv.c | 1 + drivers/staging/media/as102/as102_usb_drv.h | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c index 6e79719..d749e06 100644 --- a/drivers/staging/media/as102/as102_usb_drv.c +++ b/drivers/staging/media/as102/as102_usb_drv.c @@ -40,6 +40,7 @@ static int as102_release(struct inode *inode, struct file *file); static struct usb_device_id as102_usb_id_table[] = { { USB_DEVICE(AS102_USB_DEVICE_VENDOR_ID, AS102_USB_DEVICE_PID_0001) }, { USB_DEVICE(PCTV_74E_USB_VID, PCTV_74E_USB_PID) }, + { USB_DEVICE(ELGATO_EYETV_DTT_USB_VID, ELGATO_EYETV_DTT_USB_PID) }, { } /* Terminating entry */ }; diff --git a/drivers/staging/media/as102/as102_usb_drv.h b/drivers/staging/media/as102/as102_usb_drv.h index 3abab6c..a81a895 100644 --- a/drivers/staging/media/as102/as102_usb_drv.h +++ b/drivers/staging/media/as102/as102_usb_drv.h @@ -36,6 +36,11 @@ #define PCTV_74E_USB_VID 0x2013 #define PCTV_74E_USB_PID 0x0246 +/* Elgato: EyeTV DTT Deluxe */ +#define ELGATO_EYETV_DTT_NAME "Elgato EyeTV DTT Deluxe" +#define ELGATO_EYETV_DTT_USB_VID 0x0fd9 +#define ELGATO_EYETV_DTT_USB_PID 0x002c + #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)) void as102_urb_stream_irq(struct urb *urb, struct pt_regs *regs); #else