NUGGET_PARAM_REBOOT always does a hard reboot
Deep sleep doesn't clear state the way a reboot does, and in most
cases should be irrelevant. Let's reduce the confusion.
Change-Id: I0e2e19d4a5c8a3507e8052e7f1e1f544a8b4c159
Signed-off-by: Bill Richardson <wfrichar@google.com>
diff --git a/citadel/updater/updater.cpp b/citadel/updater/updater.cpp
index 776401e..4993159 100644
--- a/citadel/updater/updater.cpp
+++ b/citadel/updater/updater.cpp
@@ -406,9 +406,9 @@
uint32_t do_reboot(AppClient &app)
{
uint32_t retval;
- std::vector<uint8_t> data = {NUGGET_REBOOT_HARD};
+ std::vector<uint8_t> ignored = {1}; // older images need this
- retval = app.Call(NUGGET_PARAM_REBOOT, data, nullptr);
+ retval = app.Call(NUGGET_PARAM_REBOOT, ignored, nullptr);
if (is_app_success(retval)) {
printf("Citadel reboot requested\n");
diff --git a/nugget/include/app_nugget.h b/nugget/include/app_nugget.h
index aa8a798..b3b2828 100644
--- a/nugget/include/app_nugget.h
+++ b/nugget/include/app_nugget.h
@@ -74,18 +74,12 @@
/*
* Reboot Citadel
*
- * @param args uint8_t hard 0 = soft reboot, 1 = hard reboot
- * @param arg_len sizeof(uint8_t)
+ * @param args <none>
+ * @param arg_len 0
* @param reply <none>
* @param reply_len 0
*/
-enum NUGGET_REBOOT_ARG_TYPE {
- NUGGET_REBOOT_SOFT = 0,
- NUGGET_REBOOT_HARD = 1,
-};
-
-
/*********
* Firmware updates are written to flash with invalid headers. If an update
* password exists, headers can only be marked valid by providing that