mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit: remove / tone down debug messages

Browse Source
This commit is contained in:
Stefan Seyfried
2015-02-22 00:52:31 +01:00
parent 9c7a73b2db
commit 05d2c314c2
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/zapit/src/femanager.cpp
View File

@@ -661,7 +661,6 @@ CFrontend * CFEManager::allocateFE(CZapitChannel * channel, bool forrecord)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
fedebug = 1;
if (forrecord) if (forrecord)
fedebug = 1; fedebug = 1;
CFrontend * frontend = getFrontend(channel); CFrontend * frontend = getFrontend(channel);

19
src/zapit/src/frontend.cpp
View File

@@ -694,6 +694,8 @@ struct dvb_frontend_event CFrontend::getEvent(void)
} }
if (pfd.revents & (POLLIN | POLLPRI)) { if (pfd.revents & (POLLIN | POLLPRI)) {
//FE_TIMER_STOP("poll has event after");
timer_msec = time_monotonic_ms() - timer_start; /* FE_TIMER_STOP does this :( */
memset(&event, 0, sizeof(struct dvb_frontend_event)); memset(&event, 0, sizeof(struct dvb_frontend_event));
ret = ioctl(fd, FE_GET_EVENT, &event); ret = ioctl(fd, FE_GET_EVENT, &event);
@@ -704,7 +706,6 @@ struct dvb_frontend_event CFrontend::getEvent(void)
//printf("[fe%d] poll events %d status %x\n", fenumber, pfd.revents, event.status); //printf("[fe%d] poll events %d status %x\n", fenumber, pfd.revents, event.status);
if (event.status == 0) /* some drivers always deliver an empty event after tune */ if (event.status == 0) /* some drivers always deliver an empty event after tune */
continue; continue;
//FE_TIMER_STOP("poll has event after");
if (event.status & FE_HAS_LOCK) { if (event.status & FE_HAS_LOCK) {
INFO("[fe%d] ******** FE_HAS_LOCK: freq %lu", fenumber, (long unsigned int)event.parameters.frequency); INFO("[fe%d] ******** FE_HAS_LOCK: freq %lu", fenumber, (long unsigned int)event.parameters.frequency);
@@ -1157,7 +1158,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
cmdseq.props[MODULATION].u.data = feparams->modulation; cmdseq.props[MODULATION].u.data = feparams->modulation;
cmdseq.props[ROLLOFF].u.data = feparams->rolloff; cmdseq.props[ROLLOFF].u.data = feparams->rolloff;
cmdseq.props[PILOTS].u.data = pilot; cmdseq.props[PILOTS].u.data = pilot;
printf("[fe%d] tuner pilot %d (feparams %d)\n", fenumber, pilot, feparams->pilot); if (zapit_debug) printf("[fe%d] tuner pilot %d (feparams %d)\n", fenumber, pilot, feparams->pilot);
} else { } else {
memcpy(cmdseq.props, dvbs_cmdargs, sizeof(dvbs_cmdargs)); memcpy(cmdseq.props, dvbs_cmdargs, sizeof(dvbs_cmdargs));
nrOfProps = FE_DVBS_PROPS; nrOfProps = FE_DVBS_PROPS;
@@ -1278,12 +1279,12 @@ void CFrontend::secSetTone(const fe_sec_tone_mode_t toneMode, const uint32_t ms)
return; return;
} }
printf("[fe%d] tone %s\n", fenumber, toneMode == SEC_TONE_ON ? "on" : "off"); if (zapit_debug) printf("[fe%d] tone %s\n", fenumber, toneMode == SEC_TONE_ON ? "on" : "off");
FE_TIMER_INIT(); //FE_TIMER_INIT();
FE_TIMER_START(); //FE_TIMER_START();
if (fop(ioctl, FE_SET_TONE, toneMode) == 0) { if (fop(ioctl, FE_SET_TONE, toneMode) == 0) {
currentToneMode = toneMode; currentToneMode = toneMode;
FE_TIMER_STOP("FE_SET_TONE took"); //FE_TIMER_STOP("FE_SET_TONE took");
usleep(1000 * ms); usleep(1000 * ms);
} }
} }
@@ -1296,7 +1297,7 @@ void CFrontend::secSetVoltage(const fe_sec_voltage_t voltage, const uint32_t ms)
if (currentVoltage == voltage) if (currentVoltage == voltage)
return; return;
printf("[fe%d] voltage %s\n", fenumber, voltage == SEC_VOLTAGE_OFF ? "OFF" : voltage == SEC_VOLTAGE_13 ? "13" : "18"); if (zapit_debug) printf("[fe%d] voltage %s\n", fenumber, voltage == SEC_VOLTAGE_OFF ? "OFF" : voltage == SEC_VOLTAGE_13 ? "13" : "18");
if (config.diseqcType == DISEQC_UNICABLE && voltage != SEC_VOLTAGE_OFF) { if (config.diseqcType == DISEQC_UNICABLE && voltage != SEC_VOLTAGE_OFF) {
/* see my comment in secSetTone... */ /* see my comment in secSetTone... */
currentVoltage = voltage; /* need to know polarization for unicable */ currentVoltage = voltage; /* need to know polarization for unicable */
@@ -1702,7 +1703,7 @@ void CFrontend::setDiseqc(int sat_no, const uint8_t pol, const uint32_t frequenc
if ((config.diseqcType == NO_DISEQC) || sat_no < 0) if ((config.diseqcType == NO_DISEQC) || sat_no < 0)
return; return;
printf("[fe%d] diseqc input %d -> %d\n", fenumber, currentDiseqc, sat_no); if (zapit_debug) printf("[fe%d] diseqc input %d -> %d\n", fenumber, currentDiseqc, sat_no);
currentDiseqc = sat_no; currentDiseqc = sat_no;
if (slave) if (slave)
return; return;
@@ -1859,7 +1860,7 @@ int CFrontend::driveToSatellitePosition(t_satellite_position satellitePosition,
if (sit != satellites.end()) if (sit != satellites.end())
old_position = sit->second.motor_position; old_position = sit->second.motor_position;
printf("[fe%d] sat pos %d -> %d motor pos %d -> %d usals %s\n", fenumber, rotorSatellitePosition, satellitePosition, old_position, new_position, use_usals ? "on" : "off"); if (zapit_debug) printf("[fe%d] sat pos %d -> %d motor pos %d -> %d usals %s\n", fenumber, rotorSatellitePosition, satellitePosition, old_position, new_position, use_usals ? "on" : "off");
if (rotorSatellitePosition == satellitePosition) if (rotorSatellitePosition == satellitePosition)
return 0; return 0;

2
src/zapit/src/zapit.cpp
View File

@@ -638,7 +638,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
if (startplayback /* && !we_playing*/) if (startplayback /* && !we_playing*/)
StartPlayBack(current_channel); StartPlayBack(current_channel);
printf("[zapit] sending capmt....\n"); //printf("[zapit] sending capmt....\n");
SendPMT(forupdate); SendPMT(forupdate);
//play: //play: