X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Faice%2Faice_interface.c;h=cb126c6b179dba6f6a293c52af9b1883ec4b4eb3;hb=a3b69dee622066d3a2b70c32775818d82b5ffb54;hp=c7556c018f378c246e5197df2841bced182693cd;hpb=0343ae7cc734d8dfae17ff1ae9dbe834962f6da3;p=fw%2Fopenocd

diff --git a/src/jtag/aice/aice_interface.c b/src/jtag/aice/aice_interface.c
index c7556c018..cb126c6b1 100644
--- a/src/jtag/aice/aice_interface.c
+++ b/src/jtag/aice/aice_interface.c
@@ -20,6 +20,7 @@
 #include "config.h"
 #endif
 
+#include <jtag/adapter.h>
 #include <jtag/interface.h>
 #include <jtag/commands.h>
 #include <transport/transport.h>
@@ -269,7 +270,7 @@ COMMAND_HANDLER(aice_handle_aice_info_command)
 	LOG_DEBUG("aice_handle_aice_info_command");
 
 	command_print(CMD, "Description: %s", param.device_desc);
-	command_print(CMD, "Serial number: %s", param.serial);
+	command_print(CMD, "Serial number: %s", adapter_get_required_serial());
 	if (strncmp(aice_port->name, "aice_pipe", 9) == 0)
 		command_print(CMD, "Adapter: %s", param.adapter_name);
 
@@ -308,18 +309,6 @@ COMMAND_HANDLER(aice_handle_aice_desc_command)
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(aice_handle_aice_serial_command)
-{
-	LOG_DEBUG("aice_handle_aice_serial_command");
-
-	if (CMD_ARGC == 1)
-		param.serial = strdup(CMD_ARGV[0]);
-	else
-		LOG_ERROR("expected exactly one argument to aice serial <serial-number>");
-
-	return ERROR_OK;
-}
-
 COMMAND_HANDLER(aice_handle_aice_vid_pid_command)
 {
 	LOG_DEBUG("aice_handle_aice_vid_pid_command");
@@ -438,13 +427,6 @@ static const struct command_registration aice_subcommand_handlers[] = {
 		.help = "set the aice device description",
 		.usage = "[description string]",
 	},
-	{
-		.name = "serial",
-		.handler = &aice_handle_aice_serial_command,
-		.mode = COMMAND_CONFIG,
-		.help = "set the serial number of the AICE device",
-		.usage = "[serial string]",
-	},
 	{
 		.name = "vid_pid",
 		.handler = &aice_handle_aice_vid_pid_command,