aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/Kconfig4
-rw-r--r--drivers/media/dvb/dvb-usb/Makefile2
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c70
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.h10
4 files changed, 43 insertions, 43 deletions
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 5f2a0c1dc4ec..e120d98713f4 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -109,8 +109,8 @@ config DVB_USB_CXUSB
109 Medion MD95700 hybrid USB2.0 device. 109 Medion MD95700 hybrid USB2.0 device.
110 DViCO FusionHDTV (Bluebird) USB2.0 devices 110 DViCO FusionHDTV (Bluebird) USB2.0 devices
111 111
112config DVB_USB_MEGASKY 112config DVB_USB_M920X
113 tristate "MSI Mega Sky 580 DVB-T USB2.0 support" 113 tristate "Uli m920x DVB-T USB2.0 support"
114 depends on DVB_USB 114 depends on DVB_USB
115 select DVB_MT352 115 select DVB_MT352
116 help 116 help
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index e2eed102e97b..815e2789840d 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -31,7 +31,7 @@ dvb-usb-umt-010-objs = umt-010.o
31obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o 31obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o
32 32
33dvb-usb-m920x-objs = m920x.o 33dvb-usb-m920x-objs = m920x.o
34obj-$(CONFIG_DVB_USB_MEGASKY) += dvb-usb-m920x.o 34obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m920x.o
35 35
36dvb-usb-digitv-objs = digitv.o 36dvb-usb-digitv-objs = digitv.o
37obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o 37obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index c50f484c843b..ba2c5c91da09 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -8,14 +8,15 @@
8 * 8 *
9 * see Documentation/dvb/README.dvb-usb for more information 9 * see Documentation/dvb/README.dvb-usb for more information
10 */ 10 */
11
11#include "m920x.h" 12#include "m920x.h"
12 13
13#include "mt352.h" 14#include "mt352.h"
14#include "mt352_priv.h" 15#include "mt352_priv.h"
15 16
16/* debug */ 17/* debug */
17int dvb_usb_megasky_debug; 18int dvb_usb_m920x_debug;
18module_param_named(debug,dvb_usb_megasky_debug, int, 0644); 19module_param_named(debug,dvb_usb_m920x_debug, int, 0644);
19MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS); 20MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
20 21
21static struct dvb_usb_rc_key megasky_rc_keys [] = { 22static struct dvb_usb_rc_key megasky_rc_keys [] = {
@@ -194,25 +195,25 @@ static int megasky_mt352_demod_init(struct dvb_frontend *fe)
194{ 195{
195 int i; 196 int i;
196 static u8 buf1[] = { 197 static u8 buf1[] = {
197 CONFIG, 0x3d, 198 CONFIG, 0x3d,
198 CLOCK_CTL, 0x30, 199 CLOCK_CTL, 0x30,
199 RESET, 0x80, 200 RESET, 0x80,
200 ADC_CTL_1, 0x40, 201 ADC_CTL_1, 0x40,
201 AGC_TARGET, 0x1c, 202 AGC_TARGET, 0x1c,
202 AGC_CTL, 0x20, 203 AGC_CTL, 0x20,
203 0x69, 0x00, 204 0x69, 0x00,
204 0x6a, 0xff, 205 0x6a, 0xff,
205 0x6b, 0xff, 206 0x6b, 0xff,
206 0x6c, 0x40, 207 0x6c, 0x40,
207 0x6d, 0xff, 208 0x6d, 0xff,
208 0x6e, 0x00, 209 0x6e, 0x00,
209 0x6f, 0x40, 210 0x6f, 0x40,
210 0x70, 0x40, 211 0x70, 0x40,
211 0x93, 0x1a, 212 0x93, 0x1a,
212 0xb5, 0x7a, 213 0xb5, 0x7a,
213 ACQ_CTL, 0x50, 214 ACQ_CTL, 0x50,
214 INPUT_FREQ_1, 0x31, 215 INPUT_FREQ_1, 0x31,
215 INPUT_FREQ_0, 0x05, 216 INPUT_FREQ_0, 0x05,
216 }; 217 };
217 218
218 for (i = 0; i < ARRAY_SIZE(buf1); i += 2) 219 for (i = 0; i < ARRAY_SIZE(buf1); i += 2)
@@ -225,7 +226,6 @@ static int megasky_mt352_demod_init(struct dvb_frontend *fe)
225 226
226struct mt352_state; 227struct mt352_state;
227 228
228
229#define W 0 229#define W 0
230#define R 1 230#define R 1
231/* Not actual hw limits. */ 231/* Not actual hw limits. */
@@ -479,11 +479,11 @@ static int megasky_probe(struct usb_interface *intf, const struct usb_device_id
479 return ret; 479 return ret;
480} 480}
481 481
482static struct usb_device_id megasky_table [] = { 482static struct usb_device_id m920x_table [] = {
483 { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580) }, 483 { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580) },
484 { } /* Terminating entry */ 484 { } /* Terminating entry */
485}; 485};
486MODULE_DEVICE_TABLE (usb, megasky_table); 486MODULE_DEVICE_TABLE (usb, m920x_table);
487 487
488static int set_filter(struct dvb_usb_device *d, int type, int idx, int pid) 488static int set_filter(struct dvb_usb_device *d, int type, int idx, int pid)
489{ 489{
@@ -651,26 +651,26 @@ static struct dvb_usb_properties megasky_properties = {
651 .num_device_descs = 1, 651 .num_device_descs = 1,
652 .devices = { 652 .devices = {
653 { "MSI Mega Sky 580 DVB-T USB2.0", 653 { "MSI Mega Sky 580 DVB-T USB2.0",
654 { &megasky_table[0], NULL }, 654 { &m920x_table[0], NULL },
655 { NULL }, 655 { NULL },
656 }, 656 },
657 { NULL }, 657 { NULL },
658 } 658 }
659}; 659};
660 660
661static struct usb_driver megasky_driver = { 661static struct usb_driver m920x_driver = {
662 .name = "dvb_usb_megasky", 662 .name = "dvb_usb_m920x",
663 .probe = megasky_probe, 663 .probe = megasky_probe,
664 .disconnect = dvb_usb_device_exit, 664 .disconnect = dvb_usb_device_exit,
665 .id_table = megasky_table, 665 .id_table = m920x_table,
666}; 666};
667 667
668/* module stuff */ 668/* module stuff */
669static int __init megasky_module_init(void) 669static int __init m920x_module_init(void)
670{ 670{
671 int ret; 671 int ret;
672 672
673 if ((ret = usb_register(&megasky_driver))) { 673 if ((ret = usb_register(&m920x_driver))) {
674 err("usb_register failed. Error number %d", ret); 674 err("usb_register failed. Error number %d", ret);
675 return ret; 675 return ret;
676 } 676 }
@@ -678,16 +678,16 @@ static int __init megasky_module_init(void)
678 return 0; 678 return 0;
679} 679}
680 680
681static void __exit megasky_module_exit(void) 681static void __exit m920x_module_exit(void)
682{ 682{
683 /* deregister this driver from the USB subsystem */ 683 /* deregister this driver from the USB subsystem */
684 usb_deregister(&megasky_driver); 684 usb_deregister(&m920x_driver);
685} 685}
686 686
687module_init (megasky_module_init); 687module_init (m920x_module_init);
688module_exit (megasky_module_exit); 688module_exit (m920x_module_exit);
689 689
690MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>"); 690MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>");
691MODULE_DESCRIPTION("Driver for MSI Mega Sky 580 DVB-T USB2.0"); 691MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / Uli m920x");
692MODULE_VERSION("0.1"); 692MODULE_VERSION("0.1");
693MODULE_LICENSE("GPL"); 693MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/dvb/dvb-usb/m920x.h
index 6f14ae74e256..fdb967aa30ef 100644
--- a/drivers/media/dvb/dvb-usb/m920x.h
+++ b/drivers/media/dvb/dvb-usb/m920x.h
@@ -1,10 +1,10 @@
1#ifndef _DVB_USB_MEGASKY_H_ 1#ifndef _DVB_USB_M920X_H_
2#define _DVB_USB_MEGASKY_H_ 2#define _DVB_USB_M920X_H_
3 3
4#define DVB_USB_LOG_PREFIX "megasky" 4#define DVB_USB_LOG_PREFIX "m920x"
5#include "dvb-usb.h" 5#include "dvb-usb.h"
6 6
7extern int dvb_usb_megasky_debug; 7extern int dvb_usb_m920x_debug;
8#define deb_rc(args...) dprintk(dvb_usb_megasky_debug,0x01,args) 8#define deb_rc(args...) dprintk(dvb_usb_m920x_debug,0x01,args)
9 9
10#endif 10#endif