From a6c8b005dbea4cac3c198832ba1f4178572ca08e Mon Sep 17 00:00:00 2001
From: Gurjant Kalsi <me@gurjantkalsi.com>
Date: Wed, 16 Sep 2015 15:37:33 -0700
Subject: [PATCH] [console] Use STATIC_COMMAND macro for all console command
 definitions

BUG=

Review URL: https://codereview.chromium.org/1348403002 .
---
 app/pcitests/pci_tests.c          |  2 +-
 app/stringtests/string_tests.c    |  2 +-
 arch/arm/arm/debug.c              |  2 +-
 dev/gpio/debug.c                  |  2 +-
 lib/buildsig/buildsig.c           |  2 +-
 lib/cksum/debug.c                 |  8 ++++----
 lib/debugcommands/debugcommands.c | 24 ++++++++++++------------
 lib/ffs/cmd.c                     |  2 +-
 lib/klog/klog.c                   |  2 +-
 lib/lwip/cmd.c                    |  2 +-
 lib/ptable/ptable.c               |  2 +-
 lib/sysparam/sysparam.c           |  2 +-
 lib/version/version.c             |  2 +-
 platform/omap3/i2c.c              |  2 +-
 platform/power.c                  |  4 ++--
 platform/zynq/gpio.c              |  2 +-
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/pcitests/pci_tests.c b/app/pcitests/pci_tests.c
index 5acff0c0..9b330438 100644
--- a/app/pcitests/pci_tests.c
+++ b/app/pcitests/pci_tests.c
@@ -250,7 +250,7 @@ out:
 }
 
 STATIC_COMMAND_START
-{ "pci", "pci toolbox", &pci_cmd },
+STATIC_COMMAND("pci", "pci toolbox", &pci_cmd)
 STATIC_COMMAND_END(pcitests);
 
 #endif
diff --git a/app/stringtests/string_tests.c b/app/stringtests/string_tests.c
index 2f740862..5aeb8caf 100644
--- a/app/stringtests/string_tests.c
+++ b/app/stringtests/string_tests.c
@@ -350,7 +350,7 @@ out:
 }
 
 STATIC_COMMAND_START
-{ "string", "memcpy tests", &string_tests },
+STATIC_COMMAND("string", "memcpy tests", &string_tests)
 STATIC_COMMAND_END(stringtests);
 
 #endif
diff --git a/arch/arm/arm/debug.c b/arch/arm/arm/debug.c
index 84741eac..2ae73fce 100644
--- a/arch/arm/arm/debug.c
+++ b/arch/arm/arm/debug.c
@@ -202,7 +202,7 @@ static int cmd_dcc(int argc, const cmd_args *argv)
 
 STATIC_COMMAND_START
 #if LK_DEBUGLEVEL > 1
-    { "dcc", "dcc stuff", &cmd_dcc }
+     STATIC_COMMAND("dcc", "dcc stuff", &cmd_dcc)
 #endif
 STATIC_COMMAND_END(dcc);
 
diff --git a/dev/gpio/debug.c b/dev/gpio/debug.c
index 1d4e9878..9a32ae58 100644
--- a/dev/gpio/debug.c
+++ b/dev/gpio/debug.c
@@ -94,7 +94,7 @@ static int cmd_gpio(int argc, const cmd_args *argv)
     return 0;
 }
 STATIC_COMMAND_START
-{ "gpio", "commands for manipulating system gpios", &cmd_gpio },
+STATIC_COMMAND("gpio", "commands for manipulating system gpios", &cmd_gpio)
 STATIC_COMMAND_END(gpio);
 
 #endif
diff --git a/lib/buildsig/buildsig.c b/lib/buildsig/buildsig.c
index 184ea379..3436a1a3 100644
--- a/lib/buildsig/buildsig.c
+++ b/lib/buildsig/buildsig.c
@@ -153,7 +153,7 @@ usage:
 
 STATIC_COMMAND_START
 #if LK_DEBUGLEVEL > 1
-    { "buildsig", "scan for and dump build signature", &cmd_buildsig },
+    STATIC_COMMAND("buildsig", "scan for and dump build signature", &cmd_buildsig)
 #endif
 STATIC_COMMAND_END(buildid);
 
diff --git a/lib/cksum/debug.c b/lib/cksum/debug.c
index c21f4eff..23a7608d 100644
--- a/lib/cksum/debug.c
+++ b/lib/cksum/debug.c
@@ -39,12 +39,12 @@ static int cmd_cksum_bench(int argc, const cmd_args *argv);
 
 STATIC_COMMAND_START
 #if LK_DEBUGLEVEL > 0
