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

Stop printing redundant usbpid and hvupdi_support lists for -c*/s

This commit is contained in:
Stefan Rueger 2023-01-02 21:59:51 +00:00
parent abdc65d79f
commit 82cf688357
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
1 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/developer_opts.c
View File

@ -1189,6 +1189,42 @@ static const char *connstr(conntype_t conntype) {
}
}
static char *dev_usbpid_liststr(const PROGRAMMER *pgm) {
char spc[1024]; int firstid = 1;
spc[0] = 0;
if(pgm->usbpid)
for(LNODEID ln=lfirst(pgm->usbpid); ln; ln=lnext(ln)) {
if(strlen(spc) > sizeof spc - 20)
break;
if(!firstid)
strcat(spc, ", ");
firstid = 0;
sprintf(spc + strlen(spc), "0x%04x", *(unsigned int *) ldata(ln));
}
return cfg_strdup(__func__, *spc? spc: "NULL");
}
static char *dev_hvupdi_support_liststr(const PROGRAMMER *pgm) {
char spc[1024]; int firstid = 1;
spc[0] = 0;
if(pgm->hvupdi_support)
for(LNODEID ln=lfirst(pgm->hvupdi_support); ln; ln=lnext(ln)) {
if(strlen(spc) > sizeof spc - 20)
break;
if(!firstid)
strcat(spc, ", ");
firstid = 0;
sprintf(spc + strlen(spc), "%d", *(unsigned int *) ldata(ln));
}
return cfg_strdup(__func__, *spc? spc: "NULL");
}
static void dev_pgm_strct(const PROGRAMMER *pgm, bool tsv, const PROGRAMMER *base, bool injct) {
char *id = ldata(lfirst(pgm->id));
LNODEID ln;
@ -1249,26 +1285,18 @@ static void dev_pgm_strct(const PROGRAMMER *pgm, bool tsv, const PROGRAMMER *bas
_if_pgmout(intcmp, "0x%04x", usbvid);
if(pgm->usbpid && lfirst(pgm->usbpid)) {
if(tsv)
dev_info(".prog\t%s\tusbpid\t", id);
else {
dev_cout(pgm->comments, "usbpid", 0, 0);
dev_info(" %-22s = ", "usbpid");
}
for(firstid=1, ln=lfirst(pgm->usbpid); ln; ln=lnext(ln)) {
if(!firstid)
dev_info(", ");
firstid = 0;
dev_info("0x%04x", *(unsigned int *) ldata(ln));
}
if(tsv)
dev_info("\n");
else {
dev_info(";");
dev_cout(pgm->comments, "usbpid", 1, 1);
}
char *pgmstr = dev_usbpid_liststr(pgm);
int show = !base;
if(base) {
char *basestr = dev_usbpid_liststr(base);
show = strcmp(basestr, pgmstr) != 0;
free(basestr);
}
if(show)
dev_part_strct_entry(tsv, ".prog", id, NULL, "usbpid", pgmstr, pgm->comments);
else // dev_part_strct_entry() frees pgmstr
free(pgmstr);
_if_pgmout_str(strcmp, cfg_escape(pgm->usbdev), usbdev);
_if_pgmout_str(strcmp, cfg_escape(pgm->usbsn), usbsn);
@ -1286,26 +1314,18 @@ static void dev_pgm_strct(const PROGRAMMER *pgm, bool tsv, const PROGRAMMER *bas
free(bstr);
}
if(pgm->hvupdi_support && lfirst(pgm->hvupdi_support)) {
if(tsv)
dev_info(".prog\t%s\thvupdu_support\t", id);
else {
dev_cout(pgm->comments, "hvupdi_support", 0, 0);
dev_info(" %-22s = ", "hvupdi_support");
}
for(firstid=1, ln=lfirst(pgm->hvupdi_support); ln; ln=lnext(ln)) {
if(!firstid)
dev_info(", ");
firstid = 0;
dev_info("%d", *(unsigned int *) ldata(ln));
}
if(tsv)
dev_info("\n");
else {
dev_info(";");
dev_cout(pgm->comments, "hvupdi_support", 1, 1);
}
pgmstr = dev_hvupdi_support_liststr(pgm);
show = !base;
if(base) {
char *basestr = dev_hvupdi_support_liststr(base);
show = strcmp(basestr, pgmstr) != 0;
free(basestr);
}
if(show)
dev_part_strct_entry(tsv, ".prog", id, NULL, "hvupdi_support", pgmstr, pgm->comments);
else // dev_part_strct_entry() frees pgmstr
free(pgmstr);
if(injct)
for(size_t i=0; i<sizeof pgminj/sizeof*pgminj; i++)