diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-07-25 00:57:42 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-07-25 00:57:42 +0000 |
| commit | 8aa3def3cf1ca524036897c04278aa0598859534 (patch) | |
| tree | e6e29d3c5388d9e3f9e51e1fad113c442f62d434 /lib | |
| parent | 0ebee4265be628e8b2c354a071e9fab37303c663 (diff) | |
| download | enigma2-8aa3def3cf1ca524036897c04278aa0598859534.tar.gz enigma2-8aa3def3cf1ca524036897c04278aa0598859534.zip | |
fix warnings, add toBCD function
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dvb/dvbtime.cpp | 4 | ||||
| -rw-r--r-- | lib/dvb/dvbtime.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/dvb/dvbtime.cpp b/lib/dvb/dvbtime.cpp index eb0ed692..7f8ebb98 100644 --- a/lib/dvb/dvbtime.cpp +++ b/lib/dvb/dvbtime.cpp @@ -204,7 +204,7 @@ void eDVBLocalTimeHandler::updateTime( time_t tp_time, eDVBChannel *chan, int up now.tm_min, now.tm_sec); m_time_difference = rtc_time - linuxTime; - eDebug("[eDVBLocalTimerHandler] RTC to Receiver time difference is %d seconds", nowTime - rtc_time ); + eDebug("[eDVBLocalTimerHandler] RTC to Receiver time difference is %ld seconds", nowTime - rtc_time ); if ( abs(m_time_difference) > 59 ) { eDebug("[eDVBLocalTimerHandler] set Linux Time to RTC Time"); @@ -270,7 +270,7 @@ void eDVBLocalTimeHandler::updateTime( time_t tp_time, eDVBChannel *chan, int up time_t rtc=getRTC(); m_timeOffsetMap[chan->getChannelID()] = rtc-tp_time; new_diff = rtc-nowTime; // set enigma time to rtc - eDebug("[eDVBLocalTimerHandler] update stored correction to %d (calced against RTC time)", rtc-tp_time ); + eDebug("[eDVBLocalTimerHandler] update stored correction to %ld (calced against RTC time)", rtc-tp_time ); } else if ( abs(ddiff) <= 120 ) { diff --git a/lib/dvb/dvbtime.h b/lib/dvb/dvbtime.h index ec47de46..c4419652 100644 --- a/lib/dvb/dvbtime.h +++ b/lib/dvb/dvbtime.h @@ -18,6 +18,13 @@ inline int fromBCD(int bcd) return ((bcd&0xF0)>>4)*10+(bcd&0xF); } +inline int toBCD(int dec) +{ + if (dec >= 100) + return -1; + return int(dec/10)*0x10 + dec%10; +} + time_t parseDVBtime(__u8 t1, __u8 t2, __u8 t3, __u8 t4, __u8 t5); class TDT: public eGTable |