From a58beade0a4f5342f5dcd3b3a597f9183de92260 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Thu, 27 Sep 2012 09:49:29 -0400 Subject: Port reboot functions to C++ --- data.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'data.cpp') diff --git a/data.cpp b/data.cpp index 9c53c46f1..ab240a7a4 100644 --- a/data.cpp +++ b/data.cpp @@ -44,13 +44,9 @@ extern "C" { #include "common.h" #include "data.h" - #include "tw_reboot.h" - #include "roots.h" #include "gui/pages.h" void gui_notifyVarChange(const char *name, const char* value); - - int __system(const char *command); } #define FILE_VERSION 0x00010001 @@ -627,17 +623,17 @@ void DataManager::SetDefaultValues() #endif #endif - mConstValues.insert(make_pair(TW_REBOOT_SYSTEM, tw_isRebootCommandSupported(rb_system) ? "1" : "0")); + mConstValues.insert(make_pair(TW_REBOOT_SYSTEM, "1")); #ifdef TW_NO_REBOOT_RECOVERY mConstValues.insert(make_pair(TW_REBOOT_RECOVERY, "0")); #else - mConstValues.insert(make_pair(TW_REBOOT_RECOVERY, tw_isRebootCommandSupported(rb_recovery) ? "1" : "0")); + mConstValues.insert(make_pair(TW_REBOOT_RECOVERY, "1")); #endif - mConstValues.insert(make_pair(TW_REBOOT_POWEROFF, tw_isRebootCommandSupported(rb_poweroff) ? "1" : "0")); + mConstValues.insert(make_pair(TW_REBOOT_POWEROFF, "1")); #ifdef TW_NO_REBOOT_BOOTLOADER mConstValues.insert(make_pair(TW_REBOOT_BOOTLOADER, "0")); #else - mConstValues.insert(make_pair(TW_REBOOT_BOOTLOADER, tw_isRebootCommandSupported(rb_bootloader) ? "1" : "0")); + mConstValues.insert(make_pair(TW_REBOOT_BOOTLOADER, "1")); #endif #ifdef RECOVERY_SDCARD_ON_DATA mConstValues.insert(make_pair(TW_HAS_DATA_MEDIA, "1")); -- cgit v1.2.3