Accessor for device ID.
A command to the nugget app returns the device ID. An option is added to
citadel_updater to fetch the ID.
Test: citadel_updater --id
Change-Id: I9fec7f029de14b79039956efe2d73e9245148717
diff --git a/citadel/updater/updater.cpp b/citadel/updater/updater.cpp
index 4f70ae2..84da39d 100644
--- a/citadel/updater/updater.cpp
+++ b/citadel/updater/updater.cpp
@@ -52,6 +52,7 @@
struct options_s {
/* actions to take */
int version;
+ int id;
int stats;
int ro;
int rw;
@@ -67,6 +68,7 @@
enum no_short_opts_for_these {
OPT_DEVICE = 1000,
+ OPT_ID,
OPT_STATS,
OPT_RO,
OPT_RW,
@@ -82,6 +84,7 @@
const struct option long_opts[] = {
/* name hasarg *flag val */
{"version", 0, NULL, 'v'},
+ {"id", 0, NULL, OPT_ID},
{"stats", 0, NULL, OPT_STATS},
{"ro", 0, NULL, OPT_RO},
{"rw", 0, NULL, OPT_RW},
@@ -124,6 +127,7 @@
"Actions:\n"
"\n"
" -v, --version Display the Citadel version info\n"
+ " --id Display the Citadel device ID\n"
" --stats Display Low Power stats\n"
" --rw Update RW firmware from the image file\n"
" --ro Update RO firmware from the image file\n"
@@ -349,6 +353,21 @@
return retval;
}
+uint32_t do_id(AppClient &app)
+{
+ uint32_t retval;
+ std::vector<uint8_t> buffer;
+ buffer.reserve(32);
+
+ retval = app.Call(NUGGET_PARAM_DEVICE_ID, buffer, &buffer);
+
+ if (is_app_success(retval)) {
+ printf("%.*s\n", (int) buffer.size(), buffer.data());
+ }
+
+ return retval;
+}
+
uint32_t do_stats(AppClient &app)
{
struct nugget_app_low_power_stats stats;
@@ -511,6 +530,11 @@
return 2;
}
+ if (options.id &&
+ do_id(app) != APP_SUCCESS) {
+ return 2;
+ }
+
if (options.stats &&
do_stats(app) != APP_SUCCESS) {
return 2;
@@ -584,6 +608,10 @@
options.version = 1;
got_action = 1;
break;
+ case OPT_ID:
+ options.id = 1;
+ got_action = 1;
+ break;
case OPT_STATS:
options.stats = 1;
got_action = 1;
diff --git a/nugget/include/app_nugget.h b/nugget/include/app_nugget.h
index c6acfc0..aa8a798 100644
--- a/nugget/include/app_nugget.h
+++ b/nugget/include/app_nugget.h
@@ -156,6 +156,16 @@
* @errors APP_ERROR_BOGUS_ARGS
*/
+#define NUGGET_PARAM_DEVICE_ID 0x0006
+/*
+ * Get the device ID of the chip.
+ *
+ * @param args <none>
+ * @param arg_len 0
+ * @param reply Null-terminated ASCII string
+ * @param reply_len Max length to return
+ */
+
/****************************************************************************/
/* Test related commands */