From patchwork Wed Apr 14 07:31:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitri Belimov X-Patchwork-Id: 92340 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3E7TPdF005298 for ; Wed, 14 Apr 2010 07:29:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753195Ab0DNH2w (ORCPT ); Wed, 14 Apr 2010 03:28:52 -0400 Received: from mail-ew0-f220.google.com ([209.85.219.220]:40308 "EHLO mail-ew0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753208Ab0DNH2v (ORCPT ); Wed, 14 Apr 2010 03:28:51 -0400 Received: by ewy20 with SMTP id 20so2945235ewy.1 for ; Wed, 14 Apr 2010 00:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:x-mailer:mime-version:content-type; bh=0FSdzHlWU1/S4OlWToxtCMbhS2xrPe1VdF/1V3/xvvw=; b=wH27CgtwhcWPVfOzU/a5EaJekF93Ad7ecGA8Mlm1wQpp70H2rpZWdsHdyOdQBEQmV0 U9aCzJ/iZGbOdHq3DYYjZ1An4pYTnvhi+oTUgTksLGo9swsiiLkoZiYYgYcAMqY0iYbO NmF+wpM536dYKwYOlcaqUlpxXaLu+nSfIF4hs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:x-mailer:mime-version:content-type; b=lwcnYcOqZUKuctDTqDugjChXIWoDCTn+TJf0gDcTW3JVW5sJC2ngeCX5WnVL6DQJ35 N37OIccWTmTUTvd4e7Kb+/RktKJ+bZ+lmLW3N5Fdz4dwv44tUJtgQUoAu2Y8W04VAeqF BvUWOpF5U16hrvXJsy5yZnlFX1Ns0P6ah68Rs= Received: by 10.213.40.80 with SMTP id j16mr3717335ebe.18.1271230128279; Wed, 14 Apr 2010 00:28:48 -0700 (PDT) Received: from glory.loctelecom.ru (ns2.openhardware.ru [84.19.183.172]) by mx.google.com with ESMTPS id 15sm30886ewy.0.2010.04.14.00.28.45 (version=SSLv3 cipher=RC4-MD5); Wed, 14 Apr 2010 00:28:47 -0700 (PDT) Date: Wed, 14 Apr 2010 17:31:02 +1000 From: Dmitri Belimov To: linux-media@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH] tm6000, moving cards name defines Message-ID: <20100414173102.58b0f184@glory.loctelecom.ru> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.16.1; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 14 Apr 2010 07:29:26 +0000 (UTC) diff -r 7c0b887911cf linux/drivers/staging/tm6000/tm6000-cards.c --- a/linux/drivers/staging/tm6000/tm6000-cards.c Mon Apr 05 22:56:43 2010 -0400 +++ b/linux/drivers/staging/tm6000/tm6000-cards.c Wed Apr 14 11:18:03 2010 +1000 @@ -35,22 +35,6 @@ #include "tuner-xc2028.h" #include "xc5000.h" -#define TM6000_BOARD_UNKNOWN 0 -#define TM5600_BOARD_GENERIC 1 -#define TM6000_BOARD_GENERIC 2 -#define TM6010_BOARD_GENERIC 3 -#define TM5600_BOARD_10MOONS_UT821 4 -#define TM5600_BOARD_10MOONS_UT330 5 -#define TM6000_BOARD_ADSTECH_DUAL_TV 6 -#define TM6000_BOARD_FREECOM_AND_SIMILAR 7 -#define TM6000_BOARD_ADSTECH_MINI_DUAL_TV 8 -#define TM6010_BOARD_HAUPPAUGE_900H 9 -#define TM6010_BOARD_BEHOLD_WANDER 10 -#define TM6010_BOARD_BEHOLD_VOYAGER 11 -#define TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE 12 -#define TM6010_BOARD_TWINHAN_TU501 13 - -#define TM6000_MAXBOARDS 16 static unsigned int card[] = {[0 ... (TM6000_MAXBOARDS - 1)] = UNSET }; module_param_array(card, int, NULL, 0444); diff -r 7c0b887911cf linux/drivers/staging/tm6000/tm6000.h --- a/linux/drivers/staging/tm6000/tm6000.h Mon Apr 05 22:56:43 2010 -0400 +++ b/linux/drivers/staging/tm6000/tm6000.h Wed Apr 14 11:18:03 2010 +1000 @@ -41,6 +41,23 @@ #include "dmxdev.h" #define TM6000_VERSION KERNEL_VERSION(0, 0, 2) + +#define TM6000_BOARD_UNKNOWN 0 +#define TM5600_BOARD_GENERIC 1 +#define TM6000_BOARD_GENERIC 2 +#define TM6010_BOARD_GENERIC 3 +#define TM5600_BOARD_10MOONS_UT821 4 +#define TM5600_BOARD_10MOONS_UT330 5 +#define TM6000_BOARD_ADSTECH_DUAL_TV 6 +#define TM6000_BOARD_FREECOM_AND_SIMILAR 7 +#define TM6000_BOARD_ADSTECH_MINI_DUAL_TV 8 +#define TM6010_BOARD_HAUPPAUGE_900H 9 +#define TM6010_BOARD_BEHOLD_WANDER 10 +#define TM6010_BOARD_BEHOLD_VOYAGER 11 +#define TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE 12 +#define TM6010_BOARD_TWINHAN_TU501 13 + +#define TM6000_MAXBOARDS 16 /* Inputs */ Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov