frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

change MOD_ to MODULATOR_ because of overlapwith timex.h

Browse Source
This commit is contained in:
Ralph Metzler 2016-09-12 14:41:47 +02:00
parent 7f746f0219
commit 1171b345df
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/setmod2.c
View File

@ -39,9 +39,9 @@ int main()
fd = open("/dev/dvb/adapter0/mod0", O_RDONLY); fd = open("/dev/dvb/adapter0/mod0", O_RDONLY);
set_property(fd, MOD_MODULATION, QAM_256); set_property(fd, MODULATOR_MODULATION, QAM_256);
set_property(fd, MOD_SYMBOL_RATE, 6900000); set_property(fd, MODULATOR_SYMBOL_RATE, 6900000);
set_property(fd, MOD_FREQUENCY, 114000000); set_property(fd, MODULATOR_FREQUENCY, 114000000);
close(fd); close(fd);
} }

10
ddbridge/ddbridge-mod.c
View File

@ -1478,19 +1478,19 @@ static int mod_prop_proc(struct ddb_mod *mod, struct dtv_property *tvp)
struct ddb *dev = mod->port->dev; struct ddb *dev = mod->port->dev;
switch(tvp->cmd) { switch(tvp->cmd) {
case MOD_SYMBOL_RATE: case MODULATOR_SYMBOL_RATE:
return mod_set_symbolrate(mod, tvp->u.data); return mod_set_symbolrate(mod, tvp->u.data);
case MOD_MODULATION: case MODULATOR_MODULATION:
return mod_set_modulation(mod, tvp->u.data); return mod_set_modulation(mod, tvp->u.data);
case MOD_FREQUENCY: case MODULATOR_FREQUENCY:
return mod_set_frequency(mod, tvp->u.data); return mod_set_frequency(mod, tvp->u.data);
case MOD_ATTENUATOR: case MODULATOR_ATTENUATOR:
return mod_set_attenuator(mod->port->dev, tvp->u.data); return mod_set_attenuator(mod->port->dev, tvp->u.data);
case MOD_INPUT_BITRATE: case MODULATOR_INPUT_BITRATE:
return mod_set_ibitrate(mod, tvp->u.data); return mod_set_ibitrate(mod, tvp->u.data);
} }
return 0; return 0;

18
include/linux/dvb/mod.h
View File

@ -19,15 +19,15 @@ struct dvb_mod_channel_params {
#define DVB_MOD_SET _IOW('o', 208, struct dvb_mod_params) #define DVB_MOD_SET _IOW('o', 208, struct dvb_mod_params)
#define DVB_MOD_CHANNEL_SET _IOW('o', 209, struct dvb_mod_channel_params) #define DVB_MOD_CHANNEL_SET _IOW('o', 209, struct dvb_mod_channel_params)
#define MOD_UNDEFINED 0 #define MODULATOR_UNDEFINED 0
#define MOD_START 1 #define MODULATOR_START 1
#define MOD_STOP 2 #define MODULATOR_STOP 2
#define MOD_FREQUENCY 3 #define MODULATOR_FREQUENCY 3
#define MOD_MODULATION 4 #define MODULATOR_MODULATION 4
#define MOD_SYMBOL_RATE 5 /* Hz */ #define MODULATOR_SYMBOL_RATE 5 /* Hz */
#define MOD_ATTENUATOR 32 #define MODULATOR_ATTENUATOR 32
#define MOD_INPUT_BITRATE 33 /* Hz */ #define MODULATOR_INPUT_BITRATE 33 /* Hz */
#define MOD_PCR_MODE 34 /* 1=pcr correction enabled */ #define MODULATOR_PCR_MODE 34 /* 1=pcr correction enabled */
#endif /*_UAPI_DVBMOD_H_*/ #endif /*_UAPI_DVBMOD_H_*/