This is an automated email from Gerrit.

Spencer Oliver (s...@spen-soft.co.uk) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/921

-- gerrit

commit a8485f4c820aa2bc92bd05bc64d2d31efad11cf8
Author: Spencer Oliver <s...@spen-soft.co.uk>
Date:   Tue Oct 23 17:17:09 2012 +0100

    stlink: rename stlink cmd names
    
    As part of the switch to using the hla for the stlink interface we rename
    the cmds to a more generic name.
    
    Update scripts to match new names.
    
    Also add a deprecated name for the 'stm32_stlink' target.
    
    Change-Id: I6f00743da746e3aa13ce06acfdc93c8049545e07
    Signed-off-by: Spencer Oliver <s...@spen-soft.co.uk>

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 2afb250..e3fb1dd 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -219,35 +219,35 @@ COMMAND_HANDLER(hl_interface_handle_api_command)
 
 static const struct command_registration hl_interface_command_handlers[] = {
        {
-        .name = "stlink_device_desc",
+        .name = "hla_device_desc",
         .handler = &hl_interface_handle_device_desc_command,
         .mode = COMMAND_CONFIG,
         .help = "set the a device description of the adapter",
         .usage = "description_string",
         },
        {
-        .name = "stlink_serial",
+        .name = "hla_serial",
         .handler = &hl_interface_handle_serial_command,
         .mode = COMMAND_CONFIG,
         .help = "set the serial number of the adapter",
         .usage = "serial_string",
         },
        {
-        .name = "stlink_layout",
+        .name = "hla_layout",
         .handler = &hl_interface_handle_layout_command,
         .mode = COMMAND_CONFIG,
         .help = "set the layout of the adapter",
         .usage = "layout_name",
         },
        {
-        .name = "stlink_vid_pid",
+        .name = "hla_vid_pid",
         .handler = &hl_interface_handle_vid_pid_command,
         .mode = COMMAND_CONFIG,
         .help = "the vendor and product ID of the adapter",
         .usage = "(vid pid)* ",
         },
         {
-        .name = "stlink_api",
+        .name = "hla_api",
         .handler = &hl_interface_handle_api_command,
         .mode = COMMAND_CONFIG,
         .help = "set the desired stlink api level",
@@ -257,7 +257,7 @@ static const struct command_registration 
hl_interface_command_handlers[] = {
 };
 
 struct jtag_interface hl_interface = {
-       .name = "stlink",
+       .name = "hla",
        .supported = 0,
        .commands = hl_interface_command_handlers,
        .transports = hl_transports,
diff --git a/src/jtag/hla/hla_transport.c b/src/jtag/hla/hla_transport.c
index b132d61..2f48eb9 100644
--- a/src/jtag/hla/hla_transport.c
+++ b/src/jtag/hla/hla_transport.c
@@ -162,11 +162,11 @@ static int hl_transport_init(struct command_context 
*cmd_ctx)
        /* get selected transport as enum */
        tr = HL_TRANSPORT_UNKNOWN;
 
-       if (strcmp(transport->name, "stlink_swd") == 0)
+       if (strcmp(transport->name, "hla_swd") == 0)
                tr = HL_TRANSPORT_SWD;
-       else if (strcmp(transport->name, "stlink_jtag") == 0)
+       else if (strcmp(transport->name, "hla_jtag") == 0)
                tr = HL_TRANSPORT_JTAG;
-       else if (strcmp(transport->name, "stlink_swim") == 0)
+       else if (strcmp(transport->name, "hla_swim") == 0)
                tr = HL_TRANSPORT_SWIM;
 
        int retval = hl_interface_open(tr);
@@ -196,24 +196,24 @@ static int hl_transport_select(struct command_context 
*ctx)
 }
 
 static struct transport hl_swd_transport = {
-       .name = "stlink_swd",
+       .name = "hla_swd",
        .select = hl_transport_select,
        .init = hl_transport_init,
 };
 
 static struct transport hl_jtag_transport = {
-       .name = "stlink_jtag",
+       .name = "hla_jtag",
        .select = hl_transport_select,
        .init = hl_transport_init,
 };
 
 static struct transport hl_swim_transport = {
-       .name = "stlink_swim",
+       .name = "hla_swim",
        .select = hl_transport_select,
        .init = hl_transport_init,
 };
 
-const char *hl_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", 
NULL };
+const char *hl_transports[] = { "hla_swd", "hla_jtag", "hla_swim", NULL };
 
 static void hl_constructor(void) __attribute__ ((constructor));
 static void hl_constructor(void)
diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index 4490b21..72a7393 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -763,7 +763,8 @@ static const struct command_registration 
adapter_command_handlers[] = {
 };
 
 struct target_type stm32_stlink_target = {
-       .name = "stm32_stlink",
+       .name = "hla_target",
+       .deprecated_name = "stm32_stlink",
 
        .init_target = adapter_init_target,
        .target_create = adapter_target_create,
diff --git a/tcl/interface/stlink-v1.cfg b/tcl/interface/stlink-v1.cfg
index 0003183..7f4a672 100644
--- a/tcl/interface/stlink-v1.cfg
+++ b/tcl/interface/stlink-v1.cfg
@@ -2,10 +2,10 @@
 # STMicroelectronics ST-LINK/V1 in-circuit debugger/programmer
 #
 
-interface stlink
-stlink_layout stlink
-stlink_device_desc "ST-LINK/V1"
-stlink_vid_pid 0x0483 0x3744
+interface hla
+hla_layout stlink
+hla_device_desc "ST-LINK/V1"
+hla_vid_pid 0x0483 0x3744
 
 # unused but set to disable warnings
 adapter_khz 1000
diff --git a/tcl/interface/stlink-v2.cfg b/tcl/interface/stlink-v2.cfg
index 25e696c..da0a200 100644
--- a/tcl/interface/stlink-v2.cfg
+++ b/tcl/interface/stlink-v2.cfg
@@ -2,10 +2,10 @@
 # STMicroelectronics ST-LINK/V2 in-circuit debugger/programmer
 #
 
-interface stlink
-stlink_layout stlink
-stlink_device_desc "ST-LINK/V2"
-stlink_vid_pid 0x0483 0x3748
+interface hla
+hla_layout stlink
+hla_device_desc "ST-LINK/V2"
+hla_vid_pid 0x0483 0x3748
 
 # unused but set to disable warnings
 adapter_khz 1000
diff --git a/tcl/target/stm32_stlink.cfg b/tcl/target/stm32_stlink.cfg
index 4b8abeb..f4bfcbb 100644
--- a/tcl/target/stm32_stlink.cfg
+++ b/tcl/target/stm32_stlink.cfg
@@ -25,24 +25,24 @@ if { [info exists CPUTAPID] } {
 
 if { [info exists TRANSPORT] } {
    set _TRANSPORT $TRANSPORT
-   if { $TRANSPORT == "stlink_jtag" } {
+   if { $TRANSPORT == "hla_jtag" } {
       if { [info exists CPUTAPID] == 0 } {
          # jtag requires us to use the jtag tap id
          set _CPUTAPID 0x3ba00477
       }
    }
 } else {
-   set _TRANSPORT stlink_swd
+   set _TRANSPORT hla_swd
 }
 
 #
-# possibles value are stlink_swd or stlink_jtag
+# possibles value are hla_swd or hla_jtag
 #
 transport select $_TRANSPORT
 
 stlink newtap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME stm32_stlink -chain-position $_TARGETNAME
+target create $_TARGETNAME hla_target -chain-position $_TARGETNAME
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 
$_WORKAREASIZE -work-area-backup 0

-- 

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to