mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
![Greg Kroah-Hartman](/assets/img/avatar_default.png)
This converts the drivers in drivers/media/* to use the module_usb_driver() macro which makes the code smaller and a bit simpler. Added bonus is that it removes some unneeded kernel log messages about drivers loading and/or unloading. Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Luca Risolia <luca.risolia@studio.unibo.it> Cc: Jean-Francois Moine <moinejf@free.fr> Cc: Frank Zago <frank@zago.net> Cc: Olivier Lorin <o.lorin@laposte.net> Cc: Erik Andren <erik.andren@gmail.com> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Brian Johnson <brijohn@gmail.com> Cc: Leandro Costantino <lcostantino@gmail.com> Cc: Antoine Jacquet <royale@zerezo.com> Cc: Jarod Wilson <jarod@redhat.com> Cc: Florian Mickler <florian@mickler.org> Cc: Antti Palosaari <crope@iki.fi> Cc: Michael Krufky <mkrufky@kernellabs.com> Cc: "David Härdeman" <david@hardeman.nu> Cc: Florent Audebert <florent.audebert@anevia.com> Cc: Sam Doshi <sam@metal-fish.co.uk> Cc: Manu Abraham <manu@linuxtv.org> Cc: Olivier Grenie <olivier.grenie@dibcom.fr> Cc: Patrick Boettcher <patrick.boettcher@dibcom.fr> Cc: "Igor M. Liplianin" <liplianin@me.by> Cc: Derek Kelly <user.vdr@gmail.com> Cc: Malcolm Priestley <tvboxspy@gmail.com> Cc: Steven Toth <stoth@kernellabs.com> Cc: "André Weidemann" <Andre.Weidemann@web.de> Cc: Martin Wilks <m.wilks@technisat.com> Cc: Tejun Heo <tj@kernel.org> Cc: Jose Alberto Reguero <jareguero@telefonica.net> Cc: David Henningsson <david.henningsson@canonical.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Joe Perches <joe@perches.com> Cc: Jesper Juhl <jj@chaosbits.net> Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi> Cc: Hans Verkuil <hans.verkuil@cisco.com> Cc: Alexey Khoroshilov <khoroshilov@ispras.ru> Cc: Anssi Hannula <anssi.hannula@iki.fi> Cc: Rafi Rubin <rafi@seas.upenn.edu> Cc: Dan Carpenter <error27@gmail.com> Cc: Paul Bender <pebender@gmail.com> Cc: Devin Heitmueller <dheitmueller@kernellabs.com> Cc: "Márcio A Alves" <froooozen@gmail.com> Cc: Julia Lawall <julia@diku.dk> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Chris Rankin <rankincj@yahoo.com> Cc: Lee Jones <lee.jones@canonical.com> Cc: Andy Walls <awalls@md.metrocast.net> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Dean Anderson <linux-dev@sensoray.com> Cc: Pete Eberlein <pete@sensoray.com> Cc: Arvydas Sidorenko <asido4@gmail.com> Cc: Andrea Anacleto <andreaanacleto@libero.it> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
149 lines
5 KiB
C
149 lines
5 KiB
C
/* DVB USB compliant linux driver for mobile DVB-T USB devices based on
|
|
* reference designs made by DiBcom (http://www.dibcom.fr/) (DiB3000M-C/P)
|
|
*
|
|
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
|
|
*
|
|
* based on GPL code from DiBcom, which has
|
|
* Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation, version 2.
|
|
*
|
|
* see Documentation/dvb/README.dvb-usb for more information
|
|
*/
|
|
#include "dibusb.h"
|
|
|
|
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
|
|
|
|
/* USB Driver stuff */
|
|
static struct dvb_usb_device_properties dibusb_mc_properties;
|
|
|
|
static int dibusb_mc_probe(struct usb_interface *intf,
|
|
const struct usb_device_id *id)
|
|
{
|
|
return dvb_usb_device_init(intf, &dibusb_mc_properties, THIS_MODULE,
|
|
NULL, adapter_nr);
|
|
}
|
|
|
|
/* do not change the order of the ID table */
|
|
static struct usb_device_id dibusb_dib3000mc_table [] = {
|
|
/* 00 */ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_MOD3001_COLD) },
|
|
/* 01 */ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_MOD3001_WARM) },
|
|
/* 02 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_USB2_COLD) },
|
|
/* 03 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
|
|
/* 04 */ { USB_DEVICE(USB_VID_LITEON, USB_PID_LITEON_DVB_T_COLD) },
|
|
/* 05 */ { USB_DEVICE(USB_VID_LITEON, USB_PID_LITEON_DVB_T_WARM) },
|
|
/* 06 */ { USB_DEVICE(USB_VID_EMPIA, USB_PID_DIGIVOX_MINI_SL_COLD) },
|
|
/* 07 */ { USB_DEVICE(USB_VID_EMPIA, USB_PID_DIGIVOX_MINI_SL_WARM) },
|
|
/* 08 */ { USB_DEVICE(USB_VID_GRANDTEC, USB_PID_GRANDTEC_DVBT_USB2_COLD) },
|
|
/* 09 */ { USB_DEVICE(USB_VID_GRANDTEC, USB_PID_GRANDTEC_DVBT_USB2_WARM) },
|
|
/* 10 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_COLD) },
|
|
/* 11 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_WARM) },
|
|
/* 12 */ { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_COLD) },
|
|
/* 13 */ { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_WARM) },
|
|
/* 14 */ { USB_DEVICE(USB_VID_HUMAX_COEX, USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
|
|
/* 15 */ { USB_DEVICE(USB_VID_HUMAX_COEX, USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
|
|
{ } /* Terminating entry */
|
|
};
|
|
MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
|
|
|
|
static struct dvb_usb_device_properties dibusb_mc_properties = {
|
|
.caps = DVB_USB_IS_AN_I2C_ADAPTER,
|
|
|
|
.usb_ctrl = CYPRESS_FX2,
|
|
.firmware = "dvb-usb-dibusb-6.0.0.8.fw",
|
|
|
|
.num_adapters = 1,
|
|
.adapter = {
|
|
{
|
|
.num_frontends = 1,
|
|
.fe = {{
|
|
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
|
|
.pid_filter_count = 32,
|
|
.streaming_ctrl = dibusb2_0_streaming_ctrl,
|
|
.pid_filter = dibusb_pid_filter,
|
|
.pid_filter_ctrl = dibusb_pid_filter_ctrl,
|
|
.frontend_attach = dibusb_dib3000mc_frontend_attach,
|
|
.tuner_attach = dibusb_dib3000mc_tuner_attach,
|
|
|
|
/* parameter for the MPEG2-data transfer */
|
|
.stream = {
|
|
.type = USB_BULK,
|
|
.count = 8,
|
|
.endpoint = 0x06,
|
|
.u = {
|
|
.bulk = {
|
|
.buffersize = 4096,
|
|
}
|
|
}
|
|
},
|
|
}},
|
|
.size_of_priv = sizeof(struct dibusb_state),
|
|
}
|
|
},
|
|
.power_ctrl = dibusb2_0_power_ctrl,
|
|
|
|
.rc.legacy = {
|
|
.rc_interval = DEFAULT_RC_INTERVAL,
|
|
.rc_map_table = rc_map_dibusb_table,
|
|
.rc_map_size = 111, /* FIXME */
|
|
.rc_query = dibusb_rc_query,
|
|
},
|
|
|
|
.i2c_algo = &dibusb_i2c_algo,
|
|
|
|
.generic_bulk_ctrl_endpoint = 0x01,
|
|
|
|
.num_device_descs = 8,
|
|
.devices = {
|
|
{ "DiBcom USB2.0 DVB-T reference design (MOD3000P)",
|
|
{ &dibusb_dib3000mc_table[0], NULL },
|
|
{ &dibusb_dib3000mc_table[1], NULL },
|
|
},
|
|
{ "Artec T1 USB2.0 TVBOX (please check the warm ID)",
|
|
{ &dibusb_dib3000mc_table[2], NULL },
|
|
{ &dibusb_dib3000mc_table[3], NULL },
|
|
},
|
|
{ "LITE-ON USB2.0 DVB-T Tuner",
|
|
/* Also rebranded as Intuix S800, Toshiba */
|
|
{ &dibusb_dib3000mc_table[4], NULL },
|
|
{ &dibusb_dib3000mc_table[5], NULL },
|
|
},
|
|
{ "MSI Digivox Mini SL",
|
|
{ &dibusb_dib3000mc_table[6], NULL },
|
|
{ &dibusb_dib3000mc_table[7], NULL },
|
|
},
|
|
{ "GRAND - USB2.0 DVB-T adapter",
|
|
{ &dibusb_dib3000mc_table[8], NULL },
|
|
{ &dibusb_dib3000mc_table[9], NULL },
|
|
},
|
|
{ "Artec T14 - USB2.0 DVB-T",
|
|
{ &dibusb_dib3000mc_table[10], NULL },
|
|
{ &dibusb_dib3000mc_table[11], NULL },
|
|
},
|
|
{ "Leadtek - USB2.0 Winfast DTV dongle",
|
|
{ &dibusb_dib3000mc_table[12], NULL },
|
|
{ &dibusb_dib3000mc_table[13], NULL },
|
|
},
|
|
{ "Humax/Coex DVB-T USB Stick 2.0 High Speed",
|
|
{ &dibusb_dib3000mc_table[14], NULL },
|
|
{ &dibusb_dib3000mc_table[15], NULL },
|
|
},
|
|
{ NULL },
|
|
}
|
|
};
|
|
|
|
static struct usb_driver dibusb_mc_driver = {
|
|
.name = "dvb_usb_dibusb_mc",
|
|
.probe = dibusb_mc_probe,
|
|
.disconnect = dvb_usb_device_exit,
|
|
.id_table = dibusb_dib3000mc_table,
|
|
};
|
|
|
|
module_usb_driver(dibusb_mc_driver);
|
|
|
|
MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
|
|
MODULE_DESCRIPTION("Driver for DiBcom USB2.0 DVB-T (DiB3000M-C/P based) devices");
|
|
MODULE_VERSION("1.0");
|
|
MODULE_LICENSE("GPL");
|