Fix compiler warnings

* misleading indentation after spin loop
* EM_AVR32 might be defined in system <libelf.h> already


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1431 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2020-03-11 09:41:15 +00:00
parent 4648eca956
commit 061406c602
2 changed files with 8 additions and 5 deletions

9
avr.c
View File

@ -80,11 +80,12 @@ int avr_tpi_chip_erase(PROGRAMMER * pgm, AVRPART * p)
0xFF 0xFF
}; };
while (avr_tpi_poll_nvmbsy(pgm)); while (avr_tpi_poll_nvmbsy(pgm))
;
err = pgm->cmd_tpi(pgm, cmd, sizeof(cmd), NULL, 0); err = pgm->cmd_tpi(pgm, cmd, sizeof(cmd), NULL, 0);
if(err) if(err)
return err; return err;
while (avr_tpi_poll_nvmbsy(pgm)); while (avr_tpi_poll_nvmbsy(pgm));

View File

@ -34,7 +34,9 @@
#elif defined(HAVE_LIBELF_LIBELF_H) #elif defined(HAVE_LIBELF_LIBELF_H)
#include <libelf/libelf.h> #include <libelf/libelf.h>
#endif #endif
#define EM_AVR32 0x18ad /* inofficial */ #ifndef EM_AVR32
# define EM_AVR32 0x18ad /* inofficial */
#endif
#endif #endif
#include "avrdude.h" #include "avrdude.h"