renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

V4L/DVB (5126): M920x: cleanups after rename from megasky.[ch]

Browse Source 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2006-09-23 20:01:29 -03:00 committed by Mauro Carvalho Chehab
parent 2aef7d0fa0
commit baa2ed0900
4 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/dvb/dvb-usb/Kconfig
View File

@ -109,8 +109,8 @@ config DVB_USB_CXUSB
Medion MD95700 hybrid USB2.0 device. Medion MD95700 hybrid USB2.0 device.
DViCO FusionHDTV (Bluebird) USB2.0 devices DViCO FusionHDTV (Bluebird) USB2.0 devices
config DVB_USB_MEGASKY config DVB_USB_M920X
tristate "MSI Mega Sky 580 DVB-T USB2.0 support" tristate "Uli m920x DVB-T USB2.0 support"
depends on DVB_USB depends on DVB_USB
select DVB_MT352 select DVB_MT352
help help

2
drivers/media/dvb/dvb-usb/Makefile
View File

@ -31,7 +31,7 @@ dvb-usb-umt-010-objs = umt-010.o
obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o
dvb-usb-m920x-objs = m920x.o dvb-usb-m920x-objs = m920x.o
obj-$(CONFIG_DVB_USB_MEGASKY) += dvb-usb-m920x.o obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m920x.o
dvb-usb-digitv-objs = digitv.o dvb-usb-digitv-objs = digitv.o
obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o

70
drivers/media/dvb/dvb-usb/m920x.c
View File

@ -8,14 +8,15 @@
* *
* see Documentation/dvb/README.dvb-usb for more information * see Documentation/dvb/README.dvb-usb for more information
*/ */
#include "m920x.h" #include "m920x.h"
#include "mt352.h" #include "mt352.h"
#include "mt352_priv.h" #include "mt352_priv.h"
/* debug */ /* debug */
int dvb_usb_megasky_debug; int dvb_usb_m920x_debug;
module_param_named(debug,dvb_usb_megasky_debug, int, 0644); module_param_named(debug,dvb_usb_m920x_debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS); MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
static struct dvb_usb_rc_key megasky_rc_keys [] = { static struct dvb_usb_rc_key megasky_rc_keys [] = {
@ -194,25 +195,25 @@ static int megasky_mt352_demod_init(struct dvb_frontend *fe)
{ {
int i; int i;
static u8 buf1[] = { static u8 buf1[] = {
CONFIG, 0x3d, CONFIG, 0x3d,
CLOCK_CTL, 0x30, CLOCK_CTL, 0x30,
RESET, 0x80, RESET, 0x80,
ADC_CTL_1, 0x40, ADC_CTL_1, 0x40,
AGC_TARGET, 0x1c, AGC_TARGET, 0x1c,
AGC_CTL, 0x20, AGC_CTL, 0x20,
0x69, 0x00, 0x69, 0x00,
0x6a, 0xff, 0x6a, 0xff,
0x6b, 0xff, 0x6b, 0xff,
0x6c, 0x40, 0x6c, 0x40,
0x6d, 0xff, 0x6d, 0xff,
0x6e, 0x00, 0x6e, 0x00,
0x6f, 0x40, 0x6f, 0x40,
0x70, 0x40, 0x70, 0x40,
0x93, 0x1a, 0x93, 0x1a,
0xb5, 0x7a, 0xb5, 0x7a,
ACQ_CTL, 0x50, ACQ_CTL, 0x50,
INPUT_FREQ_1, 0x31, INPUT_FREQ_1, 0x31,
INPUT_FREQ_0, 0x05, INPUT_FREQ_0, 0x05,
}; };
for (i = 0; i < ARRAY_SIZE(buf1); i += 2) for (i = 0; i < ARRAY_SIZE(buf1); i += 2)
@ -225,7 +226,6 @@ static int megasky_mt352_demod_init(struct dvb_frontend *fe)
struct mt352_state; struct mt352_state;
#define W 0 #define W 0
#define R 1 #define R 1
/* Not actual hw limits. */ /* Not actual hw limits. */
@ -479,11 +479,11 @@ static int megasky_probe(struct usb_interface *intf, const struct usb_device_id
return ret; return ret;
} }
static struct usb_device_id megasky_table [] = { static struct usb_device_id m920x_table [] = {
{ USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580) }, { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580) },
{ } /* Terminating entry */ { } /* Terminating entry */
}; };
MODULE_DEVICE_TABLE (usb, megasky_table); MODULE_DEVICE_TABLE (usb, m920x_table);
static int set_filter(struct dvb_usb_device *d, int type, int idx, int pid) static int set_filter(struct dvb_usb_device *d, int type, int idx, int pid)
{ {
@ -651,26 +651,26 @@ static struct dvb_usb_properties megasky_properties = {
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
{ "MSI Mega Sky 580 DVB-T USB2.0", { "MSI Mega Sky 580 DVB-T USB2.0",
{ &megasky_table[0], NULL }, { &m920x_table[0], NULL },
{ NULL }, { NULL },
}, },
{ NULL }, { NULL },
} }
}; };
static struct usb_driver megasky_driver = { static struct usb_driver m920x_driver = {
.name = "dvb_usb_megasky", .name = "dvb_usb_m920x",
.probe = megasky_probe, .probe = megasky_probe,
.disconnect = dvb_usb_device_exit, .disconnect = dvb_usb_device_exit,
.id_table = megasky_table, .id_table = m920x_table,
}; };
/* module stuff */ /* module stuff */
static int __init megasky_module_init(void) static int __init m920x_module_init(void)
{ {
int ret; int ret;
if ((ret = usb_register(&megasky_driver))) { if ((ret = usb_register(&m920x_driver))) {
err("usb_register failed. Error number %d", ret); err("usb_register failed. Error number %d", ret);
return ret; return ret;
} }
@ -678,16 +678,16 @@ static int __init megasky_module_init(void)
return 0; return 0;
} }
static void __exit megasky_module_exit(void) static void __exit m920x_module_exit(void)
{ {
/* deregister this driver from the USB subsystem */ /* deregister this driver from the USB subsystem */
usb_deregister(&megasky_driver); usb_deregister(&m920x_driver);
} }
module_init (megasky_module_init); module_init (m920x_module_init);
module_exit (megasky_module_exit); module_exit (m920x_module_exit);
MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>"); MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>");
MODULE_DESCRIPTION("Driver for MSI Mega Sky 580 DVB-T USB2.0"); MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / Uli m920x");
MODULE_VERSION("0.1"); MODULE_VERSION("0.1");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

10
drivers/media/dvb/dvb-usb/m920x.h
View File

@ -1,10 +1,10 @@
#ifndef _DVB_USB_MEGASKY_H_ #ifndef _DVB_USB_M920X_H_
#define _DVB_USB_MEGASKY_H_ #define _DVB_USB_M920X_H_
#define DVB_USB_LOG_PREFIX "megasky" #define DVB_USB_LOG_PREFIX "m920x"
#include "dvb-usb.h" #include "dvb-usb.h"
extern int dvb_usb_megasky_debug; extern int dvb_usb_m920x_debug;
#define deb_rc(args...) dprintk(dvb_usb_megasky_debug,0x01,args) #define deb_rc(args...) dprintk(dvb_usb_m920x_debug,0x01,args)
#endif #endif