Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 38287
b: refs/heads/master
c: e6bf0bf
h: refs/heads/master
i:
  38285: 08230a3
  38283: 3806fcc
  38279: 6d70f02
  38271: 5d9bfea
v: v3
  • Loading branch information
Linus Torvalds committed Oct 3, 2006
1 parent 377cdc9 commit 5902802
Show file tree
Hide file tree
Showing 68 changed files with 2,523 additions and 1,472 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8db0201026fbb45c383176f539dc8af2a6871ab8
refs/heads/master: e6bf0bf374101efc802a55beadc08eae97b75580
4 changes: 2 additions & 2 deletions trunk/Documentation/video4linux/CARDLIST.cx88
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
15 -> DViCO FusionHDTV DVB-T1 [18ac:db00]
16 -> KWorld LTV883RF
17 -> DViCO FusionHDTV 3 Gold-Q [18ac:d810,18ac:d800]
18 -> Hauppauge Nova-T DVB-T [0070:9002,0070:9001]
18 -> Hauppauge Nova-T DVB-T [0070:9002,0070:9001,0070:9000]
19 -> Conexant DVB-T reference design [14f1:0187]
20 -> Provideo PV259 [1540:2580]
21 -> DViCO FusionHDTV DVB-T Plus [18ac:db10,18ac:db11]
Expand All @@ -41,7 +41,7 @@
40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid [0070:9400,0070:9402]
41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802]
42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025,1822:0019]
43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1]
43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1,12ab:2300]
44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54]
45 -> KWorld HardwareMpegTV XPert [17de:0840]
46 -> DViCO FusionHDTV DVB-T Hybrid [18ac:db40,18ac:db44]
Expand Down
1 change: 1 addition & 0 deletions trunk/Documentation/video4linux/CARDLIST.saa7134
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,4 @@
96 -> Medion Md8800 Quadro [16be:0007,16be:0008]
97 -> LifeView FlyDVB-S /Acorp TV134DS [5168:0300,4e42:0300]
98 -> Proteus Pro 2309 [0919:2003]
99 -> AVerMedia TV Hybrid A16AR [1461:2c00]
10 changes: 10 additions & 0 deletions trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,13 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)
if ((ret = dvb_generic_open (inode, file)) < 0)
return ret;

if (fe->ops.ts_bus_ctrl) {
if ((ret = fe->ops.ts_bus_ctrl (fe, 1)) < 0) {
dvb_generic_release (inode, file);
return ret;
}
}

if ((file->f_flags & O_ACCMODE) != O_RDONLY) {

/* normal tune mode when opened R/W */
Expand Down Expand Up @@ -1043,6 +1050,9 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)
if ((file->f_flags & O_ACCMODE) != O_RDONLY)
fepriv->release_jiffies = jiffies;

if (fe->ops.ts_bus_ctrl)
fe->ops.ts_bus_ctrl (fe, 0);

return dvb_generic_release (inode, file);
}

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/dvb/dvb-core/dvb_frontend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ struct dvb_frontend_ops {
int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, long arg);
int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire);

struct dvb_tuner_ops tuner_ops;
};
Expand Down
41 changes: 23 additions & 18 deletions trunk/drivers/media/dvb/dvb-usb/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,8 @@ config DVB_USB_DIBUSB_MB
Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.

Devices supported by this driver:
Artec T1 USB1.1 boxes
Avermedia AverTV DVBT USB1.1
Compro Videomate DVB-U2000 - DVB-T USB
DiBcom USB1.1 reference devices (non-public)
Grandtec DVB-T USB
Hama DVB-T USB1.1-Box
KWorld/JetWay/ADSTech V-Stream XPERT DTV - DVB-T USB1.1 and USB2.0
TwinhanDTV Magic Box (VP7041e)
TwinhanDTV USB-Ter (VP7041)
Ultima Electronic/Artec T1 USB TVBOX

The VP7041 seems to be identical to "CTS Portable" (Chinese
Television System).
For an up-to-date list of devices supported by this driver, have a look
on the Linux-DVB Wiki at www.linuxtv.org.

Say Y if you own such a device and want to use it. You should build it as
a module.
Expand All @@ -69,12 +57,29 @@ config DVB_USB_DIBUSB_MC
select DVB_DIB3000MC
select DVB_TUNER_MT2060
help
Support for 2.0 DVB-T receivers based on reference designs made by
Support for USB2.0 DVB-T receivers based on reference designs made by
DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.

