remove workarounds to detect buggy fp driver / atmel firmware

diff --git a/Navigation.py b/Navigation.py
index f46b92d44fac0784ed55ae1ea2ebced32a05a29c..e8b44a35087c85d129da6002ef80df5aeae98847 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -33,15 +33,9 @@ class Navigation:
                        clearFPWasTimerWakeup()
                        if getFPWasTimerWakeup(): # sanity check to detect if the FP driver is working correct!
                                print "buggy fp driver detected!!! please update drivers.... ignore timer wakeup!"
                        clearFPWasTimerWakeup()
                        if getFPWasTimerWakeup(): # sanity check to detect if the FP driver is working correct!
                                print "buggy fp driver detected!!! please update drivers.... ignore timer wakeup!"

-                               setFPWakeuptime(0)

                        elif len(self.getRecordings()) or abs(self.RecordTimer.getNextRecordingTime() - time()) <= 360:
                        elif len(self.getRecordings()) or abs(self.RecordTimer.getNextRecordingTime() - time()) <= 360:

-                               setFPWakeuptime(0x89ABCDEF)
-                               if getFPWakeuptime() != 0x89ABCDEF: # sanity check to detect if the FP Atmel Firmware is working correct!
-                                       print "buggy atmel firmware detected!! atmel update needed... ignore fp timer wakeup!"
-                                       setFPWakeuptime(0)
-                               elif not Screens.Standby.inTryQuitMainloop: # not a shutdown messagebox is open
+                               if not Screens.Standby.inTryQuitMainloop: # not a shutdown messagebox is open

                                        RecordTimer.RecordTimerEntry.TryQuitMainloop(0) # start shutdown handling
                                        RecordTimer.RecordTimerEntry.TryQuitMainloop(0) # start shutdown handling

-               setFPWakeuptime(1)

                self.SleepTimer = SleepTimer.SleepTimer()
 
        def dispatchEvent(self, i):
                self.SleepTimer = SleepTimer.SleepTimer()
 
        def dispatchEvent(self, i):

diff --git a/lib/dvb/dvbtime.cpp b/lib/dvb/dvbtime.cpp
index 6cfaccc89f06d213638157d2a3d13a2043a7b384..42b12e85bcdcf2efc86cce470c54fbc19e3a2c1a 100644 (file)
--- a/lib/dvb/dvbtime.cpp
+++ b/lib/dvb/dvbtime.cpp
@@ -18,23 +18,11 @@ void setRTC(time_t time)
        FILE *f = fopen("/proc/stb/fp/rtc", "w");
        if (f)
        {
        FILE *f = fopen("/proc/stb/fp/rtc", "w");
        if (f)
        {

-               time_t wakeup=0;
-               FILE *f2 = fopen("/proc/stb/fp/wakeup_time", "r");
-               if (f2)
-               {
-                       fscanf(f2, "%u", &wakeup);
-                       fclose(f2);
-               }
-               if (wakeup) // atmel firmware okay?
-               {
-                       if (fprintf(f, "%u", time))
-                               prev_time = time;
-                       else
-                               eDebug("write /proc/stb/fp/rtc failed (%m)");
-                       fclose(f);
-               }
+               if (fprintf(f, "%u", time))
+                       prev_time = time;

                else
                else

-                       eDebug("dont set rtc because of buggy atmel firmware!");
+                       eDebug("write /proc/stb/fp/rtc failed (%m)");
+               fclose(f);

        }
        else
        {
        }
        else
        {

diff --git a/mytest.py b/mytest.py
index 2dcd0d3317c5c3d7abd83361b090156e0c0fcda3..810edd000a50b7da5f1ed50f0cc0476e1033571c 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -478,16 +478,13 @@ def runScreenTest():
                if x != -1
        ]
        wakeupList.sort()
                if x != -1
        ]
        wakeupList.sort()

-       if len(wakeupList) and getFPWakeuptime(): # getFPWakeuptime returns 1 when the sanity check in Navigation.py was okay..
+       if len(wakeupList):

                startTime = wakeupList.pop(0)
                if (startTime - nowTime) < 330: # no time to switch box back on
                        wptime = nowTime + 30  # so switch back on in 30 seconds
                else:
                        wptime = startTime - 300
                setFPWakeuptime(wptime)
                startTime = wakeupList.pop(0)
                if (startTime - nowTime) < 330: # no time to switch box back on
                        wptime = nowTime + 30  # so switch back on in 30 seconds
                else:
                        wptime = startTime - 300
                setFPWakeuptime(wptime)

-       else:
-               print "buggy atmel firmware detected... dont set a wakeup time!"
-               setFPWakeuptime(0)

        profile("stopService")
        session.nav.stopService()
        profile("nav shutdown")
        profile("stopService")
        session.nav.stopService()
        profile("nav shutdown")