[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-489-g868700e72

[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  868700e72073ca04ab71e8d03f56e5df031d5a7b (commit)
      from  74807daeb36a3be891913d2e03e58d0a23b6fcb9 (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 868700e72073ca04ab71e8d03f56e5df031d5a7b
Author: Ahmed BOUDJELIDA <abo...@na...>
Date:   Wed Dec 6 15:28:16 2023 +0100

    jtag/drivers: give ANGIE a new PID after renumeration
    
    Give ANGIE a new PID after renumeration to be able to distinguish
    the two cases (programmed and not programmed)
    
    Change-Id: I30a91d8ed2e8e261221488b98d40a027ca41da52
    Signed-off-by: Ahmed BOUDJELIDA <abo...@na...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7991
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index b0e229d07..fe8b00cb7 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -225,6 +225,7 @@ ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="660", GROUP="plugdev",
 ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1002", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
 # ANGIE USB-JTAG Adapter
+ATTRS{idVendor}=="584e", ATTRS{idProduct}=="414f", MODE="660", GROUP="plugdev", TAG+="uaccess"
 ATTRS{idVendor}=="584e", ATTRS{idProduct}=="424e", MODE="660", GROUP="plugdev", TAG+="uaccess"
 ATTRS{idVendor}=="584e", ATTRS{idProduct}=="4255", MODE="660", GROUP="plugdev", TAG+="uaccess"
 ATTRS{idVendor}=="584e", ATTRS{idProduct}=="4355", MODE="660", GROUP="plugdev", TAG+="uaccess"
diff --git a/contrib/firmware/angie/c/Makefile b/contrib/firmware/angie/c/Makefile
index e919cd011..1bcc1f7d1 100644
--- a/contrib/firmware/angie/c/Makefile
+++ b/contrib/firmware/angie/c/Makefile
@@ -74,3 +74,6 @@ clean:
 
 bin: angie_firmware.ihx
 	makebin -p angie_firmware.ihx angie_firmware.bin
+
+hex: angie_firmware.ihx
+	$(PACKIHX) angie_firmware.ihx > fx2.hex
diff --git a/contrib/firmware/angie/c/src/usb.c b/contrib/firmware/angie/c/src/usb.c
index de1964130..a1b72e2d6 100644
--- a/contrib/firmware/angie/c/src/usb.c
+++ b/contrib/firmware/angie/c/src/usb.c
@@ -42,7 +42,7 @@ __code struct usb_device_descriptor device_descriptor = {
 	.bdeviceprotocol =	0x01,
 	.bmaxpacketsize0 =	64,
 	.idvendor =			0x584e,
-	.idproduct =		0x424e,
+	.idproduct =		0x414f,
 	.bcddevice =		0x0000,
 	.imanufacturer =	1,
 	.iproduct =			2,
diff --git a/src/jtag/drivers/angie.c b/src/jtag/drivers/angie.c
index 79195a947..d4219d3c5 100644
--- a/src/jtag/drivers/angie.c
+++ b/src/jtag/drivers/angie.c
@@ -31,10 +31,11 @@
 
 /** USB Product ID of ANGIE device in unconfigured state (no firmware loaded
  *  yet) or with its firmware. */
-#define ANGIE_PID 0x424e
-#define ANGIE_PID_2 0x4255
-#define ANGIE_PID_3 0x4355
-#define ANGIE_PID_4 0x4a55
+#define ANGIE_PID 0x414F
+#define ANGIE_PID_2 0x424e
+#define ANGIE_PID_3 0x4255
+#define ANGIE_PID_4 0x4355
+#define ANGIE_PID_5 0x4a55
 
 /** Address of EZ-USB ANGIE CPU Control & Status register. This register can be
  *  written by issuing a Control EP0 vendor request. */
@@ -255,8 +256,8 @@ static struct angie *angie_handle;
 static int angie_usb_open(struct angie *device)
 {
 	struct libusb_device_handle *usb_device_handle;
-	const uint16_t vids[] = {ANGIE_VID, ANGIE_VID, ANGIE_VID, ANGIE_VID, 0};
-	const uint16_t pids[] = {ANGIE_PID, ANGIE_PID_2, ANGIE_PID_3, ANGIE_PID_4, 0};
+	const uint16_t vids[] = {ANGIE_VID, ANGIE_VID, ANGIE_VID, ANGIE_VID, ANGIE_VID, 0};
+	const uint16_t pids[] = {ANGIE_PID, ANGIE_PID_2, ANGIE_PID_3, ANGIE_PID_4, ANGIE_PID_5, 0};
 
 	int ret = jtag_libusb_open(vids, pids, NULL, &usb_device_handle, NULL);
 
diff --git a/src/jtag/drivers/angie/angie_firmware.bin b/src/jtag/drivers/angie/angie_firmware.bin
index 23c4a8234..c793abb2f 100644
Binary files a/src/jtag/drivers/angie/angie_firmware.bin and b/src/jtag/drivers/angie/angie_firmware.bin differ

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

Summary of changes:
 contrib/60-openocd.rules                  |   1 +
 contrib/firmware/angie/c/Makefile         |   3 +++
 contrib/firmware/angie/c/src/usb.c        |   2 +-
 src/jtag/drivers/angie.c                  |  13 +++++++------
 src/jtag/drivers/angie/angie_firmware.bin | Bin 10256 -> 10256 bytes
 5 files changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository