[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~mkrufky/sms1xxx
The patch number 10754 was added via Mauro Carvalho Chehab mche...@redhat.com
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~mkrufky/sms1xxx
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/siano/Makefile |4
linux/drivers/media/dvb/siano/sms-cards.c | 100 +++-
linux/drivers/media/dvb/siano/sms-cards.h |5
linux/drivers/media/dvb/siano/smscoreapi.c | 124 +
linux/drivers/media/dvb/siano/smscoreapi.h | 42 +--
linux/drivers/media/dvb/siano/smsdvb.c | 66 +--
linux/drivers/media/dvb/siano/smsusb.c | 73 +++-
7 files changed, 286 insertions(+), 128 deletions(-)
diff -r 51664b7471a2 -r 008f357fb0fa linux/drivers/media/dvb/siano/Makefile
--- a/linux/drivers/media/dvb/siano/MakefileThu Feb 26 22:01:51 2009 -0300
+++ b/linux/drivers/media/dvb/siano/MakefileThu Feb 26 22:04:49 2009 -0300
@@ -1,6 +1,8 @@ sms1xxx-objs := smscoreapi.o smsusb.o sm
-sms1xxx-objs := smscoreapi.o smsusb.o smsdvb.o sms-cards.o
+sms1xxx-objs := smscoreapi.o sms-cards.o
obj-$(CONFIG_DVB_SIANO_SMS1XXX) += sms1xxx.o
+obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsusb.o
+obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsdvb.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
diff -r 51664b7471a2 -r 008f357fb0fa linux/drivers/media/dvb/siano/sms-cards.c
--- a/linux/drivers/media/dvb/siano/sms-cards.c Thu Feb 26 22:01:51 2009 -0300
+++ b/linux/drivers/media/dvb/siano/sms-cards.c Thu Feb 26 22:04:49 2009 -0300
@@ -19,53 +19,6 @@
#include sms-cards.h
-struct usb_device_id smsusb_id_table[] = {
-#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
- { USB_DEVICE(0x187f, 0x0010),
- .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
- { USB_DEVICE(0x187f, 0x0100),
- .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
- { USB_DEVICE(0x187f, 0x0200),
- .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
- { USB_DEVICE(0x187f, 0x0201),
- .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
- { USB_DEVICE(0x187f, 0x0300),
- .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
-#endif
- { USB_DEVICE(0x2040, 0x1700),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT },
- { USB_DEVICE(0x2040, 0x1800),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A },
- { USB_DEVICE(0x2040, 0x1801),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B },
- { USB_DEVICE(0x2040, 0x2000),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2009),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },
- { USB_DEVICE(0x2040, 0x200a),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2010),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2011),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2019),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x5500),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5510),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5520),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5530),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5580),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5590),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { } /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(usb, smsusb_id_table);
-
static struct sms_board sms_boards[] = {
[SMS_BOARD_UNKNOWN] = {
.name = Unknown board,
@@ -117,6 +70,7 @@ static struct sms_board sms_boards[] = {
.type = SMS_NOVA_B0,
.fw[DEVICE_MODE_DVBT_BDA] = sms1xxx-hcw-55xxx-dvbt-02.fw,
.lna_ctrl = 29,
+ .rf_switch = 17,
},
[SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2] = {
.name = Hauppauge WinTV MiniCard,
@@ -132,6 +86,7 @@ struct sms_board *sms_get_board(int id)
return sms_boards[id];
}
+EXPORT_SYMBOL_GPL(sms_get_board);
static int sms_set_gpio(struct smscore_device_t *coredev, int pin, int enable)
{
@@ -184,6 +139,7 @@ int
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~mkrufky/sms1xxx
The patch number 8723 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] merge: http://linuxtv.org/hg/~mkrufky/sms1xxx Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/dvb/siano/sms-cards.c |2 +- linux/drivers/media/dvb/siano/sms-cards.h |2 +- linux/drivers/media/dvb/siano/smscoreapi.c |2 +- linux/drivers/media/dvb/siano/smscoreapi.h |2 +- linux/drivers/media/dvb/siano/smsdvb.c |2 +- linux/drivers/media/dvb/siano/smsusb.c |2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff -r 0b626a7dbc9b -r 379113ef4d27 linux/drivers/media/dvb/siano/sms-cards.c --- a/linux/drivers/media/dvb/siano/sms-cards.c Fri Aug 22 10:22:44 2008 -0300 +++ b/linux/drivers/media/dvb/siano/sms-cards.c Fri Aug 22 10:34:29 2008 -0300 @@ -4,7 +4,7 @@ * Copyright (c) 2008 Michael Krufky [EMAIL PROTECTED] * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation; * * Software distributed under the License is distributed on an AS IS diff -r 0b626a7dbc9b -r 379113ef4d27 linux/drivers/media/dvb/siano/sms-cards.h --- a/linux/drivers/media/dvb/siano/sms-cards.h Fri Aug 22 10:22:44 2008 -0300 +++ b/linux/drivers/media/dvb/siano/sms-cards.h Fri Aug 22 10:34:29 2008 -0300 @@ -4,7 +4,7 @@ * Copyright (c) 2008 Michael Krufky [EMAIL PROTECTED] * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation; * * Software distributed under the License is distributed on an AS IS diff -r 0b626a7dbc9b -r 379113ef4d27 linux/drivers/media/dvb/siano/smscoreapi.c --- a/linux/drivers/media/dvb/siano/smscoreapi.cFri Aug 22 10:22:44 2008 -0300 +++ b/linux/drivers/media/dvb/siano/smscoreapi.cFri Aug 22 10:34:29 2008 -0300 @@ -8,7 +8,7 @@ * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation; * * Software distributed under the License is distributed on an AS IS diff -r 0b626a7dbc9b -r 379113ef4d27 linux/drivers/media/dvb/siano/smscoreapi.h --- a/linux/drivers/media/dvb/siano/smscoreapi.hFri Aug 22 10:22:44 2008 -0300 +++ b/linux/drivers/media/dvb/siano/smscoreapi.hFri Aug 22 10:34:29 2008 -0300 @@ -6,7 +6,7 @@ * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation; * * Software distributed under the License is distributed on an AS IS diff -r 0b626a7dbc9b -r 379113ef4d27 linux/drivers/media/dvb/siano/smsdvb.c --- a/linux/drivers/media/dvb/siano/smsdvb.cFri Aug 22 10:22:44 2008 -0300 +++ b/linux/drivers/media/dvb/siano/smsdvb.cFri Aug 22 10:34:29 2008 -0300 @@ -6,7 +6,7 @@ * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation; * * Software distributed under the License is distributed on an AS IS diff -r 0b626a7dbc9b -r 379113ef4d27 linux/drivers/media/dvb/siano/smsusb.c --- a/linux/drivers/media/dvb/siano/smsusb.cFri Aug 22 10:22:44 2008 -0300 +++ b/linux/drivers/media/dvb/siano/smsusb.cFri Aug 22 10:34:29 2008 -0300 @@ -6,7 +6,7 @@ * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation; * * Software distributed under the License is distributed on an AS IS --- Patch is available at:
