Merge pull request #807 from yegorich/src-typos
Fix typos all over the code
This commit is contained in:
commit
a91e389a5e
|
@ -115,7 +115,7 @@ programmer type can be used to directly connect to and program a chip
|
||||||
using the built in interfaces on the computer. The requirements to use
|
using the built in interfaces on the computer. The requirements to use
|
||||||
this type are that an SPI interface is exposed along with one GPIO
|
this type are that an SPI interface is exposed along with one GPIO
|
||||||
pin. The GPIO serves as the reset output since the Linux SPI drivers
|
pin. The GPIO serves as the reset output since the Linux SPI drivers
|
||||||
do not hold slave select down when a transfer is not occuring and thus
|
do not hold slave select down when a transfer is not occurring and thus
|
||||||
it cannot be used as the reset pin. A readily available level
|
it cannot be used as the reset pin. A readily available level
|
||||||
translator should be used between the SPI bus/reset GPIO and the chip
|
translator should be used between the SPI bus/reset GPIO and the chip
|
||||||
to avoid potentially damaging the computer's SPI controller in the
|
to avoid potentially damaging the computer's SPI controller in the
|
||||||
|
@ -244,7 +244,7 @@ The Micronucleus bootloader is supported for both protocol version V1
|
||||||
and V2. As the bootloader does not support reading from flash memory,
|
and V2. As the bootloader does not support reading from flash memory,
|
||||||
use the
|
use the
|
||||||
.Fl V
|
.Fl V
|
||||||
option to prevent AVRDUDE from verifing the flash memory.
|
option to prevent AVRDUDE from verifying the flash memory.
|
||||||
See the section on
|
See the section on
|
||||||
.Em extended parameters
|
.Em extended parameters
|
||||||
for Micronucleus specific options.
|
for Micronucleus specific options.
|
||||||
|
@ -558,9 +558,9 @@ be specified as
|
||||||
Libhidapi support is required on Unix and Mac OS but not on Windows. For more
|
Libhidapi support is required on Unix and Mac OS but not on Windows. For more
|
||||||
information about AVR-Doper see http://www.obdev.at/avrusb/avrdoper.html.
|
information about AVR-Doper see http://www.obdev.at/avrusb/avrdoper.html.
|
||||||
.Pp
|
.Pp
|
||||||
For the USBtinyISP, which is a simplicistic device not implementing
|
For the USBtinyISP, which is a simplistic device not implementing
|
||||||
serial numbers, multiple devices can be distinguished by their
|
serial numbers, multiple devices can be distinguished by their
|
||||||
location in the USB hierarchy. See the the respective
|
location in the USB hierarchy. See the respective
|
||||||
.Em Troubleshooting
|
.Em Troubleshooting
|
||||||
entry in the detailed documentation for examples.
|
entry in the detailed documentation for examples.
|
||||||
.Pp
|
.Pp
|
||||||
|
|
|
@ -33,15 +33,15 @@ extern char progbuf[]; /* spaces same length as progname */
|
||||||
|
|
||||||
extern int ovsigck; /* override signature check (-F) */
|
extern int ovsigck; /* override signature check (-F) */
|
||||||
extern int verbose; /* verbosity level (-v, -vv, ...) */
|
extern int verbose; /* verbosity level (-v, -vv, ...) */
|
||||||
extern int quell_progress; /* quiteness level (-q, -qq) */
|
extern int quell_progress; /* quietness level (-q, -qq) */
|
||||||
|
|
||||||
int avrdude_message(const int msglvl, const char *format, ...);
|
int avrdude_message(const int msglvl, const char *format, ...);
|
||||||
|
|
||||||
#define MSG_INFO (0) /* no -v option, can be supressed with -qq */
|
#define MSG_INFO (0) /* no -v option, can be suppressed with -qq */
|
||||||
#define MSG_NOTICE (1) /* displayed with -v */
|
#define MSG_NOTICE (1) /* displayed with -v */
|
||||||
#define MSG_NOTICE2 (2) /* displayed with -vv, used rarely */
|
#define MSG_NOTICE2 (2) /* displayed with -vv, used rarely */
|
||||||
#define MSG_DEBUG (3) /* displayed with -vvv */
|
#define MSG_DEBUG (3) /* displayed with -vvv */
|
||||||
#define MSG_TRACE (4) /* displayed with -vvvv, show trace commuication */
|
#define MSG_TRACE (4) /* displayed with -vvvv, show trace communication */
|
||||||
#define MSG_TRACE2 (5) /* displayed with -vvvvv */
|
#define MSG_TRACE2 (5) /* displayed with -vvvvv */
|
||||||
|
|
||||||
#if defined(WIN32NATIVE)
|
#if defined(WIN32NATIVE)
|
||||||
|
|
|
@ -285,7 +285,7 @@ prog_def :
|
||||||
id = ldata(lfirst(current_prog->id));
|
id = ldata(lfirst(current_prog->id));
|
||||||
existing_prog = locate_programmer(programmers, id);
|
existing_prog = locate_programmer(programmers, id);
|
||||||
if (existing_prog) {
|
if (existing_prog) {
|
||||||
{ /* temporarly set lineno to lineno of programmer start */
|
{ /* temporarily set lineno to lineno of programmer start */
|
||||||
int temp = lineno; lineno = current_prog->lineno;
|
int temp = lineno; lineno = current_prog->lineno;
|
||||||
yywarning("programmer %s overwrites previous definition %s:%d.",
|
yywarning("programmer %s overwrites previous definition %s:%d.",
|
||||||
id, existing_prog->config_file, existing_prog->lineno);
|
id, existing_prog->config_file, existing_prog->lineno);
|
||||||
|
@ -377,7 +377,7 @@ part_def :
|
||||||
|
|
||||||
existing_part = locate_part(part_list, current_part->id);
|
existing_part = locate_part(part_list, current_part->id);
|
||||||
if (existing_part) {
|
if (existing_part) {
|
||||||
{ /* temporarly set lineno to lineno of part start */
|
{ /* temporarily set lineno to lineno of part start */
|
||||||
int temp = lineno; lineno = current_part->lineno;
|
int temp = lineno; lineno = current_part->lineno;
|
||||||
yywarning("part %s overwrites previous definition %s:%d.",
|
yywarning("part %s overwrites previous definition %s:%d.",
|
||||||
current_part->id,
|
current_part->id,
|
||||||
|
|
|
@ -234,7 +234,7 @@ AC_CHECK_LIB([ws2_32], [puts])
|
||||||
# Checks for library functions.
|
# Checks for library functions.
|
||||||
AC_CHECK_FUNCS([memset select strcasecmp strdup strerror strncasecmp strtol strtoul gettimeofday usleep getaddrinfo])
|
AC_CHECK_FUNCS([memset select strcasecmp strdup strerror strncasecmp strtol strtoul gettimeofday usleep getaddrinfo])
|
||||||
|
|
||||||
AC_MSG_CHECKING([for a Win32 HID libray])
|
AC_MSG_CHECKING([for a Win32 HID library])
|
||||||
SAVED_LIBS="${LIBS}"
|
SAVED_LIBS="${LIBS}"
|
||||||
case $target in
|
case $target in
|
||||||
*-*-mingw32* | *-*-cygwin* | *-*-windows*)
|
*-*-mingw32* | *-*-cygwin* | *-*-windows*)
|
||||||
|
@ -435,7 +435,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# If we are compiling with gcc, enable all warning and make warnings errors.
|
# If we are compiling with gcc, enable all warnings and make warnings errors.
|
||||||
if test "$GCC" = yes; then
|
if test "$GCC" = yes; then
|
||||||
ENABLE_WARNINGS="-Wall"
|
ENABLE_WARNINGS="-Wall"
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <libelf/libelf.h>
|
#include <libelf/libelf.h>
|
||||||
#endif
|
#endif
|
||||||
#ifndef EM_AVR32
|
#ifndef EM_AVR32
|
||||||
# define EM_AVR32 0x18ad /* inofficial */
|
# define EM_AVR32 0x18ad /* unofficial */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -273,7 +273,7 @@ static int ihex_readrec(struct ihexrec * ihex, char * rec)
|
||||||
/*
|
/*
|
||||||
* Intel Hex to binary buffer
|
* Intel Hex to binary buffer
|
||||||
*
|
*
|
||||||
* Given an open file 'inf' which contains Intel Hex formated data,
|
* Given an open file 'inf' which contains Intel Hex formatted data,
|
||||||
* parse the file and lay it out within the memory buffer pointed to
|
* parse the file and lay it out within the memory buffer pointed to
|
||||||
* by outbuf. The size of outbuf, 'bufsize' is honored; if data would
|
* by outbuf. The size of outbuf, 'bufsize' is honored; if data would
|
||||||
* fall outsize of the memory buffer outbuf, an error is generated.
|
* fall outsize of the memory buffer outbuf, an error is generated.
|
||||||
|
@ -1120,7 +1120,7 @@ static int fileio_imm(struct fioparms * fio,
|
||||||
p = strtok(filename, " ,");
|
p = strtok(filename, " ,");
|
||||||
while (p != NULL && loc < size) {
|
while (p != NULL && loc < size) {
|
||||||
b = strtoul(p, &e, 0);
|
b = strtoul(p, &e, 0);
|
||||||
/* check for binary formated (0b10101001) strings */
|
/* check for binary formatted (0b10101001) strings */
|
||||||
b = (strncmp (p, "0b", 2))?
|
b = (strncmp (p, "0b", 2))?
|
||||||
strtoul (p, &e, 0):
|
strtoul (p, &e, 0):
|
||||||
strtoul (p + 2, &e, 2);
|
strtoul (p + 2, &e, 2);
|
||||||
|
|
|
@ -215,7 +215,7 @@ int flip2_initialize(PROGRAMMER* pgm, AVRPART *part)
|
||||||
/* A note about return values. Negative return values from this function are
|
/* A note about return values. Negative return values from this function are
|
||||||
* interpreted as failure by main(), from where this function is called.
|
* interpreted as failure by main(), from where this function is called.
|
||||||
* However such failures are interpreted as a device signature check failure
|
* However such failures are interpreted as a device signature check failure
|
||||||
* and the user is adviced to use the -F option to override this check. In
|
* and the user is advised to use the -F option to override this check. In
|
||||||
* our case, this is misleading, so we defer reporting an error until another
|
* our case, this is misleading, so we defer reporting an error until another
|
||||||
* function is called. Thus, we always return 0 (success) from initialize().
|
* function is called. Thus, we always return 0 (success) from initialize().
|
||||||
* I don't like this, but I don't want to mess with main().
|
* I don't like this, but I don't want to mess with main().
|
||||||
|
|
|
@ -66,7 +66,7 @@ static int fd_spidev, fd_gpiochip, fd_linehandle;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Sends/receives a message in full duplex mode
|
* @brief Sends/receives a message in full duplex mode
|
||||||
* @return -1 on failure, otherwise number of bytes sent/recieved
|
* @return -1 on failure, otherwise number of bytes sent/received
|
||||||
*/
|
*/
|
||||||
static int linuxspi_spi_duplex(PROGRAMMER *pgm, const unsigned char *tx, unsigned char *rx, int len)
|
static int linuxspi_spi_duplex(PROGRAMMER *pgm, const unsigned char *tx, unsigned char *rx, int len)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1113,7 +1113,7 @@ int main(int argc, char * argv [])
|
||||||
pgm->vfy_led(pgm, OFF);
|
pgm->vfy_led(pgm, OFF);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* initialize the chip in preperation for accepting commands
|
* initialize the chip in preparation for accepting commands
|
||||||
*/
|
*/
|
||||||
init_ok = (rc = pgm->initialize(pgm, p)) >= 0;
|
init_ok = (rc = pgm->initialize(pgm, p)) >= 0;
|
||||||
if (!init_ok) {
|
if (!init_ok) {
|
||||||
|
|
|
@ -146,7 +146,7 @@ int pgm_fill_old_pins(struct programmer_t * const pgm) {
|
||||||
/**
|
/**
|
||||||
* This function returns a string representation of pins in the mask eg. 1,3,5-7,9,12
|
* This function returns a string representation of pins in the mask eg. 1,3,5-7,9,12
|
||||||
* Another execution of this function will overwrite the previous result in the static buffer.
|
* Another execution of this function will overwrite the previous result in the static buffer.
|
||||||
* Consecutive pin number are representated as start-end.
|
* Consecutive pin number are represented as start-end.
|
||||||
*
|
*
|
||||||
* @param[in] pinmask the pin mask for which we want the string representation
|
* @param[in] pinmask the pin mask for which we want the string representation
|
||||||
* @returns pointer to a static string.
|
* @returns pointer to a static string.
|
||||||
|
|
|
@ -141,7 +141,7 @@ int updi_read_data(PROGRAMMER * pgm, uint32_t address, uint8_t * buffer, uint16_
|
||||||
self.logger.debug("Reading %d bytes from 0x%04X", size, address)
|
self.logger.debug("Reading %d bytes from 0x%04X", size, address)
|
||||||
# Range check
|
# Range check
|
||||||
if size > constants.UPDI_MAX_REPEAT_SIZE:
|
if size > constants.UPDI_MAX_REPEAT_SIZE:
|
||||||
raise PymcuprogError("Cant read that many bytes in one go")
|
raise PymcuprogError("Can't read that many bytes in one go")
|
||||||
|
|
||||||
# Store the address
|
# Store the address
|
||||||
self.datalink.st_ptr(address)
|
self.datalink.st_ptr(address)
|
||||||
|
@ -242,7 +242,7 @@ int updi_read_data_words(PROGRAMMER * pgm, uint32_t address, uint8_t * buffer, u
|
||||||
|
|
||||||
# Range check
|
# Range check
|
||||||
if words > constants.UPDI_MAX_REPEAT_SIZE >> 1:
|
if words > constants.UPDI_MAX_REPEAT_SIZE >> 1:
|
||||||
raise PymcuprogError("Cant read that many words in one go")
|
raise PymcuprogError("Can't read that many words in one go")
|
||||||
|
|
||||||
# Store the address
|
# Store the address
|
||||||
self.datalink.st_ptr(address)
|
self.datalink.st_ptr(address)
|
||||||
|
|
|
@ -109,7 +109,7 @@ static int usb_control (PROGRAMMER * pgm,
|
||||||
USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
||||||
requestid,
|
requestid,
|
||||||
val, index, // 2 bytes each of data
|
val, index, // 2 bytes each of data
|
||||||
NULL, 0, // no data buffer in control messge
|
NULL, 0, // no data buffer in control message
|
||||||
USB_TIMEOUT ); // default timeout
|
USB_TIMEOUT ); // default timeout
|
||||||
if(nbytes < 0){
|
if(nbytes < 0){
|
||||||
avrdude_message(MSG_INFO, "\n%s: error: usbtiny_transmit: %s\n", progname, usb_strerror());
|
avrdude_message(MSG_INFO, "\n%s: error: usbtiny_transmit: %s\n", progname, usb_strerror());
|
||||||
|
@ -128,7 +128,7 @@ static int usb_in (PROGRAMMER * pgm,
|
||||||
int timeout;
|
int timeout;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
// calculate the amout of time we expect the process to take by
|
// calculate the amount of time we expect the process to take by
|
||||||
// figuring the bit-clock time and buffer size and adding to the standard USB timeout.
|
// figuring the bit-clock time and buffer size and adding to the standard USB timeout.
|
||||||
timeout = USB_TIMEOUT + (buflen * bitclk) / 1000;
|
timeout = USB_TIMEOUT + (buflen * bitclk) / 1000;
|
||||||
|
|
||||||
|
@ -167,7 +167,7 @@ static int usb_out (PROGRAMMER * pgm,
|
||||||
int nbytes;
|
int nbytes;
|
||||||
int timeout;
|
int timeout;
|
||||||
|
|
||||||
// calculate the amout of time we expect the process to take by
|
// calculate the amount of time we expect the process to take by
|
||||||
// figuring the bit-clock time and buffer size and adding to the standard USB timeout.
|
// figuring the bit-clock time and buffer size and adding to the standard USB timeout.
|
||||||
timeout = USB_TIMEOUT + (buflen * bitclk) / 1000;
|
timeout = USB_TIMEOUT + (buflen * bitclk) / 1000;
|
||||||
|
|
||||||
|
@ -269,7 +269,7 @@ static int usbtiny_tpi_txrx(PROGRAMMER *pgm, unsigned char b0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
w = (res[2] << 8) | res[3];
|
w = (res[2] << 8) | res[3];
|
||||||
/* Look for start bit (there shoule be no more than two 1 bits): */
|
/* Look for start bit (there should be no more than two 1 bits): */
|
||||||
while (w < 0)
|
while (w < 0)
|
||||||
w <<= 1;
|
w <<= 1;
|
||||||
/* Now that we found the start bit, the top 9 bits contain the start
|
/* Now that we found the start bit, the top 9 bits contain the start
|
||||||
|
@ -336,7 +336,7 @@ static int usbtiny_open(PROGRAMMER* pgm, char* name)
|
||||||
}
|
}
|
||||||
|
|
||||||
usb_init(); // initialize the libusb system
|
usb_init(); // initialize the libusb system
|
||||||
usb_find_busses(); // have libusb scan all the usb busses available
|
usb_find_busses(); // have libusb scan all the usb buses available
|
||||||
usb_find_devices(); // have libusb scan all the usb devices available
|
usb_find_devices(); // have libusb scan all the usb devices available
|
||||||
|
|
||||||
PDATA(pgm)->usb_handle = NULL;
|
PDATA(pgm)->usb_handle = NULL;
|
||||||
|
@ -357,7 +357,7 @@ static int usbtiny_open(PROGRAMMER* pgm, char* name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// now we iterate through all the busses and devices
|
// now we iterate through all the buses and devices
|
||||||
for ( bus = usb_busses; bus; bus = bus->next ) {
|
for ( bus = usb_busses; bus; bus = bus->next ) {
|
||||||
for ( dev = bus->devices; dev; dev = dev->next ) {
|
for ( dev = bus->devices; dev; dev = dev->next ) {
|
||||||
if (dev->descriptor.idVendor == vid
|
if (dev->descriptor.idVendor == vid
|
||||||
|
|
Loading…
Reference in New Issue