From c1b64c546453180d230b42565b9238f40a8e13f1 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 13 Nov 2017 21:17:36 +0100
Subject: [PATCH] neutrino: avoid some ifdef's; prioritize proc filesystem

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/456c12dfb3768f11292e8e8934d11d5b8c4290d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

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

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
---
 src/neutrino.cpp | 74 +++++++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 7de60f5ac..b2105592d 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2178,20 +2178,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");
 	}
@@ -3949,33 +3952,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;