diff options
| author | Ahmed BOUDJELIDA <aboudjelida@nanoxplore.com> | 2023-12-06 15:28:16 +0100 |
|---|---|---|
| committer | Evgeniy Naydanov <109669442+en-sc@users.noreply.github.com> | 2024-01-29 13:36:27 +0300 |
| commit | f064c670f180a3aedb431297cbb6f32e09d5f6f2 (patch) | |
| tree | 158de79c2540839db6864a8383056808a0e171ae | |
| parent | 974e29aef678173290b1f5456c0e116e69e3ad4d (diff) | |
| download | riscv-openocd-f064c670f180a3aedb431297cbb6f32e09d5f6f2.zip riscv-openocd-f064c670f180a3aedb431297cbb6f32e09d5f6f2.tar.gz riscv-openocd-f064c670f180a3aedb431297cbb6f32e09d5f6f2.tar.bz2 | |
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 <aboudjelida@nanoxplore.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7991
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
| -rw-r--r-- | contrib/60-openocd.rules | 1 | ||||
| -rw-r--r-- | contrib/firmware/angie/c/Makefile | 3 | ||||
| -rw-r--r-- | contrib/firmware/angie/c/src/usb.c | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/angie.c | 13 | ||||
| -rw-r--r-- | src/jtag/drivers/angie/angie_firmware.bin | bin | 10256 -> 10256 bytes |
5 files changed, 12 insertions, 7 deletions
diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules index b0e229d..fe8b00c 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 e919cd0..1bcc1f7 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 de19641..a1b72e2 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 79195a9..d4219d3 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 Binary files differindex 23c4a82..c793abb 100644 --- a/src/jtag/drivers/angie/angie_firmware.bin +++ b/src/jtag/drivers/angie/angie_firmware.bin |