Devices supported by this driver:
Artec T1 USB2.0 boxes
DiBcom USB2.0 reference devices (non-public)
For an up-to-date list of devices supported by this driver, have a look
on the Linux-DVB Wiki at www.linuxtv.org.

Say Y if you own such a device and want to use it. You should build it as
a module.

config DVB_USB_DIB0700
tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"
depends on DVB_USB
select DVB_DIB7000M
select DVB_DIB3000MC
select DVB_TUNER_MT2060
help
Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
USB bridge is also present in devices having the DiB7700 DVB-T-USB
silicon. This chip can be found in devices offered by Hauppauge,
Avermedia and other big and small companies.

For an up-to-date list of devices supported by this driver, have a look
on the Linux-DVB Wiki at www.linuxtv.org.

Say Y if you own such a device and want to use it. You should build it as
a module.
Expand Down
5 changes: 4 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o
dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o
obj-$(CONFIG_DVB_USB) += dvb-usb.o

dvb-usb-vp7045-objs = vp7045.o vp7045-fe.o
Expand Down Expand Up @@ -36,4 +36,7 @@ obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
dvb-usb-cxusb-objs = cxusb.o
obj-$(CONFIG_DVB_USB_CXUSB) += dvb-usb-cxusb.o

dvb-usb-dib0700-objs = dib0700_core.o dib0700_devices.o
obj-$(CONFIG_DVB_USB_DIB0700) += dvb-usb-dib0700.o

EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
48 changes: 28 additions & 20 deletions trunk/drivers/media/dvb/dvb-usb/a800.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ static int a800_power_ctrl(struct dvb_usb_device *d, int onoff)
}

/* assure to put cold to 0 for iManufacturer == 1 */
static int a800_identify_state(struct usb_device *udev, struct dvb_usb_properties *props,struct dvb_usb_device_description **desc, int *cold)
static int a800_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
struct dvb_usb_device_description **desc, int *cold)
{
*cold = udev->descriptor.iManufacturer != 1;
return 0;
Expand Down Expand Up @@ -88,7 +89,7 @@ static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
}

/* USB Driver stuff */
static struct dvb_usb_properties a800_properties;
static struct dvb_usb_device_properties a800_properties;

static int a800_probe(struct usb_interface *intf,
const struct usb_device_id *id)
Expand All @@ -104,35 +105,27 @@ static struct usb_device_id a800_table [] = {
};
MODULE_DEVICE_TABLE (usb, a800_table);

static struct dvb_usb_properties a800_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
.pid_filter_count = 32,
static struct dvb_usb_device_properties a800_properties = {
.caps = DVB_USB_IS_AN_I2C_ADAPTER,

.usb_ctrl = CYPRESS_FX2,

.firmware = "dvb-usb-avertv-a800-02.fw",

.size_of_priv = sizeof(struct dibusb_state),

.num_adapters = 1,
.adapter = {
{
.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,
.power_ctrl = a800_power_ctrl,

.frontend_attach = dibusb_dib3000mc_frontend_attach,
.tuner_attach = dibusb_dib3000mc_tuner_attach,
.identify_state = a800_identify_state,

.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = a800_rc_keys,
.rc_key_map_size = ARRAY_SIZE(a800_rc_keys),
.rc_query = a800_rc_query,

.i2c_algo = &dibusb_i2c_algo,

.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */
.urb = {
.type = DVB_USB_BULK,
.stream = {
.type = USB_BULK,
.count = 7,
.endpoint = 0x06,
.u = {
Expand All @@ -142,6 +135,21 @@ static struct dvb_usb_properties a800_properties = {
}
},

.size_of_priv = sizeof(struct dibusb_state),
},
},

.power_ctrl = a800_power_ctrl,
.identify_state = a800_identify_state,

.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = a800_rc_keys,
.rc_key_map_size = ARRAY_SIZE(a800_rc_keys),
.rc_query = a800_rc_query,

.i2c_algo = &dibusb_i2c_algo,

.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1,
.devices = {
{ "AVerMedia AverTV DVB-T USB 2.0 (A800)",
Expand Down
Loading

0 comments on commit 5902802

Please sign in to comment.