From c21c740a895438832ed7e945ee4943da3eb733f9 Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Sun, 21 Feb 2010 17:19:08 -0800
Subject: [PATCH] ft2232 table init cleanup

Use labeled initializers in the table of layouts instead of
positional ones.  This ls cleaner and less error prone, plus
it simplifies patches which add members to these structure.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
 src/jtag/drivers/ft2232.c | 97 +++++++++++++++++++++++++++++++--------
 1 file changed, 78 insertions(+), 19 deletions(-)

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 82132d3b..5042a22e 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -185,25 +185,84 @@ static void ktlink_blink(void);
 
 static const struct ft2232_layout  ft2232_layouts[] =
 {
-	{ "usbjtag",              usbjtag_init,              usbjtag_reset,      NULL                    },
-	{ "jtagkey",              jtagkey_init,              jtagkey_reset,      NULL                    },
-	{ "jtagkey_prototype_v1", jtagkey_init,              jtagkey_reset,      NULL                    },
-	{ "oocdlink",             jtagkey_init,              jtagkey_reset,      NULL                    },
-	{ "signalyzer",           usbjtag_init,              usbjtag_reset,      NULL                    },
-	{ "evb_lm3s811",          usbjtag_init,              usbjtag_reset,      NULL                    },
-	{ "luminary_icdi",        usbjtag_init,              usbjtag_reset,      NULL                    },
-	{ "olimex-jtag",          olimex_jtag_init,          olimex_jtag_reset,  olimex_jtag_blink       },
-	{ "flyswatter",           flyswatter_init,           flyswatter_reset,   flyswatter_jtag_blink   },
-	{ "turtelizer2",          turtle_init,               turtle_reset,       turtle_jtag_blink       },
-	{ "comstick",             comstick_init,             comstick_reset,     NULL                    },
-	{ "stm32stick",           stm32stick_init,           stm32stick_reset,   NULL                    },
-	{ "axm0432_jtag",         axm0432_jtag_init,         axm0432_jtag_reset, NULL                    },
-	{ "sheevaplug",           sheevaplug_init,           sheevaplug_reset,   NULL                    },
-	{ "icebear",              icebear_jtag_init,         icebear_jtag_reset, NULL                    },
-	{ "cortino",              cortino_jtag_init,         comstick_reset, NULL                        },
-	{ "signalyzer-h",         signalyzer_h_init,         signalyzer_h_reset, signalyzer_h_blink      },
-	{ "ktlink",               ktlink_init,               ktlink_reset,       ktlink_blink            },
-	{ NULL,                   NULL,                      NULL,               NULL                    },
+	{ .name = "usbjtag",
+		.init = usbjtag_init,
+		.reset = usbjtag_reset,
+	},
+	{ .name = "jtagkey",
+		.init = jtagkey_init,
+		.reset = jtagkey_reset,
+	},
+	{ .name = "jtagkey_prototype_v1",
+		.init = jtagkey_init,
+		.reset = jtagkey_reset,
+	},
+	{ .name = "oocdlink",
+		.init = jtagkey_init,
+		.reset = jtagkey_reset,
+	},
+	{ .name = "signalyzer",
+		.init = usbjtag_init,
+		.reset = usbjtag_reset,
+	},
+	{ .name = "evb_lm3s811",
+		.init = usbjtag_init,
+		.reset = usbjtag_reset,
+	},
+	{ .name = "luminary_icdi",
+		.init = usbjtag_init,
+		.reset = usbjtag_reset,
+	},
+	{ .name = "olimex-jtag",
+		.init = olimex_jtag_init,
+		.reset = olimex_jtag_reset,
+		.blink = olimex_jtag_blink
+	},
+	{ .name = "flyswatter",
+		.init = flyswatter_init,
+		.reset = flyswatter_reset,
+		.blink = flyswatter_jtag_blink
+	},
+	{ .name = "turtelizer2",
+		.init = turtle_init,
+		.reset = turtle_reset,
+		.blink = turtle_jtag_blink
+	},
+	{ .name = "comstick",
+		.init = comstick_init,
+		.reset = comstick_reset,
+	},
+	{ .name = "stm32stick",
+		.init = stm32stick_init,
+		.reset = stm32stick_reset,
+	},
+	{ .name = "axm0432_jtag",
+		.init = axm0432_jtag_init,
+		.reset = axm0432_jtag_reset,
+	},
+	{ .name = "sheevaplug",
+		.init = sheevaplug_init,
+		.reset = sheevaplug_reset,
+	},
+	{ .name = "icebear",
+		.init = icebear_jtag_init,
+		.reset = icebear_jtag_reset,
+	},
+	{ .name = "cortino",
+		.init = cortino_jtag_init,
+		.reset = comstick_reset,
+	},
+	{ .name = "signalyzer-h",
+		.init = signalyzer_h_init,
+		.reset = signalyzer_h_reset,
+		.blink = signalyzer_h_blink
+	},
+	{ .name = "ktlink",
+		.init = ktlink_init,
+		.reset = ktlink_reset,
+		.blink = ktlink_blink
+	},
+	{ .name = NULL, /* END OF TABLE */ },
 };
 
 static uint8_t                  nTRST, nTRSTnOE, nSRST, nSRSTnOE;
-- 
2.39.5