This is an automated email from Gerrit.
"ahmed BOUDJELIDA <aboudjel...@nanoxplore.com>" just uploaded a new patch set
to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7991
-- gerrit
commit 44eceebd811323ac8509aa01288106ef558a72d1
Author: Ahmed BOUDJELIDA <aboudjel...@nanoxplore.com>
Date: Wed Dec 6 15:28:16 2023 +0100
jtag/drivers: give ANGIE a new VID after renumeration
Give ANGIE a new VID after renumeration to be able to distinguich
the two cases (programmed and not programmed)
Change-Id: I30a91d8ed2e8e261221488b98d40a027ca41da52
Signed-off-by: Ahmed BOUDJELIDA <aboudjel...@nanoxplore.com>
diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index b0e229d07f..8e67957086 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -226,6 +226,7 @@ ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1002",
MODE="660", GROUP="plugdev",
# ANGIE USB-JTAG Adapter
ATTRS{idVendor}=="584e", ATTRS{idProduct}=="424e", MODE="660",
GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="584e", ATTRS{idProduct}=="414f", 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"
ATTRS{idVendor}=="584e", ATTRS{idProduct}=="4a55", MODE="660",
GROUP="plugdev", TAG+="uaccess"
diff --git a/contrib/firmware/angie/c/Makefile
b/contrib/firmware/angie/c/Makefile
index e919cd0114..1bcc1f7d1e 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 de19641307..a1b72e2d6e 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 bf997009d6..c54d132620 100644
--- a/src/jtag/drivers/angie.c
+++ b/src/jtag/drivers/angie.c
@@ -31,9 +31,10 @@
/** 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_2 0x414F
+#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. */
@@ -254,8 +255,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 23c4a8234a..c793abb2f2 100644
Binary files a/src/jtag/drivers/angie/angie_firmware.bin and
b/src/jtag/drivers/angie/angie_firmware.bin differ
--
