avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1138 from MCUdude/pic-detect-mode-cherry 

Detect PICkit4 and SNAP in PIC mode
This commit is contained in:
Stefan Rueger 2022-10-23 21:57:26 +01:00 committed by GitHub
parent 5b008a04cf 72da5c73db
commit 4f6bab6303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 162 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/avrdude.conf.in
View File

@ -2280,7 +2280,7 @@ programmer
type = "jtagice3_updi";
prog_modes = PM_UPDI;
connection_type = usb;
usbpid = 0x217f, 0x2180, 0x2181;
usbpid = 0x2180, 0x217f, 0x2181;
hvupdi_support = 1;
;
@ -2294,7 +2294,7 @@ programmer
type = "jtagice3_pdi";
prog_modes = PM_PDI;
connection_type = usb;
usbpid = 0x217f, 0x2180, 0x2181;
usbpid = 0x2180, 0x217f, 0x2181;
;
#------------------------------------------------------------
@ -2307,7 +2307,7 @@ programmer
type = "jtagice3_isp";
prog_modes = PM_ISP;
connection_type = usb;
usbpid = 0x217f, 0x2180, 0x2181;
usbpid = 0x2180, 0x217f, 0x2181;
;
#------------------------------------------------------------

24
src/jtag3.c
View File

@ -1504,6 +1504,30 @@ int jtag3_open_common(PROGRAMMER *pgm, const char *port) {
}
#endif
if (rv < 0) {
// Check if SNAP or PICkit4 is in PIC mode
for(LNODEID ln=lfirst(pgm->id); ln; ln=lnext(ln)) {
if (matches(ldata(ln), "snap")) {
pinfo.usbinfo.vid = USB_VENDOR_MICROCHIP;
pinfo.usbinfo.pid = USB_DEVICE_SNAP_PIC_MODE;
int pic_mode = serial_open(port, pinfo, &pgm->fd);
if(pic_mode >= 0) {
msg_error("\n");
pmsg_error("MPLAB SNAP in PIC mode detected!\n");
imsg_error("Use MPLAB X or Microchip Studio to switch to AVR mode\n\n");
return -1;
}
} else if(matches(ldata(ln), "pickit4")) {
pinfo.usbinfo.vid = USB_VENDOR_MICROCHIP;
pinfo.usbinfo.pid = USB_DEVICE_PICKIT4_PIC_MODE;
int pic_mode = serial_open(port, pinfo, &pgm->fd);
if(pic_mode >= 0) {
msg_error("\n");
pmsg_error("PICkit4 in PIC mode detected!\n");
imsg_error("Use MPLAB X or Microchip Studio to switch to AVR mode\n\n");
return -1;
}
}
}
pmsg_error("did not find any device matching VID 0x%04x and PID list: ",
(unsigned) pinfo.usbinfo.vid);
int notfirst = 0;

82
src/usb_hidapi.c
View File

@ -65,20 +65,17 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
* right-to-left, so only the least significant nibbles need to be
* specified.
*/
if ((serno = strchr(port, ':')) != NULL)
{
/* first, drop all colons there if any */
if ((serno = strchr(port, ':')) != NULL) {
/* First, drop all colons there if any */
cp2 = ++serno;
while ((cp2 = strchr(cp2, ':')) != NULL)
{
while ((cp2 = strchr(cp2, ':')) != NULL) {
x = strlen(cp2) - 1;
memmove(cp2, cp2 + 1, x);
cp2[x] = '\0';
}
if (strlen(serno) > 12)
{
if (strlen(serno) > 12) {
pmsg_error("invalid serial number %s\n", serno);
return -1;
}
@ -93,25 +90,24 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
*/
struct hid_device_info *list, *walk;
list = hid_enumerate(pinfo.usbinfo.vid, pinfo.usbinfo.pid);
if (list == NULL)
if (list == NULL) {
pmsg_error("No USB HID devices found\n");
return -1;
}
walk = list;
while (walk)
{
while (walk) {
pmsg_notice("usbhid_open(): found %ls, serno: %ls\n", walk->product_string, walk->serial_number);
size_t slen = wcslen(walk->serial_number);
if (slen >= serlen &&
wcscmp(walk->serial_number + slen - serlen, wserno) == 0)
if (slen >= serlen && wcscmp(walk->serial_number + slen - serlen, wserno) == 0)
{
/* found matching serial number */
/* Found matching serial number */
break;
}
pmsg_debug("usbhid_open(): serial number does not match\n");
walk = walk->next;
}
if (walk == NULL)
{
if (walk == NULL) {
pmsg_error("no matching device found\n");
hid_free_enumeration(list);
return -1;
@ -119,21 +115,17 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
pmsg_debug("usbhid_open(): opening path %s\n", walk->path);
dev = hid_open_path(walk->path);
hid_free_enumeration(list);
if (dev == NULL)
{
if (dev == NULL) {
pmsg_error("found device, but hid_open_path() failed\n");
return -1;
}
}
else
{
/*
* No serial number requested, pass straight to hid_open()
*/
} else {
/* No serial number requested, pass straight to hid_open() */
dev = hid_open(pinfo.usbinfo.vid, pinfo.usbinfo.pid, NULL);
if (dev == NULL)
{
pmsg_error("no device found\n");
pmsg_warning("USB device with VID: 0x%04x and PID: 0x%04x not found\n",
pinfo.usbinfo.vid, pinfo.usbinfo.pid);
return -1;
}
}
@ -166,8 +158,7 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
* be incremented by one, as the report ID will be omitted by the
* hidapi library.
*/
if (pinfo.usbinfo.vid == USB_VENDOR_ATMEL)
{
if (pinfo.usbinfo.vid == USB_VENDOR_ATMEL) {
pmsg_debug("usbhid_open(): probing for max packet size\n");
memset(usbbuf, 0, sizeof usbbuf);
usbbuf[0] = 0; /* no HID reports used */
@ -180,7 +171,7 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
memset(usbbuf, 0, sizeof usbbuf);
int res = hid_read_timeout(dev, usbbuf, 10 /* bytes */, 50 /* milliseconds */);
if (res == 0) {
/* no timely response, assume 512 byte size */
/* No timely response, assume 512 byte size */
hid_write(dev, usbbuf, (512 - 64) + 1);
fd->usb.max_xfer = 512;
res = hid_read_timeout(dev, usbbuf, 10, 50);
@ -208,8 +199,7 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
return 0;
}
static void usbhid_close(union filedescriptor *fd)
{
static void usbhid_close(union filedescriptor *fd) {
hid_device *udev = (hid_device *)fd->usb.handle;
if (udev == NULL)
@ -219,22 +209,20 @@ static void usbhid_close(union filedescriptor *fd)
}
static int usbhid_send(const union filedescriptor *fd, const unsigned char *bp, size_t mlen)
{
static int usbhid_send(const union filedescriptor *fd, const unsigned char *bp, size_t mlen) {
hid_device *udev = (hid_device *)fd->usb.handle;
int rv;
int i = mlen;
const unsigned char * p = bp;
unsigned char usbbuf[USBDEV_MAX_XFER_3 + 1];
int tx_size;
if (udev == NULL)
return -1;
tx_size = (mlen < USBDEV_MAX_XFER_3)? mlen: USBDEV_MAX_XFER_3;
usbbuf[0] = 0; /* no report ID used */
usbbuf[0] = 0; /* No report ID used */
memcpy(usbbuf + 1, bp, tx_size);
rv = hid_write(udev, usbbuf, tx_size + 1);
if (rv < 0) {
@ -244,18 +232,15 @@ static int usbhid_send(const union filedescriptor *fd, const unsigned char *bp,
if (rv != tx_size + 1)
pmsg_error("short write to USB: %d bytes out of %d written\n", rv, tx_size + 1);
if (verbose > 4)
{
if (verbose > 4) {
pmsg_trace2("sent: ");
while (i) {
unsigned char c = *p;
if (isprint(c)) {
if (isprint(c))
msg_trace2("%c ", c);
}
else {
else
msg_trace2(". ");
}
msg_trace2("[%02x] ", c);
p++;
@ -266,8 +251,7 @@ static int usbhid_send(const union filedescriptor *fd, const unsigned char *bp,
return 0;
}
static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_t nbytes)
{
static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_t nbytes) {
hid_device *udev = (hid_device *)fd->usb.handle;
int i, rv;
unsigned char * p = buf;
@ -279,18 +263,15 @@ static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_
if (i != nbytes)
pmsg_error("short read, read only %d out of %lu bytes\n", i, (unsigned long) nbytes);
if (verbose > 4)
{
if (verbose > 4) {
pmsg_trace2("recv: ");
while (i) {
unsigned char c = *p;
if (isprint(c)) {
if (isprint(c))
msg_trace2("%c ", c);
}
else {
else
msg_trace2(". ");
}
msg_trace2("[%02x] ", c);
p++;
@ -298,12 +279,10 @@ static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_
}
msg_trace2("\n");
}
return rv;
}
static int usbhid_drain(const union filedescriptor *fd, int display)
{
static int usbhid_drain(const union filedescriptor *fd, int display) {
/*
* There is not much point in trying to flush any data
* on an USB endpoint, as the endpoint is supposed to
@ -321,8 +300,7 @@ static int usbhid_drain(const union filedescriptor *fd, int display)
/*
* Device descriptor.
*/
struct serial_device usbhid_serdev =
{
struct serial_device usbhid_serdev = {
.open = usbhid_open,
.close = usbhid_close,
.send = usbhid_send,

11
src/usbdevs.h
View File

@ -25,7 +25,9 @@
#ifndef usbdevs_h
#define usbdevs_h
#define USB_VENDOR_ATMEL 1003
#define USB_VENDOR_ATMEL 0x03EB
#define USB_VENDOR_MICROCHIP 0x04D8
#define USB_DEVICE_JTAGICEMKII 0x2103
#define USB_DEVICE_AVRISPMKII 0x2104
#define USB_DEVICE_STK600 0x2106
@ -34,6 +36,13 @@
#define USB_DEVICE_XPLAINEDPRO 0x2111
#define USB_DEVICE_JTAG3_EDBG 0x2140
#define USB_DEVICE_ATMEL_ICE 0x2141
#define USB_DEVICE_POWERDEBUGGER 0x2144
#define USB_DEVICE_XPLAINEDMINI 0x2145
#define USB_DEVICE_PKOBN 0x2175
#define USB_DEVICE_PICKIT4_AVR_MODE 0x2177
#define USB_DEVICE_PICKIT4_PIC_MODE 0x9012
#define USB_DEVICE_SNAP_AVR_MODE 0x2180
#define USB_DEVICE_SNAP_PIC_MODE 0x9018
#define USB_VENDOR_FTDI 0x0403
#define USB_DEVICE_FT2232 0x6010