frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2025-03-01 10:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt dvb-core, includes and affected files to mainline 4.14-rc2

Browse Source
This commit is contained in:
Ralph Metzler
2017-09-26 21:18:04 +02:00
parent f84d196a1e
commit 1c22a07eaa
41 changed files with 4770 additions and 2347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ddbridge/ddbridge-core.c
View File

@@ -1254,7 +1254,7 @@ static int tuner_attach_stv6110(struct ddb_input *input, int type)
struct stv090x_config *feconf = type ? &stv0900_aa : &stv0900;
struct stv6110x_config *tunerconf = (input->nr & 1) ?
&stv6110b : &stv6110a;
struct stv6110x_devctl *ctl;
const struct stv6110x_devctl *ctl;
ctl = dvb_attach(stv6110x_attach, dvb->fe, tunerconf, i2c);
if (!ctl) {
@@ -2081,13 +2081,13 @@ static int ddb_port_attach(struct ddb_port *port)
ret = dvb_register_device(port->dvb[0].adap,
&port->dvb[0].dev,
&dvbdev_ci, (void *)port->output,
DVB_DEVICE_CI);
DVB_DEVICE_CI, 1);
break;
case DDB_PORT_MOD:
ret = dvb_register_device(port->dvb[0].adap,
&port->dvb[0].dev,
&dvbdev_mod, (void *)port->output,
DVB_DEVICE_MOD);
DVB_DEVICE_MOD, 1);
break;
default:
break;
@@ -2937,7 +2937,7 @@ static int ddb_nsd_attach(struct ddb *dev)
ret = dvb_register_device(&dev->adap[0],
&dev->nsd_dev,
&dvbdev_nsd, (void *)dev,
DVB_DEVICE_NSD);
DVB_DEVICE_NSD, 0);
return ret;
}

2
ddbridge/ddbridge-modulator.c
View File

@@ -6,7 +6,7 @@
* Ralph Metzler <rjkm@metzlerbros.de>
*
* This program is free software; you can redistribute it and/or
* modify dit under the terms of the GNU General Public License
* modify it under the terms of the GNU General Public License
* version 2 only, as published by the Free Software Foundation.
*
*

2
ddbridge/ddbridge.h
View File

@@ -407,7 +407,7 @@ struct ddb_ns {
struct ddb_lnb {
struct mutex lock; /* lock lnb access */
u32 tone;
fe_sec_voltage_t oldvoltage[4];
enum fe_sec_voltage oldvoltage[4];
u32 voltage[4];
u32 voltages;
u32 fmode;