Fix various typos.

Submitted by Adrian Klieber
patch #9818: correct typos in SVN rev 1429



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1443 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2020-09-16 21:31:19 +00:00
parent e35e8f414a
commit 3f5e101f09
9 changed files with 23 additions and 10 deletions

View File

@ -1,3 +1,15 @@
2020-09-16 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Submitted by Adrian Klieber:
patch #9818: correct typos in SVN rev 1429
* buspirate.c: Fix typos.
* fileio.c: Fix typos.
* jtagmkII.c: Fix typos.
* main.c: Fix typos.
* term.c: Fix typos.
* usbasp.c: Fix typos.
* usbtiny.h: Fix typos.
2020-09-16 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2020-09-16 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Submitted by Adrian Klieber: Submitted by Adrian Klieber:

1
NEWS
View File

@ -71,6 +71,7 @@ Current:
patch #9893: [PATCH] Reader reads ftdi handle after main thread close it patch #9893: [PATCH] Reader reads ftdi handle after main thread close it
patch #9819: Address several leaks in SVN rev 1429 patch #9819: Address several leaks in SVN rev 1429
patch #9820: Fix some out-of-bounds/uninitialized issues patch #9820: Fix some out-of-bounds/uninitialized issues
patch #9818: correct typos in SVN rev 1429
* Internals: * Internals:
- New avrdude.conf keyword "family_id", used to verify SIB attributes - New avrdude.conf keyword "family_id", used to verify SIB attributes

View File

@ -801,7 +801,7 @@ static void buspirate_powerup(struct programmer_t *pgm)
char buf[25]; char buf[25];
int ok = 0; int ok = 0;
snprintf(buf, sizeof(buf), "%d\n", PDATA(pgm)->cpufreq); snprintf(buf, sizeof(buf), "%d\n", PDATA(pgm)->cpufreq);
if (buspirate_expect(pgm, "g\n", "Frequency in KHz", 1)) { if (buspirate_expect(pgm, "g\n", "Frequency in kHz", 1)) {
if (buspirate_expect(pgm, buf, "Duty cycle in %", 1)) { if (buspirate_expect(pgm, buf, "Duty cycle in %", 1)) {
if (buspirate_expect(pgm, "50\n", "PWM active", 1)) { if (buspirate_expect(pgm, "50\n", "PWM active", 1)) {
ok = 1; ok = 1;

View File

@ -1172,7 +1172,7 @@ static int fileio_ihex(struct fioparms * fio,
break; break;
default: default:
avrdude_message(MSG_INFO, "%s: invalid Intex Hex file I/O operation=%d\n", avrdude_message(MSG_INFO, "%s: invalid Intel Hex file I/O operation=%d\n",
progname, fio->op); progname, fio->op);
return -1; return -1;
break; break;

View File

@ -1916,7 +1916,7 @@ static int jtagmkII_page_erase(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
retry: retry:
avrdude_message(MSG_NOTICE2, "%s: jtagmkII_page_erase(): " avrdude_message(MSG_NOTICE2, "%s: jtagmkII_page_erase(): "
"Sending xmega erase command: ", "Sending Xmega erase command: ",
progname); progname);
jtagmkII_send(pgm, cmd, sizeof cmd); jtagmkII_send(pgm, cmd, sizeof cmd);

4
main.c
View File

@ -921,7 +921,7 @@ int main(int argc, char * argv [])
*/ */
if (port[0] == 0) { if (port[0] == 0) {
avrdude_message(MSG_INFO, "\n%s: no port has been specified on the command line " avrdude_message(MSG_INFO, "\n%s: no port has been specified on the command line "
"or the config file\n", "or in the config file\n",
progname); progname);
avrdude_message(MSG_INFO, "%sSpecify a port using the -P option and try again\n\n", avrdude_message(MSG_INFO, "%sSpecify a port using the -P option and try again\n\n",
progbuf); progbuf);
@ -1176,7 +1176,7 @@ int main(int argc, char * argv [])
//Check if the programmer just doesn't support reading //Check if the programmer just doesn't support reading
if (rc == -5) if (rc == -5)
{ {
avrdude_message(MSG_NOTICE, "%s: safemode: Fuse reading not support by programmer.\n" avrdude_message(MSG_NOTICE, "%s: safemode: Fuse reading not supported by programmer.\n"
" Safemode disabled.\n", progname); " Safemode disabled.\n", progname);
} }
else else

4
term.c
View File

@ -342,7 +342,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
if (argc < 4) { if (argc < 4) {
avrdude_message(MSG_INFO, "Usage: write <memtype> <addr> <byte1> " avrdude_message(MSG_INFO, "Usage: write <memtype> <addr> <byte1> "
"<byte2> ... byteN>\n"); "<byte2> ... <byteN>\n");
return -1; return -1;
} }
@ -624,7 +624,7 @@ static int cmd_fosc(PROGRAMMER * pgm, struct avrpart * p,
return -2; return -2;
} }
if ((rc = pgm->set_fosc(pgm, v)) != 0) { if ((rc = pgm->set_fosc(pgm, v)) != 0) {
avrdude_message(MSG_INFO, "%s (fosc): failed to set oscillator_frequency (rc = %d)\n", avrdude_message(MSG_INFO, "%s (fosc): failed to set oscillator frequency (rc = %d)\n",
progname, rc); progname, rc);
return -3; return -3;
} }

View File

@ -662,7 +662,7 @@ static int usbasp_spi_cmd(PROGRAMMER * pgm, const unsigned char *cmd,
if (verbose == 3) if (verbose == 3)
putc('\n', stderr); putc('\n', stderr);
avrdude_message(MSG_INFO, "%s: error: wrong responds size\n", avrdude_message(MSG_INFO, "%s: error: wrong response size\n",
progname); progname);
return -1; return -1;
} }
@ -963,7 +963,7 @@ static int usbasp_tpi_recv_byte(PROGRAMMER * pgm)
if(usbasp_transmit(pgm, 1, USBASP_FUNC_TPI_RAWREAD, temp, temp, sizeof(temp)) != 1) if(usbasp_transmit(pgm, 1, USBASP_FUNC_TPI_RAWREAD, temp, temp, sizeof(temp)) != 1)
{ {
avrdude_message(MSG_INFO, "%s: error: wrong responds size\n", progname); avrdude_message(MSG_INFO, "%s: error: wrong response size\n", progname);
return -1; return -1;
} }

View File

@ -45,7 +45,7 @@
// The SCK speed can be set by avrdude, to allow programming of slow-clocked parts // The SCK speed can be set by avrdude, to allow programming of slow-clocked parts
#define SCK_MIN 1 // usec delay (target clock >= 4 MHz) #define SCK_MIN 1 // usec delay (target clock >= 4 MHz)
#define SCK_MAX 250 // usec (target clock >= 16 KHz) #define SCK_MAX 250 // usec (target clock >= 16 kHz)
#define SCK_DEFAULT 10 // usec (target clock >= 0.4 MHz) #define SCK_DEFAULT 10 // usec (target clock >= 0.4 MHz)
// How much data, max, do we want to send in one USB packet? // How much data, max, do we want to send in one USB packet?