-	{ "crc16", "crc16", &cmd_crc16 },
-	{ "crc32", "crc32", &cmd_crc32 },
-	{ "adler32", "adler32", &cmd_adler32 },
+	STATIC_COMMAND("crc16", "crc16", &cmd_crc16)
+	STATIC_COMMAND("crc32", "crc32", &cmd_crc32)
+	STATIC_COMMAND("adler32", "adler32", &cmd_adler32)
 #endif
 #if LK_DEBUGLEVEL > 1
-	{ "bench_cksum", "benchmark the checksum routines", &cmd_cksum_bench },
+	STATIC_COMMAND("bench_cksum", "benchmark the checksum routines", &cmd_cksum_bench)
 #endif
 STATIC_COMMAND_END(crc);
 
diff --git a/lib/debugcommands/debugcommands.c b/lib/debugcommands/debugcommands.c
index 5c6fd940..6af9dd8d 100644
--- a/lib/debugcommands/debugcommands.c
+++ b/lib/debugcommands/debugcommands.c
@@ -50,21 +50,21 @@ static int cmd_chain(int argc, const cmd_args *argv);
 
 STATIC_COMMAND_START
 #if LK_DEBUGLEVEL > 0
-	{ "dw", "display memory in words", &cmd_display_mem },
-	{ "dh", "display memory in halfwords", &cmd_display_mem },
-	{ "db", "display memory in bytes", &cmd_display_mem },
-	{ "mw", "modify word of memory", &cmd_modify_mem },
-	{ "mh", "modify halfword of memory", &cmd_modify_mem },
-	{ "mb", "modify byte of memory", &cmd_modify_mem },
-	{ "fw", "fill range of memory by word", &cmd_fill_mem },
-	{ "fh", "fill range of memory by halfword", &cmd_fill_mem },
-	{ "fb", "fill range of memory by byte", &cmd_fill_mem },
-	{ "mc", "copy a range of memory", &cmd_copy_mem },
+	STATIC_COMMAND("dw", "display memory in words", &cmd_display_mem)
+	STATIC_COMMAND("dh", "display memory in halfwords", &cmd_display_mem)
+	STATIC_COMMAND("db", "display memory in bytes", &cmd_display_mem)
+	STATIC_COMMAND("mw", "modify word of memory", &cmd_modify_mem)
+	STATIC_COMMAND("mh", "modify halfword of memory", &cmd_modify_mem)
+	STATIC_COMMAND("mb", "modify byte of memory", &cmd_modify_mem)
+	STATIC_COMMAND("fw", "fill range of memory by word", &cmd_fill_mem)
+	STATIC_COMMAND("fh", "fill range of memory by halfword", &cmd_fill_mem)
+	STATIC_COMMAND("fb", "fill range of memory by byte", &cmd_fill_mem)
+	STATIC_COMMAND("mc", "copy a range of memory", &cmd_copy_mem)
 #endif
 #if LK_DEBUGLEVEL > 1
-	{ "mtest", "simple memory test", &cmd_memtest },
+	STATIC_COMMAND("mtest", "simple memory test", &cmd_memtest)
 #endif
-	{ "chain", "chain load another binary", &cmd_chain },
+	STATIC_COMMAND("chain", "chain load another binary", &cmd_chain)
 STATIC_COMMAND_END(mem);
 
 static int cmd_display_mem(int argc, const cmd_args *argv)
diff --git a/lib/ffs/cmd.c b/lib/ffs/cmd.c
index 39f7ea3a..be73a349 100644
--- a/lib/ffs/cmd.c
+++ b/lib/ffs/cmd.c
@@ -106,7 +106,7 @@ out:
 }
 
 STATIC_COMMAND_START
-{ "ffs", "ffs toolbox", &ffs_cmd },
+STATIC_COMMAND("ffs", "ffs toolbox", &ffs_cmd)
 STATIC_COMMAND_END(ffscommands);
 
 
diff --git a/lib/klog/klog.c b/lib/klog/klog.c
index e6f73bc7..a3304037 100644
--- a/lib/klog/klog.c
+++ b/lib/klog/klog.c
@@ -609,7 +609,7 @@ usage:
 }
 
 STATIC_COMMAND_START
-{ "klog", "commands for manipulating klog", &cmd_klog },
+STATIC_COMMAND("klog", "commands for manipulating klog", &cmd_klog)
 STATIC_COMMAND_END(klog);
 
 #endif // WITH_LIB_CONSOLE
