Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-29 12:28:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Utilise str_set_vid_pid_serno() for ch341a.c

Browse Source
This commit is contained in:
Stefan Rueger
2026-06-18 19:37:49 +01:00
parent f501c8ea40
commit e74ad9434c
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/avrdude.1
View File

@@ -613,18 +613,19 @@ they are automatically identified via their vendor and product IDs from
avrdude.conf or .avrduderc. Only when there are multiple programmers of
the same type plugged into the host computer is the -P option needed, see
below. Some -c programmers, however, ignore the -P option altogether, eg,
pickit2, teensy or ch341a; these cannot distinguish multiple plugged-in
pickit2 or teensy; these cannot distinguish multiple plugged-in
programmers.
.Pp
Most USB programmers, however, support the command-line syntax -P
Most USB programmers, however, support the command-line syntax -P
usb[:<vid>:<pid>][:<serialno>] which allows the user to override the
vendor and product IDs with hexadecimal numbers <vid> and <pid> and/or
request a match of the desired device's serial number with <serialno>. The
match is done after stripping any existing colons from the given serial
number on the command line, and right-to-left, so only the least
significant bytes from the serial number need to be given. The JTAG ICE
mkII, JTAGICE3, SNAP, PICKit5 and avrftdi programmers are examples for
this -P port syntax.
mkII, JTAGICE3, SNAP, PICKit5, CH341A and avrftdi programmers are examples
for this -P port syntax. Some of these in turn, e.g. the CH341A, are not
capable of matching serial numbers.
.Pp
If
.Nm

2
src/avrftdi.c
View File

@@ -645,7 +645,7 @@ static int avrftdi_open(PROGRAMMER *pgm, const char *port) {
pmsg_debug("%s(\"%s\")\n", __func__, port);
// Override/set pid, vid and/or serno from -P usb[:<vid>:<pid>][:<serno>]
// Set new_vid, new_pid and/or serno from -P usb[:<vid>:<pid>][:<serno>]
if((numids = str_set_vid_pid_serno(port, &new_vid, &new_pid, serno, sizeof serno)) < 0) {
pmsg_error("invalid -P %s; drop -P option or use -P usb[:<vid>:<pid>][:<serno>]\n", port);
return LIBAVRDUDE_EXIT_FAIL;

32
src/ch341a.c
View File

@@ -196,29 +196,33 @@ bool CH341ChipSelect(const PROGRAMMER *pgm, unsigned int cs, bool enable) {
}
static int ch341a_open(PROGRAMMER *pgm, const char *port) {
LNODEID usbpid = lfirst(pgm->usbpid);
int pid, vid, j, r;
int pid, vid, j, r, numids;
int errorCode = USB_ERROR_NOTFOUND;
libusb_device_handle *handle = NULL;
char serno[64] = {0};
unsigned short new_vid = 0, new_pid = 0;
pmsg_debug("%s(\"%s\")\n", __func__, port);
if(!str_caseeq(port, "usb"))
pmsg_warning("option -P %s ignored\n", port);
// Set new_vid, new_pid and/or serno from -P usb[:<vid>:<pid>]
if((numids = str_set_vid_pid_serno(port, &new_vid, &new_pid, serno, sizeof serno)) < 0) {
pmsg_error("invalid -P %s; drop -P option or use -P usb[:<vid>:<pid>]\n", port);
return LIBAVRDUDE_EXIT_FAIL;
}
if(*serno)
pmsg_warning("ignoring serial number %s given in -P %s\n", serno, port);
// Set vid/pid in following priority: command-line, config, default
vid = numids >= 2? new_vid: pgm->usbvid? pgm->usbvid: CH341A_VID;
LNODEID usbpid = lfirst(pgm->usbpid);
pid = numids >= 2? new_pid: usbpid? *(int *) ldata(usbpid): CH341A_PID;
if(numids < 2 && usbpid && lnext(usbpid))
pmsg_warning("using PID 0x%04x, ignoring remaining PIDs in list\n", pid);
if(!my.USB_init) {
my.USB_init = 1;
libusb_init(&my.ctx);
}
if(usbpid) {
pid = *(int *) ldata(usbpid);
if(lnext(usbpid))
pmsg_warning("using PID 0x%04x, ignoring remaining PIDs in list\n", pid);
} else {
pid = CH341A_PID;
}
vid = pgm->usbvid? pgm->usbvid: CH341A_VID;
libusb_device **dev_list;
int dev_list_len = libusb_get_device_list(my.ctx, &dev_list);

7
src/doc/avrdude.texi
View File

@@ -840,7 +840,7 @@ they are automatically identified via their vendor and product IDs from
@code{avrdude.conf} or @code{.avrduderc}. Only when there are multiple
programmers of the same type plugged into the host computer is the
@code{-P} option needed, see below. Some @code{-c} programmers, however,
ignore the @code{-P} option altogether, eg, pickit5, teensy or ch341a;
ignore the @code{-P} option altogether, eg, pickit5 or teensy;
these cannot distinguish multiple plugged-in programmers.
Most USB programmers, however, support the command-line syntax @code{-P
@@ -850,8 +850,9 @@ override the vendor and product IDs with hexadecimal numbers @var{vid} and
with @var{serialno}. The match is done after stripping any existing colons
from the given serial number on the command line, and right-to-left, so
only the least significant bytes from the serial number need to be given.
The JTAG ICE mkII, JTAGICE3, SNAP, PICKit5 and avrftdi programmers are
examples for this @code{-P} port syntax.
The JTAG ICE mkII, JTAGICE3, SNAP, PICKit5, CH341A and avrftdi programmers
are examples for this @code{-P} port syntax. Some of these in turn, e.g.
the CH341A, are not capable of matching serial numbers.
If avrdude has been configured with libserialport support, a serial port
can be specified using a predefined serial adapter type in