ao-tools: Clean up ao-sym structure an initializers

Remove unused 'default_addr' field. Use named initializers when
setting up the struct.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-tools/lib/ao-editaltos.c b/ao-tools/lib/ao-editaltos.c
index a8b64098b80602909636a6fdf135efad6a49b0d0..7547c82c69690eda8de608238b4a6e920f9ba4f5 100644 (file)
--- a/ao-tools/lib/ao-editaltos.c
+++ b/ao-tools/lib/ao-editaltos.c
@@ -20,12 +20,26 @@
 #include "ao-editaltos.h"
 
 struct ao_sym ao_symbols[] = {
-
-       { 0, 0, "ao_romconfig_version", 1 },
-       { 0, 0, "ao_romconfig_check",   1 },
-       { 0, 0, "ao_serial_number", 1 },
-       { 0, 0, "ao_radio_cal", 0 },
-       { 0, 0, "ao_usb_descriptors", 0 },
+       {
+               .name = "ao_romconfig_version",
+               .required = 1
+       },
+       {
+               .name = "ao_romconfig_check",
+               .required = 1
+       },
+       {
+               .name = "ao_serial_number",
+               .required = 1
+       },
+       {
+               .name = "ao_radio_cal",
+               .required = 0
+       },
+       {
+               .name = "ao_usb_descriptors",
+               .required = 0
+       },
 };
 
 #define NUM_SYMBOLS            5

diff --git a/ao-tools/lib/ao-hex.h b/ao-tools/lib/ao-hex.h
index 9849746091f7c1c866d01992fbc15b2a51c5bc9e..eb510ba2a18321dc2614f8ac17a3adcb3f14e7b4 100644 (file)
--- a/ao-tools/lib/ao-hex.h
+++ b/ao-tools/lib/ao-hex.h
@@ -51,7 +51,6 @@ struct ao_hex_image {
 
 struct ao_sym {
        unsigned        addr;
-       unsigned        default_addr;
        char            *name;
        bool            required;
        bool            found;