Merge pull request #3705 from fritsch/imx-power

imx6: fixup reboot
This commit is contained in:
Stephan Raue 2014-12-21 13:19:55 +01:00
commit 3fcb388189

View File

@ -1,12 +1,13 @@
From fa31c513986f8429f8e8e4b1ca39455769cd0a1c Mon Sep 17 00:00:00 2001 From fc4ab34876077a012c4d0749b872703f46546255 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com> From: fritsch <peter.fruehberger@gmail.com>
Date: Sat, 13 Dec 2014 18:36:00 +0100 Date: Sat, 13 Dec 2014 18:36:00 +0100
Subject: [PATCH] IMX: PowerManager - do nothing besides rebooting Subject: [PATCH] IMX: PowerManager - do nothing besides rebooting (wrap
Login1)
--- ---
xbmc/powermanagement/PowerManager.cpp | 4 +++ xbmc/powermanagement/PowerManager.cpp | 4 ++
xbmc/powermanagement/linux/CIMXPowerSyscall.h | 40 +++++++++++++++++++++++++++ xbmc/powermanagement/linux/CIMXPowerSyscall.h | 70 +++++++++++++++++++++++++++
2 files changed, 44 insertions(+) 2 files changed, 74 insertions(+)
create mode 100644 xbmc/powermanagement/linux/CIMXPowerSyscall.h create mode 100644 xbmc/powermanagement/linux/CIMXPowerSyscall.h
diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
@ -33,10 +34,10 @@ index 5900f98..f669894 100644
if (CConsoleUPowerSyscall::HasConsoleKitAndUPower()) if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
diff --git a/xbmc/powermanagement/linux/CIMXPowerSyscall.h b/xbmc/powermanagement/linux/CIMXPowerSyscall.h diff --git a/xbmc/powermanagement/linux/CIMXPowerSyscall.h b/xbmc/powermanagement/linux/CIMXPowerSyscall.h
new file mode 100644 new file mode 100644
index 0000000..27e644e index 0000000..2bf428e
--- /dev/null --- /dev/null
+++ b/xbmc/powermanagement/linux/CIMXPowerSyscall.h +++ b/xbmc/powermanagement/linux/CIMXPowerSyscall.h
@@ -0,0 +1,40 @@ @@ -0,0 +1,70 @@
+/* +/*
+ * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2013 Team XBMC
+ * http://xbmc.org + * http://xbmc.org
@ -60,22 +61,50 @@ index 0000000..27e644e
+#pragma once +#pragma once
+#include "powermanagement/IPowerSyscall.h" +#include "powermanagement/IPowerSyscall.h"
+#include "system.h" +#include "system.h"
+#if defined(TARGET_POSIX) +#if defined(TARGET_POSIX) && defined(HAS_DBUS)
+#include "powermanagement/linux/LogindUPowerSyscall.h"
+#endif
+ +
+class CIMXPowerSyscall : public CPowerSyscallWithoutEvents +class CIMXPowerSyscall : public CPowerSyscallWithoutEvents
+{ +{
+public: +public:
+ CIMXPowerSyscall()
+ {
+ m_instance = NULL;
+ #if defined(TARGET_POSIX) && defined(HAS_DBUS)
+ if (CLogindUPowerSyscall::HasLogind())
+ {
+ m_instance = new CLogindUPowerSyscall();
+ }
+ #endif
+ }
+ ~CIMXPowerSyscall()
+ {
+ delete m_instance;
+ }
+ virtual bool Powerdown() {return false; } + virtual bool Powerdown() {return false; }
+ virtual bool Suspend() {return false; } + virtual bool Suspend() {return false; }
+ virtual bool Hibernate() {return false; } + virtual bool Hibernate() {return false; }
+ virtual bool Reboot() {return true; } + virtual bool Reboot()
+ {
+ if (m_instance)
+ return m_instance->Reboot();
+ else
+ return false;
+ }
+ +
+ virtual bool CanPowerdown() {return false; } + virtual bool CanPowerdown() {return false; }
+ virtual bool CanSuspend() {return false; } + virtual bool CanSuspend() {return false; }
+ virtual bool CanHibernate() {return false; } + virtual bool CanHibernate() {return false;}
+ virtual bool CanReboot() {return true; } + virtual bool CanReboot()
+ virtual int BatteryLevel() {return 0; } + {
+ if (m_instance)
+ return m_instance->CanReboot();
+ else
+ return false;
+ }
+ virtual int BatteryLevel() {return 0; }
+
+private:
+ IPowerSyscall * m_instance;
+}; +};
+#endif
--
1.9.1