mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: avoid some ifdef's; prioritize proc filesystem

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 268408d12b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- neutrino: avoid some ifdef's; prioritize proc filesystem

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-13 21:17:36 +01:00
parent b5425ed82d
commit 1c70a05c73
1 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/neutrino.cpp
View File

@@ -2320,20 +2320,23 @@ void wake_up(bool &wakeup)
close(fd);
}
#endif
#if HAVE_ARM_HARDWARE
FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "r");
if (f)
/* prioritize proc filesystem */
if (access("/proc/stb/fp/was_timer_wakeup", F_OK) == 0)
{
unsigned int tmp;
if (fscanf(f, "%u", &tmp) != 1)
printf("[neutrino] read /proc/stb/fp/was_timer_wakeup failed: %m\n");
else
wakeup = (tmp > 0);
fclose(f);
FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "r");
if (f)
{
unsigned int tmp;
if (fscanf(f, "%u", &tmp) != 1)
printf("[neutrino] read /proc/stb/fp/was_timer_wakeup failed: %m\n");
else
wakeup = (tmp > 0);
fclose(f);
}
}
#endif // HAVE_ARM_HARDWARE
/* not platform specific - this is created by the init process */
if (access("/tmp/.timer_wakeup", F_OK) == 0) {
else if (access("/tmp/.timer_wakeup", F_OK) == 0)
{
wakeup = 1;
unlink("/tmp/.timer_wakeup");
}
@@ -4188,33 +4191,38 @@ void CNeutrinoApp::ExitRun(int can_shutdown)
#endif
if (timer_minutes || leds)
{
#if HAVE_ARM_HARDWARE
FILE *f = fopen("/proc/stb/fp/wakeup_time","w");
if (f)
/* prioritize proc filesystem */
if (access("/proc/stb/fp/was_timer_wakeup", F_OK) == 0)
{
time_t t = timer_minutes * 60;
struct tm *tm = localtime(&t);
char date[30];
strftime(date, sizeof(date), "%c", tm);
fprintf(stderr, "timer_wakeup: %s (%ld)\n", date, timer_minutes * 60);
fprintf(f, "%ld\n", timer_minutes * 60);
fclose(f);
FILE *f = fopen("/proc/stb/fp/wakeup_time","w");
if (f)
{
time_t t = timer_minutes * 60;
struct tm *tm = localtime(&t);
char date[30];
strftime(date, sizeof(date), "%c", tm);
fprintf(stderr, "timer_wakeup: %s (%ld)\n", date, timer_minutes * 60);
fprintf(f, "%ld\n", timer_minutes * 60);
fclose(f);
}
else
perror("fopen /proc/stb/fp/wakeup_time");
}
/* not platform specific */
else
perror("fopen /proc/stb/fp/wakeup_time");
#else
FILE *f = fopen("/tmp/.timer", "w");
if (f)
{
fprintf(stderr, "timer_wakeup: %ld\n", timer_minutes * 60);
fprintf(f, "%ld\n", timer_minutes * 60);
fprintf(f, "%d\n", leds);
fprintf(f, "%d\n", bright);
fclose(f);
FILE *f = fopen("/tmp/.timer", "w");
if (f)
{
fprintf(stderr, "timer_wakeup: %ld\n", timer_minutes * 60);
fprintf(f, "%ld\n", timer_minutes * 60);
fprintf(f, "%d\n", leds);
fprintf(f, "%d\n", bright);
fclose(f);
}
else
perror("fopen /tmp/.timer");
}
else
perror("fopen /tmp/.timer");
#endif
}
delete g_RCInput;