[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-651-g2992ec909

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  2992ec909588bebf89fe87e1db0aae0f51f0ff07 (commit)
      from  53b94fad58ab32b02531f13299968c41f49947fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2992ec909588bebf89fe87e1db0aae0f51f0ff07
Author: Jonathan Forrest <jon...@gm...>
Date:   Wed May 1 14:25:32 2024 +1000

    jtag/drivers/mpsse: Added FT4232HA
    
    Added FT4232HA varianet of FTDI's FT4232H which has a different bcd.
    Also added default PID/VID for the FT4243HA to contrib/60-openocd.rules.
    And added default PID/VIDs for FTDI's HP ICs to contrib/60-openocd.rules
    as this wasn't done previously.
    
    BugLink: https://sourceforge.net/p/openocd/tickets/410/
    
    Change-Id: Ia84b566aa004332d3f7815a3d22ac37eee4f522a
    Signed-off-by: Jonathan Forrest <jon...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8225
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index fe8b00cb7..29f8d7a6d 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -29,6 +29,27 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6014", MODE="660", GROUP="plugdev",
 # Original FT231XQ VID:PID
 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# Original FT2233HP VID:PID
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6040", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# Original FT4233HP VID:PID
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6041", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# Original FT2232HP VID:PID
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6042", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# Original FT4232HP VID:PID
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6043", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# Original FT233HP VID:PID
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6044", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# Original FT232HP VID:PID
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6045", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# Original FT4232HA VID:PID
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6048", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # DISTORTEC JTAG-lock-pick Tiny 2
 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="8220", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c
index f3499e386..3decddb0e 100644
--- a/src/jtag/drivers/mpsse.c
+++ b/src/jtag/drivers/mpsse.c
@@ -283,6 +283,9 @@ static bool open_matching_device(struct mpsse_ctx *ctx, const uint16_t vids[], c
 	case 0x3300:
 		ctx->type = TYPE_FT232HP;
 		break;
+	case 0x3600:
+		ctx->type = TYPE_FT4232HA;
+		break;
 	default:
 		LOG_ERROR("unsupported FTDI chip type: 0x%04x", desc.bcdDevice);
 		goto error;
diff --git a/src/jtag/drivers/mpsse.h b/src/jtag/drivers/mpsse.h
index e92a9bb56..737560d95 100644
--- a/src/jtag/drivers/mpsse.h
+++ b/src/jtag/drivers/mpsse.h
@@ -30,6 +30,7 @@ enum ftdi_chip_type {
 	TYPE_FT4232HP,
 	TYPE_FT233HP,
 	TYPE_FT232HP,
+	TYPE_FT4232HA,
 };
 
 struct mpsse_ctx;

-----------------------------------------------------------------------

Summary of changes:
 contrib/60-openocd.rules | 21 +++++++++++++++++++++
 src/jtag/drivers/mpsse.c |  3 +++
 src/jtag/drivers/mpsse.h |  1 +
 3 files changed, 25 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository