From: Keith Packard <keithp@keithp.com>
Date: Thu, 1 May 2014 05:13:44 +0000 (-0700)
Subject: ao-tools: Clean up ao-sym structure an initializers
X-Git-Tag: 1.3.2.2~129
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=0223fced2c6d2b9f63ede6258afae46c3f55c200

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 a8b64098..7547c82c 100644
--- 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 98497460..eb510ba2 100644
--- 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;