Skip to content

Commit d947e58

Browse files
committed
* ft245r.c (ft245r_open): allow for picking a default
device if none has been provided by -P git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1482 81a1dc3b-b13d-400b-aceb-764788c761c2
1 parent 3914394 commit d947e58

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2021-11-24 Joerg Wunsch <[email protected]>
2+
3+
* ft245r.c (ft245r_open): allow for picking a default
4+
device if none has been provided by -P
5+
16
2021-11-24 Joerg Wunsch <[email protected]>
27

38
* jtag3.c (jtag3_edbg_recv_frame): Better handling for

ft245r.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -559,10 +559,11 @@ static int ft245r_open(PROGRAMMER * pgm, char * port) {
559559

560560
// read device string cut after 8 chars (max. length of serial number)
561561
if ((sscanf(port, "usb:%8s", device) != 1)) {
562-
avrdude_message(MSG_INFO,
563-
"%s: ft245r_open(): invalid device identifier '%8s'\n",
564-
progname, device);
565-
return -1;
562+
avrdude_message(MSG_NOTICE,
563+
"%s: ft245r_open(): no device identifier in portname, using default\n",
564+
progname);
565+
pgm->usbsn[0] = 0;
566+
devnum = 0;
566567
} else {
567568
if (strlen(device) == 8 ){ // serial number
568569
if (verbose >= 2) {
@@ -618,7 +619,8 @@ static int ft245r_open(PROGRAMMER * pgm, char * port) {
618619
pgm->usbsn[0]?pgm->usbsn:NULL,
619620
devnum);
620621
if (rv) {
621-
avrdude_message(MSG_INFO, "can't open ftdi device %d. (%s)\n", devnum, ftdi_get_error_string(handle));
622+
avrdude_message(MSG_INFO, "%s: can't open ftdi device: %s\n",
623+
progname, ftdi_get_error_string(handle));
622624
goto cleanup_no_usb;
623625
}
624626

0 commit comments

Comments
 (0)