frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Changed the tuning code to use FrontendInfo to detect the type of DVB card

Browse Source
This commit is contained in:
Klaus Schmidinger 2001-10-27 13:01:33 +02:00
parent 3e10aa7839
commit fd4d1f77f2
3 changed files with 89 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -842,3 +842,4 @@ Video Disk Recorder Revision History
- Fixed a crash when pressing the '2' button while replaying a DVD. - Fixed a crash when pressing the '2' button while replaying a DVD.
- Updated 'channels.conf' for the "Bundesliga" channels of Premiere World - Updated 'channels.conf' for the "Bundesliga" channels of Premiere World
(thanks to Helmut Schächner). (thanks to Helmut Schächner).
- Changed the tuning code to use FrontendInfo to detect the type of DVB card.

159
dvbapi.c
View File

@ -7,7 +7,7 @@
* DVD support initially written by Andreas Schultz <aschultz@warp10.net> * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si> * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
* *
* $Id: dvbapi.c 1.132 2001/10/21 13:36:27 kls Exp $ * $Id: dvbapi.c 1.133 2001/10/27 13:00:29 kls Exp $
*/ */
//#define DVDDEBUG 1 //#define DVDDEBUG 1
@ -2488,6 +2488,7 @@ char *cDvbApi::audioCommand = NULL;
cDvbApi::cDvbApi(int n) cDvbApi::cDvbApi(int n)
{ {
frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
vPid = aPid1 = aPid2 = dPid1 = dPid2 = 0; vPid = aPid1 = aPid2 = dPid1 = dPid2 = 0;
siProcessor = NULL; siProcessor = NULL;
recordBuffer = NULL; recordBuffer = NULL;
@ -2536,6 +2537,9 @@ cDvbApi::cDvbApi(int n)
siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n)); siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
if (!dvbApi[0]) // only the first one shall set the system time if (!dvbApi[0]) // only the first one shall set the system time
siProcessor->SetUseTSTime(Setup.SetSystemTime); siProcessor->SetUseTSTime(Setup.SetSystemTime);
FrontendInfo feinfo;
CHECK(ioctl(fd_frontend, FE_GET_INFO, &feinfo));
frontendType = feinfo.type;
} }
else else
esyslog(LOG_ERR, "ERROR: can't open video device %d", n); esyslog(LOG_ERR, "ERROR: can't open video device %d", n);
@ -3257,97 +3261,106 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
bool ChannelSynced = false; bool ChannelSynced = false;
if (fd_sec >= 0) { // DVB-S switch (frontendType) {
case FE_QPSK: { // DVB-S
// Frequency offsets: // Frequency offsets:
unsigned int freq = FrequencyMHz; unsigned int freq = FrequencyMHz;
int tone = SEC_TONE_OFF; int tone = SEC_TONE_OFF;
if (freq < (unsigned int)Setup.LnbSLOF) { if (freq < (unsigned int)Setup.LnbSLOF) {
freq -= Setup.LnbFrequLo; freq -= Setup.LnbFrequLo;
tone = SEC_TONE_OFF; tone = SEC_TONE_OFF;
} }
else { else {
freq -= Setup.LnbFrequHi; freq -= Setup.LnbFrequHi;
tone = SEC_TONE_ON; tone = SEC_TONE_ON;
} }
FrontendParameters Frontend; FrontendParameters Frontend;
Frontend.Frequency = freq * 1000UL; Frontend.Frequency = freq * 1000UL;
Frontend.Inversion = INVERSION_AUTO; Frontend.Inversion = INVERSION_AUTO;
Frontend.u.qpsk.SymbolRate = Srate * 1000UL; Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
Frontend.u.qpsk.FEC_inner = FEC_AUTO; Frontend.u.qpsk.FEC_inner = FEC_AUTO;
int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18; int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
// DiseqC: // DiseqC:
secCommand scmd; secCommand scmd;
scmd.type = 0; scmd.type = 0;
scmd.u.diseqc.addr = 0x10; scmd.u.diseqc.addr = 0x10;
scmd.u.diseqc.cmd = 0x38; scmd.u.diseqc.cmd = 0x38;
scmd.u.diseqc.numParams = 1; scmd.u.diseqc.numParams = 1;
scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0); scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
secCmdSequence scmds; secCmdSequence scmds;
scmds.voltage = volt; scmds.voltage = volt;
scmds.miniCommand = SEC_MINI_NONE; scmds.miniCommand = SEC_MINI_NONE;
scmds.continuousTone = tone; scmds.continuousTone = tone;
scmds.numCommands = Setup.DiSEqC ? 1 : 0; scmds.numCommands = Setup.DiSEqC ? 1 : 0;
scmds.commands = &scmd; scmds.commands = &scmd;
CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds)); CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
// Tuning: // Tuning:
CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend)); CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
// Wait for channel sync: // Wait for channel sync:
if (cFile::FileReady(fd_frontend, 5000)) { if (cFile::FileReady(fd_frontend, 5000)) {
FrontendEvent event; FrontendEvent event;
int res = ioctl(fd_frontend, FE_GET_EVENT, &event); int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
if (res >= 0) if (res >= 0)
ChannelSynced = event.type == FE_COMPLETION_EV; ChannelSynced = event.type == FE_COMPLETION_EV;
else else
esyslog(LOG_ERR, "ERROR %d in frontend get event", res); esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
} }
else else
esyslog(LOG_ERR, "ERROR: timeout while tuning"); esyslog(LOG_ERR, "ERROR: timeout while tuning");
} }
else if (fd_frontend >= 0) { // DVB-C break;
case FE_QAM: { // DVB-C
// Frequency and symbol rate: // Frequency and symbol rate:
FrontendParameters Frontend; FrontendParameters Frontend;
Frontend.Frequency = FrequencyMHz * 1000000UL; Frontend.Frequency = FrequencyMHz * 1000000UL;
Frontend.Inversion = INVERSION_AUTO; Frontend.Inversion = INVERSION_AUTO;
Frontend.u.qam.SymbolRate = Srate * 1000UL; Frontend.u.qam.SymbolRate = Srate * 1000UL;
Frontend.u.qam.FEC_inner = FEC_AUTO; Frontend.u.qam.FEC_inner = FEC_AUTO;
Frontend.u.qam.QAM = QAM_64; Frontend.u.qam.QAM = QAM_64;
// Tuning: // Tuning:
CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend)); CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
// Wait for channel sync: // Wait for channel sync:
if (cFile::FileReady(fd_frontend, 5000)) { if (cFile::FileReady(fd_frontend, 5000)) {
FrontendEvent event; FrontendEvent event;
int res = ioctl(fd_frontend, FE_GET_EVENT, &event); int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
if (res >= 0) if (res >= 0)
ChannelSynced = event.type == FE_COMPLETION_EV; ChannelSynced = event.type == FE_COMPLETION_EV;
else else
esyslog(LOG_ERR, "ERROR %d in frontend get event", res); esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
} }
else else
esyslog(LOG_ERR, "ERROR: timeout while tuning"); esyslog(LOG_ERR, "ERROR: timeout while tuning");
} }
else { break;
esyslog(LOG_ERR, "ERROR: attempt to set channel without DVB-S or DVB-C device"); case FE_OFDM: { // DVB-T
return scrFailed; //XXX TODO: implement DVB-T tuning (anybody with a DVB-T card out there?)
} esyslog(LOG_ERR, "ERROR: DVB-T tuning support not yet implemented");
return scrFailed;
}
break;
default:
esyslog(LOG_ERR, "ERROR: attempt to set channel with unknown DVB frontend type");
return scrFailed;
}
if (!ChannelSynced) { if (!ChannelSynced) {
esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1); esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);

3
dvbapi.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: dvbapi.h 1.54 2001/10/27 09:50:03 kls Exp $ * $Id: dvbapi.h 1.55 2001/10/27 12:44:45 kls Exp $
*/ */
#ifndef __DVBAPI_H #ifndef __DVBAPI_H
@ -89,6 +89,7 @@ class cDvbApi {
#endif //DVDSUPPORT #endif //DVDSUPPORT
friend class cTransferBuffer; friend class cTransferBuffer;
private: private:
FrontendType frontendType;
int videoDev; int videoDev;
int fd_osd, fd_frontend, fd_sec, fd_dvr, fd_audio, fd_video, fd_demuxa1, fd_demuxa2, fd_demuxd1, fd_demuxd2, fd_demuxv, fd_demuxt; int fd_osd, fd_frontend, fd_sec, fd_dvr, fd_audio, fd_video, fd_demuxa1, fd_demuxa2, fd_demuxd1, fd_demuxd2, fd_demuxv, fd_demuxt;
int vPid, aPid1, aPid2, dPid1, dPid2; int vPid, aPid1, aPid2, dPid1, dPid2;