diff --git a/lib/lwip/cmd.c b/lib/lwip/cmd.c
index 0ee5c1ec..4f26829c 100644
--- a/lib/lwip/cmd.c
+++ b/lib/lwip/cmd.c
@@ -63,7 +63,7 @@ out:
 }
 
 STATIC_COMMAND_START
-{ "net", "net toolbox", &net_cmd },
+STATIC_COMMAND("net", "net toolbox", &net_cmd)
 STATIC_COMMAND_END(net);
 
 #endif
diff --git a/lib/ptable/ptable.c b/lib/ptable/ptable.c
index 03703943..283319d5 100644
--- a/lib/ptable/ptable.c
+++ b/lib/ptable/ptable.c
@@ -927,7 +927,7 @@ usage:
 }
 
 STATIC_COMMAND_START
-{ "ptable", "commands for manipulating the flash partition table", &cmd_ptable },
+STATIC_COMMAND("ptable", "commands for manipulating the flash partition table", &cmd_ptable)
 STATIC_COMMAND_END(ptable);
 
 #endif // WITH_LIB_CONSOLE
diff --git a/lib/sysparam/sysparam.c b/lib/sysparam/sysparam.c
index 1074d972..48f55ba2 100644
--- a/lib/sysparam/sysparam.c
+++ b/lib/sysparam/sysparam.c
@@ -709,7 +709,7 @@ done:
 }
 
 STATIC_COMMAND_START
-{ "sysparam", "commands for manipulating system parameters", &cmd_sysparam },
+STATIC_COMMAND("sysparam", "commands for manipulating system parameters", &cmd_sysparam)
 STATIC_COMMAND_END(sysparam);
 
 #endif // WITH_LIB_CONSOLE
diff --git a/lib/version/version.c b/lib/version/version.c
index 2b0eecc6..127fd07f 100644
--- a/lib/version/version.c
+++ b/lib/version/version.c
@@ -66,7 +66,7 @@ static int cmd_version(int argc, const cmd_args *argv)
 }
 
 STATIC_COMMAND_START
-{ "version", "print version", &cmd_version },
+STATIC_COMMAND("version", "print version", &cmd_version)
 STATIC_COMMAND_END(version);
 
 #endif // WITH_LIB_CONSOLE
diff --git a/platform/omap3/i2c.c b/platform/omap3/i2c.c
index f5b31e0f..2a309796 100644
--- a/platform/omap3/i2c.c
+++ b/platform/omap3/i2c.c
@@ -278,7 +278,7 @@ void i2c_init(void)
 static int cmd_i2c(int argc, const cmd_args *argv);
 
 STATIC_COMMAND_START
-	{ "i2c", "i2c read/write commands", &cmd_i2c },
+STATIC_COMMAND("i2c", "i2c read/write commands", &cmd_i2c)
 STATIC_COMMAND_END(i2c);
 
 static int cmd_i2c(int argc, const cmd_args *argv)
diff --git a/platform/power.c b/platform/power.c
index ecb74457..d4cc8f01 100644
--- a/platform/power.c
+++ b/platform/power.c
@@ -57,8 +57,8 @@ static int cmd_poweroff(int argc, const cmd_args *argv)
 
 STATIC_COMMAND_START
 #if LK_DEBUGLEVEL > 1
-    { "reboot", "soft reset", &cmd_reboot },
-    { "poweroff", "powerdown", &cmd_poweroff },
+STATIC_COMMAND("reboot", "soft reset", &cmd_reboot)
+STATIC_COMMAND("poweroff", "powerdown", &cmd_poweroff)
 #endif
 STATIC_COMMAND_END(platform_power);
 
diff --git a/platform/zynq/gpio.c b/platform/zynq/gpio.c
index 91e2e82d..1f0412c8 100644
--- a/platform/zynq/gpio.c
+++ b/platform/zynq/gpio.c
@@ -277,7 +277,7 @@ static int cmd_zynq_gpio(int argc, const cmd_args *argv)
 }
 STATIC_COMMAND_START
 #if LK_DEBUGLEVEL > 1
-{ "zynq_gpio", "Dump Zynq GPIO registers", &cmd_zynq_gpio },
+STATIC_COMMAND("zynq_gpio", "Dump Zynq GPIO registers", &cmd_zynq_gpio)
 #endif
 STATIC_COMMAND_END(zynq_gpio);