[PATCH 17/25] UBUNTU hardy-lum lpia branch sync

[Steve Conklin]

>From 882f89a7199aa51909093b6408e7ced7229d47d9 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri, 6 Mar 2009 12:25:17 -0500
Subject: [PATCH] UBUNTU: smsusb: add autodetection for devices based on the SMS1180 chipset
 OriginalAuthor: Michael Krufky <mkrufky at linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
---
 ubuntu/media/sms1xxx/sms-cards.c |   33 +++++++++++++++++++++++++++++++++
 ubuntu/media/sms1xxx/sms-cards.h |    5 +++++
 ubuntu/media/sms1xxx/smsusb.c    |   13 +++++++++++++
 3 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/ubuntu/media/sms1xxx/sms-cards.c b/ubuntu/media/sms1xxx/sms-cards.c
index b7ee193..787f169 100644
--- a/ubuntu/media/sms1xxx/sms-cards.c
+++ b/ubuntu/media/sms1xxx/sms-cards.c
@@ -72,6 +72,39 @@ static struct sms_board sms_boards[] = {
 		.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
 		.lna_ctrl  = -1,
 	},
+	[SMS1XXX_BOARD_HAUPPAUGE_CMMB] = {
+		.name	= "Hauppauge WinTV MiniStick (CMMB)",
+		.type	= SMS_VEGA,
+		.fw[DEVICE_MODE_CMMB] = "sms1xxx-hcw-114xxx-cmmb-01.fw",
+		.led_power = 21,
+		.led_lo    = 17,
+		.led_hi    = 15,
+	},
+	[SMS1XXX_BOARD_DELL_CMMB] = {
+		.name	= "Dell Digital TV Receiver",
+		.type	= SMS_VEGA,
+		.fw[DEVICE_MODE_CMMB] = "sms1xxx-hcw-114xxx-cmmb-01.fw",
+	},
+	[SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_CMMB] = {
+		.name	= "Hauppauge WinTV MiniCard (CMMB)",
+		.type	= SMS_VEGA,
+		.fw[DEVICE_MODE_CMMB] = "sms1xxx-hcw-114xxx-cmmb-01.fw",
+		.lna_ctrl  = 23,
+		.rf_switch = 25,
+	},
+	[SMS1XXX_BOARD_DELL_TIGER_MINICARD_CMMB_R1] = {
+		.name	= "Dell Digital TV Receiver",
+		.type	= SMS_VEGA,
+		.fw[DEVICE_MODE_CMMB] = "sms1xxx-hcw-114xxx-cmmb-01.fw",
+		.lna_ctrl  = 10,
+	},
+	[SMS1XXX_BOARD_DELL_TIGER_MINICARD_CMMB] = {
+		.name	= "Dell Digital TV Receiver",
+		.type	= SMS_VEGA,
+		.fw[DEVICE_MODE_CMMB] = "sms1xxx-hcw-114xxx-cmmb-01.fw",
+		.lna_ctrl  = 23,
+		.rf_switch = 25,
+	},
 };
 
 struct sms_board *sms_get_board(int id)
diff --git a/ubuntu/media/sms1xxx/sms-cards.h b/ubuntu/media/sms1xxx/sms-cards.h
index f2c2c3c..f607604 100644
--- a/ubuntu/media/sms1xxx/sms-cards.h
+++ b/ubuntu/media/sms1xxx/sms-cards.h
@@ -32,6 +32,11 @@
 #define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD 6
 #define SMS1XXX_BOARD_DELL_TIGER_MINICARD_R2 7
 #define SMS1XXX_BOARD_DELL_TIGER_MINICARD 8
+#define SMS1XXX_BOARD_HAUPPAUGE_CMMB 9
+#define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_CMMB 10
+#define SMS1XXX_BOARD_DELL_CMMB 11
+#define SMS1XXX_BOARD_DELL_TIGER_MINICARD_CMMB_R1 12
+#define SMS1XXX_BOARD_DELL_TIGER_MINICARD_CMMB 13
 
 struct sms_board {
 	enum sms_device_type_st type;
diff --git a/ubuntu/media/sms1xxx/smsusb.c b/ubuntu/media/sms1xxx/smsusb.c
index 86b8661..a15ea94 100644
--- a/ubuntu/media/sms1xxx/smsusb.c
+++ b/ubuntu/media/sms1xxx/smsusb.c
@@ -490,6 +490,19 @@ struct usb_device_id smsusb_id_table[] = {
 		.driver_info = SMS1XXX_BOARD_DELL_DVBT },
 	{ USB_DEVICE(0x2040, 0x5590),
 		.driver_info = SMS1XXX_BOARD_DELL_DVBT },
+
+	{ USB_DEVICE(0x2040, 0xb400),
+		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_CMMB },
+	{ USB_DEVICE(0x2040, 0xb410),
+		.driver_info = SMS1XXX_BOARD_DELL_CMMB },
+	{ USB_DEVICE(0x2040, 0xb500),
+		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_CMMB },
+	{ USB_DEVICE(0x2040, 0xb510),
+		.driver_info = SMS1XXX_BOARD_DELL_TIGER_MINICARD_CMMB_R1 },
+	{ USB_DEVICE(0x2040, 0xb511),
+		.driver_info = SMS1XXX_BOARD_DELL_TIGER_MINICARD_CMMB },
+	{ USB_DEVICE(0x2040, 0xb512),
+		.driver_info = SMS1XXX_BOARD_DELL_TIGER_MINICARD_CMMB },
 	{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, smsusb_id_table);
-- 
1.5.6.3