From patchwork Thu Oct 14 19:03:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: VDRU VDRU X-Patchwork-Id: 4607 Return-path: Envelope-to: mchehab@pedra Delivery-date: Thu, 14 Oct 2010 16:04:14 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1P6T64-00038R-W9 for mchehab@pedra; Thu, 14 Oct 2010 16:04:14 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 14 Oct 2010 16:04:12 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P6T5W-0000q1-64; Thu, 14 Oct 2010 19:03:38 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755797Ab0JNTDZ (ORCPT + 1 other); Thu, 14 Oct 2010 15:03:25 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:39819 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755679Ab0JNTDY (ORCPT ); Thu, 14 Oct 2010 15:03:24 -0400 Received: by pvc7 with SMTP id 7so615871pvc.19 for ; Thu, 14 Oct 2010 12:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type; bh=+pPCmVAuNxyHE1PzQW2vSPpuwij975tSTkex1Com3XA=; b=cqZd4nL6IcsrhurOTv4O1NpYSAUjJ2c2MgnKRCv4D14Mmp2xcPCNIagXSOj0bSa8On z3zizvp+znhfLvWRkrYNx/kGCsCNlBt0+wy/XgHqCidICMEtpBQri3/KO+x/XKllvmpO bIJ549qOKDdd88EZPwhlJ/ybVVuB8PbpdRaJ8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type; b=DlLx/GS02HW4e3r7JJSGPe9A7H0XuVWHu7ldyiO9L5ayXLDJBlz6YvaPHx7LlSUviY kC4Hg6L27ww7lF97GLJNvb2A4dqA2seT7Jh6rIcVYpicq0oskoMeyoU5xRh1NdOpQmdf rtOAslypXe+RZySsG+lK2YpxKguto8ecNoVOg= Received: by 10.142.114.11 with SMTP id m11mr1223001wfc.143.1287083004118; Thu, 14 Oct 2010 12:03:24 -0700 (PDT) Received: from [192.168.0.4] (174-24-140-227.tukw.qwest.net [174.24.140.227]) by mx.google.com with ESMTPS id y42sm7969731wfd.10.2010.10.14.12.03.18 (version=SSLv3 cipher=RC4-MD5); Thu, 14 Oct 2010 12:03:20 -0700 (PDT) Message-ID: <4CB753F2.7080009@gmail.com> Date: Thu, 14 Oct 2010 12:03:14 -0700 From: "D. K." User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.9) Gecko/20100915 Thunderbird/3.1.4 MIME-Version: 1.0 To: linux-media@vger.kernel.org CC: alannisota@gmail.com Subject: [PATCH] gp8psk: Add support for the Genpix Skywalker-2 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: gp8psk: Add support for the Genpix Skywalker-2 per user requests. Patched against v4l-dvb hg ab433502e041 tip. Should patch fine against git as well. Signed-off-by: Derek Kelly ---------- diff -pruN v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h v4l-dvb/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h --- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-08-17 09:53:27.000000000 -0700 +++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-08-17 10:38:48.000000000 -0700 @@ -267,6 +267,7 @@ #define USB_PID_GENPIX_8PSK_REV_2 0x0202 #define USB_PID_GENPIX_SKYWALKER_1 0x0203 #define USB_PID_GENPIX_SKYWALKER_CW3K 0x0204 +#define USB_PID_GENPIX_SKYWALKER_2 0x0206 #define USB_PID_SIGMATEK_DVB_110 0x6610 #define USB_PID_MSI_DIGI_VOX_MINI_II 0x1513 #define USB_PID_MSI_DIGIVOX_DUO 0x8801 diff -pruN v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/gp8psk.c v4l-dvb/linux/drivers/media/dvb/dvb-usb/gp8psk.c --- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/gp8psk.c 2010-08-17 09:53:27.000000000 -0700 +++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/gp8psk.c 2010-08-17 10:42:33.000000000 -0700 @@ -227,6 +227,7 @@ static struct usb_device_id gp8psk_usb_t { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_WARM) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_2) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_1) }, + { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_2) }, /* { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_CW3K) }, */ { 0 }, }; @@ -258,7 +259,7 @@ static struct dvb_usb_device_properties .generic_bulk_ctrl_endpoint = 0x01, - .num_device_descs = 3, + .num_device_descs = 4, .devices = { { .name = "Genpix 8PSK-to-USB2 Rev.1 DVB-S receiver", .cold_ids = { &gp8psk_usb_table[0], NULL }, @@ -272,10 +273,14 @@ static struct dvb_usb_device_properties .cold_ids = { NULL }, .warm_ids = { &gp8psk_usb_table[3], NULL }, }, + { .name = "Genpix SkyWalker-2 DVB-S receiver", + .cold_ids = { NULL }, + .warm_ids = { &gp8psk_usb_table[4], NULL }, + }, #if 0 { .name = "Genpix SkyWalker-CW3K DVB-S receiver", .cold_ids = { NULL }, - .warm_ids = { &gp8psk_usb_table[4], NULL }, + .warm_ids = { &gp8psk_usb_table[5], NULL }, }, #endif { NULL }, diff -pruN v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h v4l-dvb/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h --- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-08-17 09:53:27.000000000 -0700 +++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-08-17 10:38:48.000000000 -0700 @@ -267,6 +267,7 @@ #define USB_PID_GENPIX_8PSK_REV_2 0x0202 #define USB_PID_GENPIX_SKYWALKER_1 0x0203 #define USB_PID_GENPIX_SKYWALKER_CW3K 0x0204 +#define USB_PID_GENPIX_SKYWALKER_2 0x0206 #define USB_PID_SIGMATEK_DVB_110 0x6610 #define USB_PID_MSI_DIGI_VOX_MINI_II 0x1513 #define USB_PID_MSI_DIGIVOX_DUO 0x8801 diff -pruN v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/gp8psk.c v4l-dvb/linux/drivers/media/dvb/dvb-usb/gp8psk.c --- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/gp8psk.c 2010-08-17 09:53:27.000000000 -0700 +++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/gp8psk.c 2010-08-17 10:42:33.000000000 -0700 @@ -227,6 +227,7 @@ static struct usb_device_id gp8psk_usb_t { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_WARM) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_2) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_1) }, + { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_2) }, /* { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_CW3K) }, */ { 0 }, }; @@ -258,7 +259,7 @@ static struct dvb_usb_device_properties .generic_bulk_ctrl_endpoint = 0x01, - .num_device_descs = 3, + .num_device_descs = 4, .devices = { { .name = "Genpix 8PSK-to-USB2 Rev.1 DVB-S receiver", .cold_ids = { &gp8psk_usb_table[0], NULL }, @@ -272,10 +273,14 @@ static struct dvb_usb_device_properties .cold_ids = { NULL }, .warm_ids = { &gp8psk_usb_table[3], NULL }, }, + { .name = "Genpix SkyWalker-2 DVB-S receiver", + .cold_ids = { NULL }, + .warm_ids = { &gp8psk_usb_table[4], NULL }, + }, #if 0 { .name = "Genpix SkyWalker-CW3K DVB-S receiver", .cold_ids = { NULL }, - .warm_ids = { &gp8psk_usb_table[4], NULL }, + .warm_ids = { &gp8psk_usb_table[5], NULL }, }, #endif { NULL },