mirror of
https://github.com/mariusgreuel/avrdude.git
synced 2026-11-17 10:35:41 +00:00
Compare commits
42
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
488da2642a | ||
|
|
5ec72e240b | ||
|
|
347ecadae9 | ||
|
|
7e5bfdeff0 | ||
|
|
b89b79d332 | ||
|
|
65686c7fed | ||
|
|
a3b7072b7d | ||
|
|
1fa34c58a7 | ||
|
|
09c4b670c7 | ||
|
|
9cf4f55b87 | ||
|
|
b3a29917b0 | ||
|
|
6595f53425 | ||
|
|
0ae6c6543b | ||
|
|
f9c5c0cfbc | ||
|
|
a22d379c03 | ||
|
|
22f9bc5260 | ||
|
|
6088c9b98f | ||
|
|
e349cd1f6b | ||
|
|
7ad5289d66 | ||
|
|
b75e26bf6d | ||
|
|
81f01939c2 | ||
|
|
2a79faae86 | ||
|
|
3c51fb6aae | ||
|
|
3b7f0d2c55 | ||
|
|
507031badf | ||
|
|
6d15d24a4d | ||
|
|
cec9715ba2 | ||
|
|
7f0fe41b6c | ||
|
|
aa258ace36 | ||
|
|
e089d7ecc5 | ||
|
|
3521c9d9fb | ||
|
|
c6b2f12c04 | ||
|
|
3611c89ee0 | ||
|
|
246d2d502d | ||
|
|
79dd434d20 | ||
|
|
319ee2db9c | ||
|
|
368bad5ca0 | ||
|
|
6b95f9d181 | ||
|
|
8150930958 | ||
|
|
a8931a4eb1 | ||
|
|
beeb14ee3d | ||
|
|
dcb8165a1c |
No files matched your search
@@ -5,6 +5,31 @@ Approximate change log for AVRDUDE by version.
|
|||||||
(For detailed changes, see the version control system logs.)
|
(For detailed changes, see the version control system logs.)
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
Changes since version 7.1:
|
||||||
|
|
||||||
|
* Major changes compared to the previous version:
|
||||||
|
|
||||||
|
* New devices supported:
|
||||||
|
|
||||||
|
* New programmers supported:
|
||||||
|
|
||||||
|
* Issues fixed:
|
||||||
|
|
||||||
|
- STK500V2 ISP problem with ATmega8/8515/8535, ATmega16 and
|
||||||
|
ATmega32 #425
|
||||||
|
|
||||||
|
* Pull requests:
|
||||||
|
|
||||||
|
- Correct memory mode, delay and readback (classic parts) #1272
|
||||||
|
- Only send write flash cmd to STK500v2 ISP programmers if page
|
||||||
|
is not empty #1273
|
||||||
|
- Fix docu that avrftdi bit numbers start with 0 #1276
|
||||||
|
- Silence gcc compiler warnings #1277
|
||||||
|
- Reduce complexity of grammar #1282
|
||||||
|
|
||||||
|
* Internals:
|
||||||
|
|
||||||
|
|
||||||
Changes in version 7.1:
|
Changes in version 7.1:
|
||||||
|
|
||||||
* Major changes compared to the previous version:
|
* Major changes compared to the previous version:
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Documentation for current and previous releases is [on Github Pages](https://avr
|
|||||||
|
|
||||||
## Getting AVRDUDE for Windows
|
## Getting AVRDUDE for Windows
|
||||||
|
|
||||||
To get AVRDUDE for Windows, install the latest version from the [Releases](http://download.savannah.gnu.org/releases/avrdude/) page.
|
To get AVRDUDE for Windows, install the latest version from the [Releases](https://github.com/avrdudes/avrdude/releases) page.
|
||||||
|
|
||||||
Alternatively, you may [build AVRDUDE](https://github.com/avrdudes/avrdude/wiki) yourself from source.
|
Alternatively, you may [build AVRDUDE](https://github.com/avrdudes/avrdude/wiki) yourself from source.
|
||||||
|
|
||||||
|
|||||||
@@ -74,9 +74,11 @@ case "${ostype}" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
cmake ${build_flags} ${extra_enable} -D CMAKE_BUILD_TYPE=${build_type} -B build_${ostype} ||\
|
mkdir -p build_${ostype}
|
||||||
|
cd build_${ostype}
|
||||||
|
cmake ${build_flags} ${extra_enable} -D CMAKE_BUILD_TYPE=${build_type} .. ||\
|
||||||
{ echo "CMake failed."; exit 1; }
|
{ echo "CMake failed."; exit 1; }
|
||||||
cmake --build build_${ostype} ||\
|
cmake --build . ||\
|
||||||
{ echo "Build failed."; exit 1; }
|
{ echo "Build failed."; exit 1; }
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
|||||||
+1
-1
@@ -77,7 +77,7 @@ if(MSVC)
|
|||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
set(LIB_MATH m)
|
set(LIB_MATH m)
|
||||||
add_compile_options(-Wall) # -Wextra
|
add_compile_options(-Wall -Wextra -Wno-unused-parameter)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# =====================================
|
# =====================================
|
||||||
|
|||||||
+2
-2
@@ -653,9 +653,9 @@ static int avr910_paged_load(const PROGRAMMER *pgm, const AVRPART *p, const AVRM
|
|||||||
avr910_set_addr(pgm, addr / rd_size);
|
avr910_set_addr(pgm, addr / rd_size);
|
||||||
|
|
||||||
while (addr < max_addr) {
|
while (addr < max_addr) {
|
||||||
if ((max_addr - addr) < blocksize) {
|
if (max_addr - addr < (unsigned int) blocksize)
|
||||||
blocksize = max_addr - addr;
|
blocksize = max_addr - addr;
|
||||||
}
|
|
||||||
cmd[1] = (blocksize >> 8) & 0xff;
|
cmd[1] = (blocksize >> 8) & 0xff;
|
||||||
cmd[2] = blocksize & 0xff;
|
cmd[2] = blocksize & 0xff;
|
||||||
|
|
||||||
|
|||||||
+210
-271
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -662,7 +662,7 @@ static int butterfly_paged_load(const PROGRAMMER *pgm, const AVRPART *p, const A
|
|||||||
butterfly_set_addr(pgm, addr / rd_size);
|
butterfly_set_addr(pgm, addr / rd_size);
|
||||||
}
|
}
|
||||||
while (addr < max_addr) {
|
while (addr < max_addr) {
|
||||||
if ((max_addr - addr) < blocksize) {
|
if ((max_addr - addr) < (unsigned int) blocksize) {
|
||||||
blocksize = max_addr - addr;
|
blocksize = max_addr - addr;
|
||||||
};
|
};
|
||||||
cmd[1] = (blocksize >> 8) & 0xff;
|
cmd[1] = (blocksize >> 8) & 0xff;
|
||||||
|
|||||||
+70
-1
@@ -63,24 +63,88 @@ extern char * yytext;
|
|||||||
// Component description for config_gram.y, will be sorted appropriately on first use
|
// Component description for config_gram.y, will be sorted appropriately on first use
|
||||||
Component_t avr_comp[] = {
|
Component_t avr_comp[] = {
|
||||||
// PROGRAMMER
|
// PROGRAMMER
|
||||||
|
pgm_comp_desc(desc, COMP_STRING),
|
||||||
pgm_comp_desc(prog_modes, COMP_INT),
|
pgm_comp_desc(prog_modes, COMP_INT),
|
||||||
|
pgm_comp_desc(baudrate, COMP_INT),
|
||||||
|
pgm_comp_desc(usbvid, COMP_INT),
|
||||||
|
pgm_comp_desc(usbdev, COMP_STRING),
|
||||||
|
pgm_comp_desc(usbsn, COMP_STRING),
|
||||||
|
pgm_comp_desc(usbvendor, COMP_STRING),
|
||||||
|
pgm_comp_desc(usbproduct, COMP_STRING),
|
||||||
|
|
||||||
// AVRPART
|
// AVRPART
|
||||||
|
part_comp_desc(desc, COMP_STRING),
|
||||||
|
part_comp_desc(family_id, COMP_STRING),
|
||||||
part_comp_desc(prog_modes, COMP_INT),
|
part_comp_desc(prog_modes, COMP_INT),
|
||||||
part_comp_desc(mcuid, COMP_INT),
|
part_comp_desc(mcuid, COMP_INT),
|
||||||
part_comp_desc(n_interrupts, COMP_INT),
|
part_comp_desc(n_interrupts, COMP_INT),
|
||||||
part_comp_desc(n_page_erase, COMP_INT),
|
part_comp_desc(n_page_erase, COMP_INT),
|
||||||
part_comp_desc(n_boot_sections, COMP_INT),
|
part_comp_desc(n_boot_sections, COMP_INT),
|
||||||
part_comp_desc(boot_section_size, COMP_INT),
|
part_comp_desc(boot_section_size, COMP_INT),
|
||||||
part_comp_desc(autobaud_sync, COMP_CHAR),
|
part_comp_desc(hvupdi_variant, COMP_INT),
|
||||||
|
part_comp_desc(stk500_devcode, COMP_INT),
|
||||||
|
part_comp_desc(avr910_devcode, COMP_INT),
|
||||||
|
part_comp_desc(chip_erase_delay, COMP_INT),
|
||||||
|
part_comp_desc(pagel, COMP_CHAR),
|
||||||
|
part_comp_desc(bs2, COMP_CHAR),
|
||||||
|
|
||||||
|
part_comp_desc(timeout, COMP_INT),
|
||||||
|
part_comp_desc(stabdelay, COMP_INT),
|
||||||
|
part_comp_desc(cmdexedelay, COMP_INT),
|
||||||
|
part_comp_desc(synchloops, COMP_INT),
|
||||||
|
part_comp_desc(bytedelay, COMP_INT),
|
||||||
|
part_comp_desc(pollindex, COMP_INT),
|
||||||
|
part_comp_desc(pollvalue, COMP_CHAR),
|
||||||
|
part_comp_desc(predelay, COMP_INT),
|
||||||
|
part_comp_desc(postdelay, COMP_INT),
|
||||||
|
part_comp_desc(pollmethod, COMP_INT),
|
||||||
|
|
||||||
|
part_comp_desc(hventerstabdelay, COMP_INT), // STK500 v2 hv mode parameters
|
||||||
|
part_comp_desc(progmodedelay, COMP_INT),
|
||||||
|
part_comp_desc(latchcycles, COMP_INT),
|
||||||
|
part_comp_desc(togglevtg, COMP_INT),
|
||||||
|
part_comp_desc(poweroffdelay, COMP_INT),
|
||||||
|
part_comp_desc(resetdelayms, COMP_INT),
|
||||||
|
part_comp_desc(resetdelayus, COMP_INT),
|
||||||
|
part_comp_desc(hvleavestabdelay, COMP_INT),
|
||||||
|
part_comp_desc(resetdelay, COMP_INT),
|
||||||
|
part_comp_desc(chiperasepulsewidth, COMP_INT),
|
||||||
|
part_comp_desc(chiperasepolltimeout, COMP_INT),
|
||||||
|
part_comp_desc(chiperasetime, COMP_INT),
|
||||||
|
part_comp_desc(programfusepulsewidth, COMP_INT),
|
||||||
|
part_comp_desc(programfusepolltimeout, COMP_INT),
|
||||||
|
part_comp_desc(programlockpulsewidth, COMP_INT),
|
||||||
|
part_comp_desc(programlockpolltimeout, COMP_INT),
|
||||||
|
part_comp_desc(synchcycles, COMP_INT),
|
||||||
|
part_comp_desc(hvspcmdexedelay, COMP_INT),
|
||||||
|
|
||||||
part_comp_desc(idr, COMP_CHAR),
|
part_comp_desc(idr, COMP_CHAR),
|
||||||
part_comp_desc(rampz, COMP_CHAR),
|
part_comp_desc(rampz, COMP_CHAR),
|
||||||
part_comp_desc(spmcr, COMP_CHAR),
|
part_comp_desc(spmcr, COMP_CHAR),
|
||||||
part_comp_desc(eecr, COMP_CHAR),
|
part_comp_desc(eecr, COMP_CHAR),
|
||||||
part_comp_desc(eind, COMP_CHAR),
|
part_comp_desc(eind, COMP_CHAR),
|
||||||
|
part_comp_desc(mcu_base, COMP_INT),
|
||||||
|
part_comp_desc(nvm_base, COMP_INT),
|
||||||
|
part_comp_desc(ocd_base, COMP_INT),
|
||||||
|
part_comp_desc(ocdrev, COMP_INT),
|
||||||
|
part_comp_desc(autobaud_sync, COMP_CHAR),
|
||||||
|
|
||||||
// AVRMEM
|
// AVRMEM
|
||||||
|
mem_comp_desc(paged, COMP_BOOL),
|
||||||
|
mem_comp_desc(size, COMP_INT),
|
||||||
|
mem_comp_desc(num_pages, COMP_INT),
|
||||||
mem_comp_desc(n_word_writes, COMP_INT),
|
mem_comp_desc(n_word_writes, COMP_INT),
|
||||||
|
mem_comp_desc(offset, COMP_INT),
|
||||||
|
mem_comp_desc(min_write_delay, COMP_INT),
|
||||||
|
mem_comp_desc(max_write_delay, COMP_INT),
|
||||||
|
mem_comp_desc(pwroff_after_write, COMP_INT),
|
||||||
|
{"readback_p1", COMP_AVRMEM, offsetof(AVRMEM, readback)+0, 1, COMP_CHAR },
|
||||||
|
{"readback_p2", COMP_AVRMEM, offsetof(AVRMEM, readback)+1, 1, COMP_CHAR },
|
||||||
|
mem_comp_desc(mode, COMP_INT),
|
||||||
|
mem_comp_desc(delay, COMP_INT),
|
||||||
|
mem_comp_desc(pollindex, COMP_INT),
|
||||||
|
mem_comp_desc(blocksize, COMP_INT),
|
||||||
|
mem_comp_desc(readsize, COMP_INT),
|
||||||
};
|
};
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
@@ -282,6 +346,9 @@ TOKEN *new_constant(const char *con) {
|
|||||||
!strcmp("PM_XMEGAJTAG", con)? PM_XMEGAJTAG:
|
!strcmp("PM_XMEGAJTAG", con)? PM_XMEGAJTAG:
|
||||||
!strcmp("PM_AVR32JTAG", con)? PM_AVR32JTAG:
|
!strcmp("PM_AVR32JTAG", con)? PM_AVR32JTAG:
|
||||||
!strcmp("PM_aWire", con)? PM_aWire:
|
!strcmp("PM_aWire", con)? PM_aWire:
|
||||||
|
!strcmp("pseudo", con)? 2:
|
||||||
|
!strcmp("yes", con) || !strcmp("true", con)? 1:
|
||||||
|
!strcmp("no", con) || !strcmp("false", con)? 0:
|
||||||
(assigned = 0);
|
(assigned = 0);
|
||||||
|
|
||||||
if(!assigned) {
|
if(!assigned) {
|
||||||
@@ -802,6 +869,7 @@ const char *cfg_comp_type(int type) {
|
|||||||
case COMP_INT: return "number";
|
case COMP_INT: return "number";
|
||||||
case COMP_SHORT: return "short";
|
case COMP_SHORT: return "short";
|
||||||
case COMP_CHAR: return "char";
|
case COMP_CHAR: return "char";
|
||||||
|
case COMP_BOOL: return "bool";
|
||||||
case COMP_STRING: return "string";
|
case COMP_STRING: return "string";
|
||||||
case COMP_CHAR_ARRAY: return "byte array";
|
case COMP_CHAR_ARRAY: return "byte array";
|
||||||
case COMP_INT_LISTID: return "number list";
|
case COMP_INT_LISTID: return "number list";
|
||||||
@@ -820,6 +888,7 @@ void cfg_assign(char *sp, int strct, Component_t *cp, VALUE *v) {
|
|||||||
int num;
|
int num;
|
||||||
|
|
||||||
switch(cp->type) {
|
switch(cp->type) {
|
||||||
|
case COMP_BOOL:
|
||||||
case COMP_CHAR:
|
case COMP_CHAR:
|
||||||
case COMP_SHORT:
|
case COMP_SHORT:
|
||||||
case COMP_INT:
|
case COMP_INT:
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ enum { // Component types in structure
|
|||||||
COMP_INT,
|
COMP_INT,
|
||||||
COMP_SHORT,
|
COMP_SHORT,
|
||||||
COMP_CHAR,
|
COMP_CHAR,
|
||||||
|
COMP_BOOL,
|
||||||
COMP_STRING,
|
COMP_STRING,
|
||||||
COMP_CHAR_ARRAY, // This and below are not yet implemented
|
COMP_CHAR_ARRAY, // This and below are not yet implemented
|
||||||
COMP_INT_LISTID,
|
COMP_INT_LISTID,
|
||||||
|
|||||||
+67
-484
@@ -71,13 +71,9 @@ static int pin_name;
|
|||||||
%token K_MEMORY
|
%token K_MEMORY
|
||||||
|
|
||||||
%token K_PAGE_SIZE
|
%token K_PAGE_SIZE
|
||||||
%token K_PAGED
|
|
||||||
|
|
||||||
%token K_ALIAS
|
%token K_ALIAS
|
||||||
%token K_BAUDRATE
|
|
||||||
%token K_BS2
|
|
||||||
%token K_BUFF
|
%token K_BUFF
|
||||||
%token K_CHIP_ERASE_DELAY
|
|
||||||
%token K_CONNTYPE
|
%token K_CONNTYPE
|
||||||
%token K_DEDICATED
|
%token K_DEDICATED
|
||||||
%token K_DEFAULT_BITCLOCK
|
%token K_DEFAULT_BITCLOCK
|
||||||
@@ -85,41 +81,23 @@ static int pin_name;
|
|||||||
%token K_DEFAULT_PROGRAMMER
|
%token K_DEFAULT_PROGRAMMER
|
||||||
%token K_DEFAULT_SERIAL
|
%token K_DEFAULT_SERIAL
|
||||||
%token K_DEFAULT_SPI
|
%token K_DEFAULT_SPI
|
||||||
%token K_DESC
|
|
||||||
%token K_FAMILY_ID
|
|
||||||
%token K_HVUPDI_SUPPORT
|
%token K_HVUPDI_SUPPORT
|
||||||
%token K_HVUPDI_VARIANT
|
|
||||||
%token K_DEVICECODE
|
%token K_DEVICECODE
|
||||||
%token K_STK500_DEVCODE
|
|
||||||
%token K_AVR910_DEVCODE
|
|
||||||
%token K_EEPROM
|
%token K_EEPROM
|
||||||
%token K_ERRLED
|
%token K_ERRLED
|
||||||
%token K_FLASH
|
%token K_FLASH
|
||||||
%token K_ID
|
%token K_ID
|
||||||
%token K_IO
|
%token K_IO
|
||||||
%token K_LOADPAGE
|
%token K_LOADPAGE
|
||||||
%token K_MAX_WRITE_DELAY
|
|
||||||
%token K_MCU_BASE
|
|
||||||
%token K_MIN_WRITE_DELAY
|
|
||||||
%token K_SDI
|
%token K_SDI
|
||||||
%token K_SDO
|
%token K_SDO
|
||||||
%token K_NUM_PAGES
|
|
||||||
%token K_NVM_BASE
|
|
||||||
%token K_OCD_BASE
|
|
||||||
%token K_OCDREV
|
|
||||||
%token K_OFFSET
|
|
||||||
%token K_PAGEL
|
|
||||||
%token K_PARALLEL
|
%token K_PARALLEL
|
||||||
%token K_PARENT
|
%token K_PARENT
|
||||||
%token K_PART
|
%token K_PART
|
||||||
%token K_PGMLED
|
%token K_PGMLED
|
||||||
%token K_PROGRAMMER
|
%token K_PROGRAMMER
|
||||||
%token K_PSEUDO
|
|
||||||
%token K_PWROFF_AFTER_WRITE
|
|
||||||
%token K_RDYLED
|
%token K_RDYLED
|
||||||
%token K_READBACK
|
%token K_READBACK
|
||||||
%token K_READBACK_P1
|
|
||||||
%token K_READBACK_P2
|
|
||||||
%token K_READMEM
|
%token K_READMEM
|
||||||
%token K_RESET
|
%token K_RESET
|
||||||
%token K_RETRY_PULSE
|
%token K_RETRY_PULSE
|
||||||
@@ -129,56 +107,13 @@ static int pin_name;
|
|||||||
%token K_SIGNATURE
|
%token K_SIGNATURE
|
||||||
%token K_SIZE
|
%token K_SIZE
|
||||||
%token K_USB
|
%token K_USB
|
||||||
%token K_USBDEV
|
|
||||||
%token K_USBSN
|
|
||||||
%token K_USBPID
|
%token K_USBPID
|
||||||
%token K_USBPRODUCT
|
|
||||||
%token K_USBVENDOR
|
|
||||||
%token K_USBVID
|
|
||||||
%token K_TYPE
|
%token K_TYPE
|
||||||
%token K_VCC
|
%token K_VCC
|
||||||
%token K_VFYLED
|
%token K_VFYLED
|
||||||
|
|
||||||
%token K_NO
|
|
||||||
%token K_YES
|
|
||||||
|
|
||||||
/* stk500 v2 xml file parameters */
|
/* stk500 v2 xml file parameters */
|
||||||
/* ISP */
|
/* ISP */
|
||||||
%token K_TIMEOUT
|
|
||||||
%token K_STABDELAY
|
|
||||||
%token K_CMDEXEDELAY
|
|
||||||
%token K_HVSPCMDEXEDELAY
|
|
||||||
%token K_SYNCHLOOPS
|
|
||||||
%token K_BYTEDELAY
|
|
||||||
%token K_POLLVALUE
|
|
||||||
%token K_POLLINDEX
|
|
||||||
%token K_PREDELAY
|
|
||||||
%token K_POSTDELAY
|
|
||||||
%token K_POLLMETHOD
|
|
||||||
%token K_MODE
|
|
||||||
%token K_DELAY
|
|
||||||
%token K_BLOCKSIZE
|
|
||||||
%token K_READSIZE
|
|
||||||
/* HV mode */
|
|
||||||
%token K_HVENTERSTABDELAY
|
|
||||||
%token K_PROGMODEDELAY
|
|
||||||
%token K_LATCHCYCLES
|
|
||||||
%token K_TOGGLEVTG
|
|
||||||
%token K_POWEROFFDELAY
|
|
||||||
%token K_RESETDELAYMS
|
|
||||||
%token K_RESETDELAYUS
|
|
||||||
%token K_HVLEAVESTABDELAY
|
|
||||||
%token K_RESETDELAY
|
|
||||||
%token K_SYNCHCYCLES
|
|
||||||
%token K_HVCMDEXEDELAY
|
|
||||||
|
|
||||||
%token K_CHIPERASEPULSEWIDTH
|
|
||||||
%token K_CHIPERASEPOLLTIMEOUT
|
|
||||||
%token K_CHIPERASETIME
|
|
||||||
%token K_PROGRAMFUSEPULSEWIDTH
|
|
||||||
%token K_PROGRAMFUSEPOLLTIMEOUT
|
|
||||||
%token K_PROGRAMLOCKPULSEWIDTH
|
|
||||||
%token K_PROGRAMLOCKPOLLTIMEOUT
|
|
||||||
|
|
||||||
%token K_PP_CONTROLSTACK
|
%token K_PP_CONTROLSTACK
|
||||||
%token K_HVSP_CONTROLSTACK
|
%token K_HVSP_CONTROLSTACK
|
||||||
@@ -481,20 +416,10 @@ prog_parm :
|
|||||||
|
|
|
|
||||||
prog_parm_pins
|
prog_parm_pins
|
||||||
|
|
|
|
||||||
prog_parm_usb
|
K_USBPID TKN_EQUAL usb_pid_list
|
||||||
|
|
|
|
||||||
prog_parm_conntype
|
prog_parm_conntype
|
||||||
|
|
|
|
||||||
K_DESC TKN_EQUAL TKN_STRING {
|
|
||||||
current_prog->desc = cache_string($3->value.string);
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
K_BAUDRATE TKN_EQUAL numexpr {
|
|
||||||
{
|
|
||||||
current_prog->baudrate = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
} |
|
|
||||||
prog_parm_updi
|
prog_parm_updi
|
||||||
;
|
;
|
||||||
|
|
||||||
@@ -531,40 +456,6 @@ prog_parm_conntype_id:
|
|||||||
K_SPI { current_prog->conntype = CONNTYPE_SPI; }
|
K_SPI { current_prog->conntype = CONNTYPE_SPI; }
|
||||||
;
|
;
|
||||||
|
|
||||||
prog_parm_usb:
|
|
||||||
K_USBDEV TKN_EQUAL TKN_STRING {
|
|
||||||
{
|
|
||||||
current_prog->usbdev = cache_string($3->value.string);
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
} |
|
|
||||||
K_USBVID TKN_EQUAL numexpr {
|
|
||||||
{
|
|
||||||
current_prog->usbvid = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
} |
|
|
||||||
K_USBPID TKN_EQUAL usb_pid_list |
|
|
||||||
K_USBSN TKN_EQUAL TKN_STRING {
|
|
||||||
{
|
|
||||||
current_prog->usbsn = cache_string($3->value.string);
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
} |
|
|
||||||
K_USBVENDOR TKN_EQUAL TKN_STRING {
|
|
||||||
{
|
|
||||||
current_prog->usbvendor = cache_string($3->value.string);
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
} |
|
|
||||||
K_USBPRODUCT TKN_EQUAL TKN_STRING {
|
|
||||||
{
|
|
||||||
current_prog->usbproduct = cache_string($3->value.string);
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
;
|
|
||||||
|
|
||||||
usb_pid_list:
|
usb_pid_list:
|
||||||
numexpr {
|
numexpr {
|
||||||
{
|
{
|
||||||
@@ -689,10 +580,6 @@ reset_disposition :
|
|||||||
K_DEDICATED | K_IO
|
K_DEDICATED | K_IO
|
||||||
;
|
;
|
||||||
|
|
||||||
parallel_modes :
|
|
||||||
yesno | K_PSEUDO
|
|
||||||
;
|
|
||||||
|
|
||||||
retry_lines :
|
retry_lines :
|
||||||
K_RESET | K_SCK
|
K_RESET | K_SCK
|
||||||
;
|
;
|
||||||
@@ -708,46 +595,13 @@ part_parm :
|
|||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_DESC TKN_EQUAL TKN_STRING
|
|
||||||
{
|
|
||||||
current_part->desc = cache_string($3->value.string);
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_FAMILY_ID TKN_EQUAL TKN_STRING
|
|
||||||
{
|
|
||||||
current_part->family_id = cache_string($3->value.string);
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_HVUPDI_VARIANT TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->hvupdi_variant = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_DEVICECODE TKN_EQUAL numexpr {
|
K_DEVICECODE TKN_EQUAL numexpr {
|
||||||
{
|
{
|
||||||
yyerror("devicecode is deprecated, use "
|
yyerror("devicecode is deprecated, will be removed in v8.0, use stk500_devcode instead");
|
||||||
"stk500_devcode instead");
|
|
||||||
YYABORT;
|
YYABORT;
|
||||||
}
|
}
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_STK500_DEVCODE TKN_EQUAL numexpr {
|
|
||||||
{
|
|
||||||
current_part->stk500_devcode = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_AVR910_DEVCODE TKN_EQUAL numexpr {
|
|
||||||
{
|
|
||||||
current_part->avr910_devcode = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
}
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_SIGNATURE TKN_EQUAL TKN_NUMBER TKN_NUMBER TKN_NUMBER {
|
K_SIGNATURE TKN_EQUAL TKN_NUMBER TKN_NUMBER TKN_NUMBER {
|
||||||
{
|
{
|
||||||
current_part->signature[0] = $3->value.number;
|
current_part->signature[0] = $3->value.number;
|
||||||
@@ -914,24 +768,6 @@ part_parm :
|
|||||||
}
|
}
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_CHIP_ERASE_DELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->chip_erase_delay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PAGEL TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->pagel = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_BS2 TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->bs2 = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_RESET TKN_EQUAL reset_disposition
|
K_RESET TKN_EQUAL reset_disposition
|
||||||
{
|
{
|
||||||
if ($3->primary == K_DEDICATED)
|
if ($3->primary == K_DEDICATED)
|
||||||
@@ -942,306 +778,145 @@ part_parm :
|
|||||||
free_tokens(2, $1, $3);
|
free_tokens(2, $1, $3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_TIMEOUT TKN_EQUAL numexpr
|
K_HAS_JTAG TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
current_part->timeout = $3->value.number;
|
yywarning("has_jtag is deprecated, will be removed in v8.0, use prog_modes");
|
||||||
free_token($3);
|
if ($3->value.number == 1)
|
||||||
} |
|
|
||||||
|
|
||||||
K_STABDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->stabdelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_CMDEXEDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->cmdexedelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_HVSPCMDEXEDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->hvspcmdexedelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_SYNCHLOOPS TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->synchloops = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_BYTEDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->bytedelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_POLLVALUE TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->pollvalue = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_POLLINDEX TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->pollindex = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PREDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->predelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_POSTDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->postdelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_POLLMETHOD TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->pollmethod = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_HVENTERSTABDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->hventerstabdelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PROGMODEDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->progmodedelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_LATCHCYCLES TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->latchcycles = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_TOGGLEVTG TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->togglevtg = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_POWEROFFDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->poweroffdelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_RESETDELAYMS TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->resetdelayms = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_RESETDELAYUS TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->resetdelayus = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_HVLEAVESTABDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->hvleavestabdelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_RESETDELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->resetdelay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_CHIPERASEPULSEWIDTH TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->chiperasepulsewidth = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_CHIPERASEPOLLTIMEOUT TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->chiperasepolltimeout = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_CHIPERASETIME TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->chiperasetime = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PROGRAMFUSEPULSEWIDTH TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->programfusepulsewidth = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PROGRAMFUSEPOLLTIMEOUT TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->programfusepolltimeout = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PROGRAMLOCKPULSEWIDTH TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->programlockpulsewidth = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PROGRAMLOCKPOLLTIMEOUT TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->programlockpolltimeout = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_SYNCHCYCLES TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->synchcycles = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_HAS_JTAG TKN_EQUAL yesno
|
|
||||||
{
|
|
||||||
if ($3->primary == K_YES)
|
|
||||||
current_part->prog_modes |= PM_JTAG;
|
current_part->prog_modes |= PM_JTAG;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->prog_modes &= ~(PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG);
|
current_part->prog_modes &= ~(PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG);
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_HAS_DW TKN_EQUAL yesno
|
K_HAS_DW TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
yywarning("has_debugwire is deprecated, will be removed in v8.0, use prog_modes");
|
||||||
|
if ($3->value.number == 1)
|
||||||
current_part->prog_modes |= PM_debugWIRE;
|
current_part->prog_modes |= PM_debugWIRE;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->prog_modes &= ~PM_debugWIRE;
|
current_part->prog_modes &= ~PM_debugWIRE;
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_HAS_PDI TKN_EQUAL yesno
|
K_HAS_PDI TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
yywarning("has_pdi is deprecated, will be removed in v8.0, use prog_modes");
|
||||||
|
if ($3->value.number == 1)
|
||||||
current_part->prog_modes |= PM_PDI;
|
current_part->prog_modes |= PM_PDI;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->prog_modes &= ~PM_PDI;
|
current_part->prog_modes &= ~PM_PDI;
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_HAS_UPDI TKN_EQUAL yesno
|
K_HAS_UPDI TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
yywarning("has_updi is deprecated, will be removed in v8.0, use prog_modes");
|
||||||
|
if ($3->value.number == 1)
|
||||||
current_part->prog_modes |= PM_UPDI;
|
current_part->prog_modes |= PM_UPDI;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->prog_modes &= ~PM_UPDI;
|
current_part->prog_modes &= ~PM_UPDI;
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_HAS_TPI TKN_EQUAL yesno
|
K_HAS_TPI TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
yywarning("has_tpi is deprecated, will be removed in v8.0, use prog_modes");
|
||||||
|
if ($3->value.number == 1)
|
||||||
current_part->prog_modes |= PM_TPI;
|
current_part->prog_modes |= PM_TPI;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->prog_modes &= ~PM_TPI;
|
current_part->prog_modes &= ~PM_TPI;
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_IS_AT90S1200 TKN_EQUAL yesno
|
K_IS_AT90S1200 TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
if ($3->value.number == 1)
|
||||||
current_part->flags |= AVRPART_IS_AT90S1200;
|
current_part->flags |= AVRPART_IS_AT90S1200;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->flags &= ~AVRPART_IS_AT90S1200;
|
current_part->flags &= ~AVRPART_IS_AT90S1200;
|
||||||
|
else {
|
||||||
|
yyerror("is_at90s1200 not a Boolean value");
|
||||||
|
free_token($3);
|
||||||
|
YYABORT;
|
||||||
|
}
|
||||||
|
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_IS_AVR32 TKN_EQUAL yesno
|
K_IS_AVR32 TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
yywarning("is_avr32 is deprecated, will be removed in v8.0, use prog_modes");
|
||||||
|
if ($3->value.number == 1)
|
||||||
current_part->prog_modes |= PM_aWire;
|
current_part->prog_modes |= PM_aWire;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->prog_modes &= ~PM_aWire;
|
current_part->prog_modes &= ~PM_aWire;
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_ALLOWFULLPAGEBITSTREAM TKN_EQUAL yesno
|
K_ALLOWFULLPAGEBITSTREAM TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
if ($3->value.number == 1)
|
||||||
current_part->flags |= AVRPART_ALLOWFULLPAGEBITSTREAM;
|
current_part->flags |= AVRPART_ALLOWFULLPAGEBITSTREAM;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->flags &= ~AVRPART_ALLOWFULLPAGEBITSTREAM;
|
current_part->flags &= ~AVRPART_ALLOWFULLPAGEBITSTREAM;
|
||||||
|
else {
|
||||||
|
yyerror("allowfullpagebitstream not a Boolean value");
|
||||||
|
free_token($3);
|
||||||
|
YYABORT;
|
||||||
|
}
|
||||||
|
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_ENABLEPAGEPROGRAMMING TKN_EQUAL yesno
|
K_ENABLEPAGEPROGRAMMING TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES)
|
if ($3->value.number == 1)
|
||||||
current_part->flags |= AVRPART_ENABLEPAGEPROGRAMMING;
|
current_part->flags |= AVRPART_ENABLEPAGEPROGRAMMING;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->flags &= ~AVRPART_ENABLEPAGEPROGRAMMING;
|
current_part->flags &= ~AVRPART_ENABLEPAGEPROGRAMMING;
|
||||||
|
else {
|
||||||
|
yyerror("enablepageprogramming not a Boolean value");
|
||||||
|
free_token($3);
|
||||||
|
YYABORT;
|
||||||
|
}
|
||||||
|
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_MCU_BASE TKN_EQUAL numexpr
|
K_SERIAL TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
current_part->mcu_base = $3->value.number;
|
if ($3->value.number == 1)
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_NVM_BASE TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->nvm_base = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_OCD_BASE TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->ocd_base = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_OCDREV TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_part->ocdrev = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_SERIAL TKN_EQUAL yesno
|
|
||||||
{
|
|
||||||
if ($3->primary == K_YES)
|
|
||||||
current_part->flags |= AVRPART_SERIALOK;
|
current_part->flags |= AVRPART_SERIALOK;
|
||||||
else if ($3->primary == K_NO)
|
else if ($3->value.number == 0)
|
||||||
current_part->flags &= ~AVRPART_SERIALOK;
|
current_part->flags &= ~AVRPART_SERIALOK;
|
||||||
|
else {
|
||||||
|
yyerror("serial not a Boolean value");
|
||||||
|
free_token($3);
|
||||||
|
YYABORT;
|
||||||
|
}
|
||||||
|
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_PARALLEL TKN_EQUAL parallel_modes
|
K_PARALLEL TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
if ($3->primary == K_YES) {
|
if ($3->value.number == 1) {
|
||||||
current_part->flags |= AVRPART_PARALLELOK;
|
current_part->flags |= AVRPART_PARALLELOK;
|
||||||
current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
|
current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
|
||||||
}
|
}
|
||||||
else if ($3->primary == K_NO) {
|
else if ($3->value.number == 0) {
|
||||||
current_part->flags &= ~AVRPART_PARALLELOK;
|
current_part->flags &= ~AVRPART_PARALLELOK;
|
||||||
current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
|
current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
|
||||||
}
|
}
|
||||||
else if ($3->primary == K_PSEUDO) {
|
else if ($3->value.number == 2) {
|
||||||
current_part->flags |= AVRPART_PARALLELOK;
|
current_part->flags |= AVRPART_PARALLELOK;
|
||||||
current_part->flags |= AVRPART_PSEUDOPARALLEL;
|
current_part->flags |= AVRPART_PSEUDOPARALLEL;
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
yyerror("parallel outside [0, 2] (yes/no/pseudo)");
|
||||||
|
free_token($3);
|
||||||
|
YYABORT;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
free_token($3);
|
free_token($3);
|
||||||
@@ -1343,11 +1018,6 @@ part_parm :
|
|||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
yesno :
|
|
||||||
K_YES | K_NO
|
|
||||||
;
|
|
||||||
|
|
||||||
|
|
||||||
mem_specs :
|
mem_specs :
|
||||||
mem_spec TKN_SEMI |
|
mem_spec TKN_SEMI |
|
||||||
mem_alias TKN_SEMI |
|
mem_alias TKN_SEMI |
|
||||||
@@ -1361,19 +1031,6 @@ mem_spec :
|
|||||||
free_token($1);
|
free_token($1);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_PAGED TKN_EQUAL yesno
|
|
||||||
{
|
|
||||||
current_mem->paged = $3->primary == K_YES ? 1 : 0;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_SIZE TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->size = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
|
|
||||||
K_PAGE_SIZE TKN_EQUAL numexpr
|
K_PAGE_SIZE TKN_EQUAL numexpr
|
||||||
{
|
{
|
||||||
int ps = $3->value.number;
|
int ps = $3->value.number;
|
||||||
@@ -1384,36 +1041,6 @@ mem_spec :
|
|||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_NUM_PAGES TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->num_pages = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_OFFSET TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->offset = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_MIN_WRITE_DELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->min_write_delay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_MAX_WRITE_DELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->max_write_delay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_PWROFF_AFTER_WRITE TKN_EQUAL yesno
|
|
||||||
{
|
|
||||||
current_mem->pwroff_after_write = $3->primary == K_YES ? 1 : 0;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_READBACK TKN_EQUAL TKN_NUMBER TKN_NUMBER
|
K_READBACK TKN_EQUAL TKN_NUMBER TKN_NUMBER
|
||||||
{
|
{
|
||||||
current_mem->readback[0] = $3->value.number;
|
current_mem->readback[0] = $3->value.number;
|
||||||
@@ -1422,50 +1049,6 @@ mem_spec :
|
|||||||
free_token($4);
|
free_token($4);
|
||||||
} |
|
} |
|
||||||
|
|
||||||
K_READBACK_P1 TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->readback[0] = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_READBACK_P2 TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->readback[1] = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
|
|
||||||
K_MODE TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->mode = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_DELAY TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->delay = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_BLOCKSIZE TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->blocksize = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_READSIZE TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->readsize = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
K_POLLINDEX TKN_EQUAL numexpr
|
|
||||||
{
|
|
||||||
current_mem->pollindex = $3->value.number;
|
|
||||||
free_token($3);
|
|
||||||
} |
|
|
||||||
|
|
||||||
|
|
||||||
opcode TKN_EQUAL string_list {
|
opcode TKN_EQUAL string_list {
|
||||||
{
|
{
|
||||||
int opnum;
|
int opnum;
|
||||||
|
|||||||
+6
-3
@@ -23,7 +23,7 @@
|
|||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_PREREQ(2.60)
|
AC_PREREQ(2.60)
|
||||||
AC_INIT(avrdude, 7.1, avrdude-dev@nongnu.org)
|
AC_INIT(avrdude, 7.1-20230108, avrdude-dev@nongnu.org)
|
||||||
|
|
||||||
AC_CANONICAL_BUILD
|
AC_CANONICAL_BUILD
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
@@ -78,9 +78,12 @@ dnl Makefile.am:77: compiling `config_gram.c' with per-target flags requires `AM
|
|||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
|
|
||||||
# Checks for libraries.
|
# Checks for libraries.
|
||||||
|
# For MinGW.
|
||||||
|
AC_CHECK_LIB([ws2_32], [WSAStartup])
|
||||||
|
|
||||||
AC_CHECK_LIB([termcap], [tputs])
|
AC_CHECK_LIB([termcap], [tputs])
|
||||||
AC_CHECK_LIB([ncurses], [tputs])
|
AC_CHECK_LIB([ncurses], [tputs])
|
||||||
AC_CHECK_LIB([readline], [readline])
|
AC_CHECK_LIB([readline], [readline], [have_readline=yes])
|
||||||
AH_TEMPLATE([HAVE_LIBELF],
|
AH_TEMPLATE([HAVE_LIBELF],
|
||||||
[Define if ELF support is enabled via libelf])
|
[Define if ELF support is enabled via libelf])
|
||||||
AC_CHECK_LIB([elf], [elf_getshdrstrndx], [have_libelf=yes])
|
AC_CHECK_LIB([elf], [elf_getshdrstrndx], [have_libelf=yes])
|
||||||
@@ -429,7 +432,7 @@ fi
|
|||||||
|
|
||||||
# If we are compiling with gcc, enable all warnings 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 -Wextra -Wno-unused-parameter"
|
||||||
|
|
||||||
# does this compiler support -Wno-pointer-sign ?
|
# does this compiler support -Wno-pointer-sign ?
|
||||||
AC_MSG_CHECKING([if gcc accepts -Wno-pointer-sign ])
|
AC_MSG_CHECKING([if gcc accepts -Wno-pointer-sign ])
|
||||||
|
|||||||
@@ -763,7 +763,7 @@ static void dev_part_strct(const AVRPART *p, bool tsv, const AVRPART *base, bool
|
|||||||
_if_memout(intcmp, "%d", max_write_delay);
|
_if_memout(intcmp, "%d", max_write_delay);
|
||||||
_if_memout_yn(pwroff_after_write);
|
_if_memout_yn(pwroff_after_write);
|
||||||
_if_n_memout_str(memcmp, 2, dev_sprintf("0x%02x 0x%02x", m->readback[0], m->readback[1]), readback);
|
_if_n_memout_str(memcmp, 2, dev_sprintf("0x%02x 0x%02x", m->readback[0], m->readback[1]), readback);
|
||||||
_if_memout(intcmp, "%d", mode);
|
_if_memout(intcmp, "0x%02x", mode);
|
||||||
_if_memout(intcmp, "%d", delay);
|
_if_memout(intcmp, "%d", delay);
|
||||||
_if_memout(intcmp, "%d", blocksize);
|
_if_memout(intcmp, "%d", blocksize);
|
||||||
_if_memout(intcmp, "%d", readsize);
|
_if_memout(intcmp, "%d", readsize);
|
||||||
|
|||||||
@@ -62,6 +62,11 @@ static int dev_message(int msglvl, const char *fmt, ...);
|
|||||||
dev_part_strct_entry(tsv, ".prog", id, NULL, #component, dev_sprintf(fmt, pgm->component), pgm->comments); \
|
dev_part_strct_entry(tsv, ".prog", id, NULL, #component, dev_sprintf(fmt, pgm->component), pgm->comments); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
|
#define _if_pgmout_bool(component) do { \
|
||||||
|
if(!base || !!base->component != !!pgm->component) \
|
||||||
|
dev_part_strct_entry(tsv, ".prog", id, NULL, #component, dev_sprintf("%s", pgm->component? "true": "false"), pgm->comments); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
// Result must be a malloc'd string
|
// Result must be a malloc'd string
|
||||||
#define _if_pgmout_str(cmp, result, component) do { \
|
#define _if_pgmout_str(cmp, result, component) do { \
|
||||||
if(!base || cmp(base->component, pgm->component)) \
|
if(!base || cmp(base->component, pgm->component)) \
|
||||||
@@ -77,6 +82,11 @@ static int dev_message(int msglvl, const char *fmt, ...);
|
|||||||
dev_part_strct_entry(tsv, ".pt", p->desc, NULL, #component, dev_sprintf(fmt, p->component), p->comments); \
|
dev_part_strct_entry(tsv, ".pt", p->desc, NULL, #component, dev_sprintf(fmt, p->component), p->comments); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
|
#define _if_partout_bool(component) do { \
|
||||||
|
if(!base || !!base->component != !!p->component) \
|
||||||
|
dev_part_strct_entry(tsv, ".pt", p->desc, NULL, #component, dev_sprintf("%s", p->component? "true": "false"), p->comments); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
#define _if_n_partout(cmp, n, fmt, component) do { \
|
#define _if_n_partout(cmp, n, fmt, component) do { \
|
||||||
if(!base || cmp(base->component, p->component, n)) \
|
if(!base || cmp(base->component, p->component, n)) \
|
||||||
dev_part_strct_entry(tsv, ".pt", p->desc, NULL, #component, dev_sprintf(fmt, p->component), p->comments); \
|
dev_part_strct_entry(tsv, ".pt", p->desc, NULL, #component, dev_sprintf(fmt, p->component), p->comments); \
|
||||||
@@ -120,6 +130,11 @@ static int dev_message(int msglvl, const char *fmt, ...);
|
|||||||
#define _memout_yn(component) \
|
#define _memout_yn(component) \
|
||||||
dev_part_strct_entry(tsv, ".ptmm", p->desc, m->desc, #component, cfg_strdup("_memout_yn()", m->component? "yes": "no"), m->comments)
|
dev_part_strct_entry(tsv, ".ptmm", p->desc, m->desc, #component, cfg_strdup("_memout_yn()", m->component? "yes": "no"), m->comments)
|
||||||
|
|
||||||
|
#define _if_memout_bool(component) do { \
|
||||||
|
if(!bm || !!bm->component != !!m->component) \
|
||||||
|
dev_part_strct_entry(tsv, ".ptmm", p->desc, m->desc, #component, dev_sprintf("%s", m->component? "true": "false"), m->comments); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
#define _if_memout_yn(component) do { \
|
#define _if_memout_yn(component) do { \
|
||||||
if(!bm || bm->component != m->component) \
|
if(!bm || bm->component != m->component) \
|
||||||
dev_part_strct_entry(tsv, ".ptmm", p->desc, m->desc, #component, cfg_strdup("_if_memout_yn()", m->component? "yes": "no"), m->comments); \
|
dev_part_strct_entry(tsv, ".ptmm", p->desc, m->desc, #component, cfg_strdup("_if_memout_yn()", m->component? "yes": "no"), m->comments); \
|
||||||
|
|||||||
@@ -275,12 +275,12 @@ int dfu_getstatus(struct dfu_dev *dfu, struct dfu_status *status)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result < sizeof(struct dfu_status)) {
|
if (result < (int) sizeof(struct dfu_status)) {
|
||||||
pmsg_error("unable to get DFU status: %s\n", "short read");
|
pmsg_error("unable to get DFU status: %s\n", "short read");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result > sizeof(struct dfu_status)) {
|
if (result > (int) sizeof(struct dfu_status)) {
|
||||||
pmsg_error("oversize read (should not happen); exiting\n");
|
pmsg_error("oversize read (should not happen); exiting\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -223,8 +223,8 @@ The STK600, JTAG ICE mkII/3, AVRISP mkII, USBasp, avrftdi (and derivatives), and
|
|||||||
programmers communicate through the USB, using @code{libusb} as a
|
programmers communicate through the USB, using @code{libusb} as a
|
||||||
platform abstraction layer.
|
platform abstraction layer.
|
||||||
The avrftdi adds support for the FT2232C/D, FT2232H, and FT4232H devices. These all use
|
The avrftdi adds support for the FT2232C/D, FT2232H, and FT4232H devices. These all use
|
||||||
the MPSSE mode, which has a specific pin mapping. Bit 1 (the lsb of the byte in the config
|
the MPSSE mode, which has a specific pin mapping. Bit 0 (the lsb of the byte in the config
|
||||||
file) is SCK. Bit 2 is SDO, and Bit 3 is SDI. Bit 4 usually reset. The 2232C/D parts
|
file) is SCK. Bit 1 is SDO, and Bit 2 is SDI. Bit 3 usually reset. The 2232C/D parts
|
||||||
are only supported on interface A, but the H parts can be either A or B (specified by the
|
are only supported on interface A, but the H parts can be either A or B (specified by the
|
||||||
usbdev config parameter).
|
usbdev config parameter).
|
||||||
The STK500, STK600, JTAG ICE, and avr910 contain on-board logic to control the programming of the target
|
The STK500, STK600, JTAG ICE, and avr910 contain on-board logic to control the programming of the target
|
||||||
|
|||||||
+4
-4
@@ -374,7 +374,7 @@ int flip1_read_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *me
|
|||||||
if (strcmp(mem->desc, "signature") == 0) {
|
if (strcmp(mem->desc, "signature") == 0) {
|
||||||
if (flip1_read_sig_bytes(pgm, part, mem) < 0)
|
if (flip1_read_sig_bytes(pgm, part, mem) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
if (addr >= mem->size) {
|
if (addr >= (unsigned long) mem->size) {
|
||||||
pmsg_error("signature address %lu out of range [0, %d]\n", addr, mem->size-1);
|
pmsg_error("signature address %lu out of range [0, %d]\n", addr, mem->size-1);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@@ -461,7 +461,7 @@ int flip1_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *
|
|||||||
result = flip1_write_memory(FLIP1(pgm)->dfu, mem_unit, addr,
|
result = flip1_write_memory(FLIP1(pgm)->dfu, mem_unit, addr,
|
||||||
mem->buf + addr, n_bytes);
|
mem->buf + addr, n_bytes);
|
||||||
|
|
||||||
return (result == 0) ? n_bytes : -1;
|
return result == 0? (int) n_bytes: -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int flip1_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem) {
|
int flip1_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem) {
|
||||||
@@ -470,7 +470,7 @@ int flip1_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRME
|
|||||||
if (FLIP1(pgm)->dfu == NULL)
|
if (FLIP1(pgm)->dfu == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (mem->size < sizeof(FLIP1(pgm)->part_sig)) {
|
if (mem->size < (int) sizeof(FLIP1(pgm)->part_sig)) {
|
||||||
pmsg_error("signature read must be at least %u bytes\n", (unsigned int) sizeof(FLIP1(pgm)->part_sig));
|
pmsg_error("signature read must be at least %u bytes\n", (unsigned int) sizeof(FLIP1(pgm)->part_sig));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@@ -652,7 +652,7 @@ int flip1_write_memory(struct dfu_dev *dfu,
|
|||||||
int cmd_result = 0;
|
int cmd_result = 0;
|
||||||
int aux_result;
|
int aux_result;
|
||||||
struct flip1_cmd_header cmd_header = {
|
struct flip1_cmd_header cmd_header = {
|
||||||
FLIP1_CMD_PROG_START, mem_unit
|
FLIP1_CMD_PROG_START, mem_unit, {0}, {0}, {0},
|
||||||
};
|
};
|
||||||
struct flip1_prog_footer cmd_footer = {
|
struct flip1_prog_footer cmd_footer = {
|
||||||
{ 0, 0, 0, 0 }, /* CRC */
|
{ 0, 0, 0, 0 }, /* CRC */
|
||||||
|
|||||||
+3
-3
@@ -459,7 +459,7 @@ int flip2_paged_load(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *m
|
|||||||
result = flip2_read_memory(FLIP2(pgm)->dfu, mem_unit, addr,
|
result = flip2_read_memory(FLIP2(pgm)->dfu, mem_unit, addr,
|
||||||
mem->buf + addr, n_bytes);
|
mem->buf + addr, n_bytes);
|
||||||
|
|
||||||
return (result == 0) ? n_bytes : -1;
|
return result == 0? (int) n_bytes: -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int flip2_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
int flip2_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
||||||
@@ -490,7 +490,7 @@ int flip2_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *
|
|||||||
result = flip2_write_memory(FLIP2(pgm)->dfu, mem_unit, addr,
|
result = flip2_write_memory(FLIP2(pgm)->dfu, mem_unit, addr,
|
||||||
mem->buf + addr, n_bytes);
|
mem->buf + addr, n_bytes);
|
||||||
|
|
||||||
return (result == 0) ? n_bytes : -1;
|
return result == 0? (int) n_bytes: -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the -E option flag
|
// Parse the -E option flag
|
||||||
@@ -520,7 +520,7 @@ int flip2_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRME
|
|||||||
if (FLIP2(pgm)->dfu == NULL)
|
if (FLIP2(pgm)->dfu == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (mem->size < sizeof(FLIP2(pgm)->part_sig)) {
|
if (mem->size < (int) sizeof(FLIP2(pgm)->part_sig)) {
|
||||||
pmsg_error("signature read must be at least %u bytes\n", (unsigned int) sizeof(FLIP2(pgm)->part_sig));
|
pmsg_error("signature read must be at least %u bytes\n", (unsigned int) sizeof(FLIP2(pgm)->part_sig));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-15
@@ -166,14 +166,14 @@ static void ft245r_rx_buf_purge(const PROGRAMMER *pgm) {
|
|||||||
static void ft245r_rx_buf_put(const PROGRAMMER *pgm, uint8_t byte) {
|
static void ft245r_rx_buf_put(const PROGRAMMER *pgm, uint8_t byte) {
|
||||||
rx.len++;
|
rx.len++;
|
||||||
rx.buf[rx.wr++] = byte;
|
rx.buf[rx.wr++] = byte;
|
||||||
if (rx.wr >= sizeof(rx.buf))
|
if (rx.wr >= (int) sizeof(rx.buf))
|
||||||
rx.wr = 0;
|
rx.wr = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t ft245r_rx_buf_get(const PROGRAMMER *pgm) {
|
static uint8_t ft245r_rx_buf_get(const PROGRAMMER *pgm) {
|
||||||
rx.len--;
|
rx.len--;
|
||||||
uint8_t byte = rx.buf[rx.rd++];
|
uint8_t byte = rx.buf[rx.rd++];
|
||||||
if (rx.rd >= sizeof(rx.buf))
|
if (rx.rd >= (int) sizeof(rx.buf))
|
||||||
rx.rd = 0;
|
rx.rd = 0;
|
||||||
return byte;
|
return byte;
|
||||||
}
|
}
|
||||||
@@ -246,10 +246,8 @@ static int ft245r_flush(const PROGRAMMER *pgm) {
|
|||||||
|
|
||||||
static int ft245r_send2(const PROGRAMMER *pgm, unsigned char *buf, size_t len,
|
static int ft245r_send2(const PROGRAMMER *pgm, unsigned char *buf, size_t len,
|
||||||
bool discard_rx_data) {
|
bool discard_rx_data) {
|
||||||
int i, j;
|
for (size_t i = 0; i < len; ++i) {
|
||||||
|
for (int j = 0; j < baud_multiplier; ++j) {
|
||||||
for (i = 0; i < len; ++i) {
|
|
||||||
for (j = 0; j < baud_multiplier; ++j) {
|
|
||||||
if (discard_rx_data)
|
if (discard_rx_data)
|
||||||
++rx.discard;
|
++rx.discard;
|
||||||
tx.buf[tx.len++] = buf[i];
|
tx.buf[tx.len++] = buf[i];
|
||||||
@@ -270,13 +268,11 @@ static int ft245r_send_and_discard(const PROGRAMMER *pgm, unsigned char *buf,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int ft245r_recv(const PROGRAMMER *pgm, unsigned char *buf, size_t len) {
|
static int ft245r_recv(const PROGRAMMER *pgm, unsigned char *buf, size_t len) {
|
||||||
int i, j;
|
|
||||||
|
|
||||||
ft245r_flush(pgm);
|
ft245r_flush(pgm);
|
||||||
ft245r_fill(pgm);
|
ft245r_fill(pgm);
|
||||||
|
|
||||||
#if FT245R_DEBUG
|
#if FT245R_DEBUG
|
||||||
msg_info("%s: discarding %d, consuming %zu bytes\n", __func__, rx.discard, len);
|
msg_info("%s: discarding %d, consuming %lu bytes\n", __func__, rx.discard, (unsigned long) len);
|
||||||
#endif
|
#endif
|
||||||
while (rx.discard > 0) {
|
while (rx.discard > 0) {
|
||||||
int result = ft245r_rx_buf_fill_and_get(pgm);
|
int result = ft245r_rx_buf_fill_and_get(pgm);
|
||||||
@@ -288,7 +284,7 @@ static int ft245r_recv(const PROGRAMMER *pgm, unsigned char *buf, size_t len) {
|
|||||||
--rx.discard;
|
--rx.discard;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < len; ++i)
|
for (size_t i = 0; i < len; ++i)
|
||||||
{
|
{
|
||||||
int result = ft245r_rx_buf_fill_and_get(pgm);
|
int result = ft245r_rx_buf_fill_and_get(pgm);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
@@ -297,7 +293,7 @@ static int ft245r_recv(const PROGRAMMER *pgm, unsigned char *buf, size_t len) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buf[i] = (uint8_t)result;
|
buf[i] = (uint8_t)result;
|
||||||
for (j = 1; j < baud_multiplier; ++j)
|
for (int j = 1; j < baud_multiplier; ++j)
|
||||||
{
|
{
|
||||||
result = ft245r_rx_buf_fill_and_get(pgm);
|
result = ft245r_rx_buf_fill_and_get(pgm);
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
@@ -1054,7 +1050,7 @@ static int ft245r_paged_write_flash(const PROGRAMMER *pgm, const AVRPART *p, con
|
|||||||
avr_set_bits(m->op[spi], cmd);
|
avr_set_bits(m->op[spi], cmd);
|
||||||
avr_set_addr(m->op[spi], cmd, addr/2);
|
avr_set_addr(m->op[spi], cmd, addr/2);
|
||||||
avr_set_input(m->op[spi], cmd, m->buf[addr]);
|
avr_set_input(m->op[spi], cmd, m->buf[addr]);
|
||||||
for(int k=0; k<sizeof cmd; k++)
|
for(size_t k=0; k<sizeof cmd; k++)
|
||||||
buf_pos += set_data(pgm, buf+buf_pos, cmd[k]);
|
buf_pos += set_data(pgm, buf+buf_pos, cmd[k]);
|
||||||
|
|
||||||
i++; j++; addr++;
|
i++; j++; addr++;
|
||||||
@@ -1064,7 +1060,7 @@ static int ft245r_paged_write_flash(const PROGRAMMER *pgm, const AVRPART *p, con
|
|||||||
|
|
||||||
// page boundary, finished or buffer exhausted? queue up requests
|
// page boundary, finished or buffer exhausted? queue up requests
|
||||||
if(do_page_write || i >= (int) n_bytes || j >= FT245R_FRAGMENT_SIZE/FT245R_CMD_SIZE) {
|
if(do_page_write || i >= (int) n_bytes || j >= FT245R_FRAGMENT_SIZE/FT245R_CMD_SIZE) {
|
||||||
if(i >= n_bytes) {
|
if(i >= (int) n_bytes) {
|
||||||
ft245r_out = SET_BITS_0(ft245r_out, pgm, PIN_AVR_SCK, 0); // SCK down
|
ft245r_out = SET_BITS_0(ft245r_out, pgm, PIN_AVR_SCK, 0); // SCK down
|
||||||
buf[buf_pos++] = ft245r_out;
|
buf[buf_pos++] = ft245r_out;
|
||||||
} else {
|
} else {
|
||||||
@@ -1150,7 +1146,7 @@ static int ft245r_paged_load_flash(const PROGRAMMER *pgm, const AVRPART *p, cons
|
|||||||
avr_set_addr(m->op[AVR_OP_LOAD_EXT_ADDR], cmd, addr/2);
|
avr_set_addr(m->op[AVR_OP_LOAD_EXT_ADDR], cmd, addr/2);
|
||||||
|
|
||||||
buf_pos = 0;
|
buf_pos = 0;
|
||||||
for(int k=0; k<sizeof cmd; k++)
|
for(size_t k=0; k<sizeof cmd; k++)
|
||||||
buf_pos += set_data(pgm, buf+buf_pos, cmd[k]);
|
buf_pos += set_data(pgm, buf+buf_pos, cmd[k]);
|
||||||
ft245r_send_and_discard(pgm, buf, buf_pos);
|
ft245r_send_and_discard(pgm, buf, buf_pos);
|
||||||
}
|
}
|
||||||
@@ -1164,7 +1160,7 @@ static int ft245r_paged_load_flash(const PROGRAMMER *pgm, const AVRPART *p, cons
|
|||||||
memset(cmd, 0, sizeof cmd);
|
memset(cmd, 0, sizeof cmd);
|
||||||
avr_set_bits(m->op[spi], cmd);
|
avr_set_bits(m->op[spi], cmd);
|
||||||
avr_set_addr(m->op[spi], cmd, addr/2);
|
avr_set_addr(m->op[spi], cmd, addr/2);
|
||||||
for(int k=0; k<sizeof cmd; k++)
|
for(size_t k=0; k<sizeof cmd; k++)
|
||||||
buf_pos += set_data(pgm, buf+buf_pos, cmd[k]);
|
buf_pos += set_data(pgm, buf+buf_pos, cmd[k]);
|
||||||
|
|
||||||
i++; j++; addr++;
|
i++; j++; addr++;
|
||||||
|
|||||||
+1
-1
@@ -2586,7 +2586,7 @@ static int jtag3_send_tpi(const PROGRAMMER *pgm, unsigned char *data, size_t len
|
|||||||
|
|
||||||
cmdbuf[0] = SCOPE_AVR_TPI;
|
cmdbuf[0] = SCOPE_AVR_TPI;
|
||||||
if (len > INT_MAX) {
|
if (len > INT_MAX) {
|
||||||
pmsg_error("invalid jtag3_send_tpi() packet length %zu\n", len);
|
pmsg_error("invalid jtag3_send_tpi() packet length %lu\n", (unsigned long) len);
|
||||||
free(cmdbuf);
|
free(cmdbuf);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-6
@@ -83,7 +83,7 @@ struct pdata
|
|||||||
* to try connecting at startup, we keep these two entries on top to
|
* to try connecting at startup, we keep these two entries on top to
|
||||||
* speedup the program start.
|
* speedup the program start.
|
||||||
*/
|
*/
|
||||||
const static struct {
|
static const struct {
|
||||||
long baud;
|
long baud;
|
||||||
unsigned char val;
|
unsigned char val;
|
||||||
} baudtab[] = {
|
} baudtab[] = {
|
||||||
@@ -139,11 +139,10 @@ u16_to_b2(unsigned char *b, unsigned short l)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void jtagmkI_prmsg(const PROGRAMMER *pgm, unsigned char *data, size_t len) {
|
static void jtagmkI_prmsg(const PROGRAMMER *pgm, unsigned char *data, size_t len) {
|
||||||
int i;
|
|
||||||
|
|
||||||
if (verbose >= 4) {
|
if (verbose >= 4) {
|
||||||
msg_trace("Raw message:\n");
|
msg_trace("Raw message:\n");
|
||||||
|
|
||||||
|
size_t i;
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
msg_trace("0x%02x ", data[i]);
|
msg_trace("0x%02x ", data[i]);
|
||||||
if (i % 16 == 15)
|
if (i % 16 == 15)
|
||||||
@@ -182,6 +181,7 @@ static void jtagmkI_prmsg(const PROGRAMMER *pgm, unsigned char *data, size_t len
|
|||||||
|
|
||||||
case RESP_POWER:
|
case RESP_POWER:
|
||||||
msg_info("target power lost\n");
|
msg_info("target power lost\n");
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
msg_info("unknown message 0x%02x\n", data[0]);
|
msg_info("unknown message 0x%02x\n", data[0]);
|
||||||
@@ -471,9 +471,7 @@ static int jtagmkI_program_disable(const PROGRAMMER *pgm) {
|
|||||||
|
|
||||||
static unsigned char jtagmkI_get_baud(long baud)
|
static unsigned char jtagmkI_get_baud(long baud)
|
||||||
{
|
{
|
||||||
int i;
|
for (size_t i = 0; i < sizeof baudtab / sizeof baudtab[0]; i++)
|
||||||
|
|
||||||
for (i = 0; i < sizeof baudtab / sizeof baudtab[0]; i++)
|
|
||||||
if (baud == baudtab[i].baud)
|
if (baud == baudtab[i].baud)
|
||||||
return baudtab[i].val;
|
return baudtab[i].val;
|
||||||
|
|
||||||
|
|||||||
+16
-71
@@ -121,9 +121,17 @@ SIGN [+-]
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
(?x: prog_modes | mcuid | n_interrupts | n_page_erase | n_word_writes | n_boot_sections |
|
(?x: desc | prog_modes | baudrate | usbvid | usbdev | usbsn | usbvendor | usbproduct |
|
||||||
boot_section_size | autobaud_sync | idr | rampz | spmcr | eecr | eind ) { /* struct components */
|
family_id | mcuid | n_interrupts | n_page_erase | n_boot_sections | boot_section_size |
|
||||||
|
hvupdi_variant | stk500_devcode | avr910_devcode | chip_erase_delay | pagel | bs2 |
|
||||||
|
timeout | stabdelay | cmdexedelay | synchloops | bytedelay | pollindex | pollvalue | predelay | postdelay | pollmethod |
|
||||||
|
hventerstabdelay | progmodedelay | latchcycles | togglevtg | poweroffdelay | resetdelayms | resetdelayus | resetdelay | hvleavestabdelay |
|
||||||
|
chiperasetime | (chiperase|program(fuse|lock))(polltimeout|pulsewidth) | synchcycles | hvspcmdexedelay |
|
||||||
|
mcu_base | nvm_base | ocd_base | ocdrev |
|
||||||
|
autobaud_sync | idr | rampz | spmcr | eecr | eind |
|
||||||
|
paged | size | num_pages | n_word_writes | offset | min_write_delay | max_write_delay | pwroff_after_write |
|
||||||
|
readback_p1 | readback_p2 | mode | delay | blocksize | readsize ) {
|
||||||
|
/* struct components for PROGRAMMER, AVRPART and AVRMEM */
|
||||||
Component_t *cp = cfg_comp_search(yytext, current_strct);
|
Component_t *cp = cfg_comp_search(yytext, current_strct);
|
||||||
if(!cp) {
|
if(!cp) {
|
||||||
yyerror("unknown component %s in %s", yytext, cfg_strct_name(current_strct));
|
yyerror("unknown component %s in %s", yytext, cfg_strct_name(current_strct));
|
||||||
@@ -135,27 +143,17 @@ SIGN [+-]
|
|||||||
return TKN_COMPONENT;
|
return TKN_COMPONENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
PM_(SPM|TPI|ISP|PDI|UPDI|HVSP|HVPP|debugWIRE|JTAG|JTAGmkI|XMEGAJTAG|AVR32JTAG|aWire) { /* Constants */
|
|
||||||
|
(?x: PM_(SPM|TPI|ISP|PDI|UPDI|HVSP|HVPP|debugWIRE|JTAG|JTAGmkI|XMEGAJTAG|AVR32JTAG|aWire) |
|
||||||
|
yes|no|pseudo | true|false ) { /* Constants */
|
||||||
yylval = new_constant(yytext);
|
yylval = new_constant(yytext);
|
||||||
return TKN_NUMBER;
|
return TKN_NUMBER;
|
||||||
}
|
}
|
||||||
|
|
||||||
alias { yylval=NULL; return K_ALIAS; }
|
alias { yylval=NULL; return K_ALIAS; }
|
||||||
allowfullpagebitstream { yylval=NULL; ccap(); return K_ALLOWFULLPAGEBITSTREAM; }
|
allowfullpagebitstream { yylval=NULL; ccap(); return K_ALLOWFULLPAGEBITSTREAM; }
|
||||||
avr910_devcode { yylval=NULL; ccap(); return K_AVR910_DEVCODE; }
|
|
||||||
bank_size { yylval=NULL; return K_PAGE_SIZE; }
|
|
||||||
banked { yylval=NULL; return K_PAGED; }
|
|
||||||
baudrate { yylval=NULL; ccap(); return K_BAUDRATE; }
|
|
||||||
blocksize { yylval=NULL; ccap(); return K_BLOCKSIZE; }
|
|
||||||
bs2 { yylval=NULL; ccap(); return K_BS2; }
|
|
||||||
buff { yylval=NULL; ccap(); return K_BUFF; }
|
buff { yylval=NULL; ccap(); return K_BUFF; }
|
||||||
bytedelay { yylval=NULL; ccap(); return K_BYTEDELAY; }
|
|
||||||
chip_erase { yylval=new_token(K_CHIP_ERASE); ccap(); return K_CHIP_ERASE; }
|
chip_erase { yylval=new_token(K_CHIP_ERASE); ccap(); return K_CHIP_ERASE; }
|
||||||
chip_erase_delay { yylval=NULL; ccap(); return K_CHIP_ERASE_DELAY; }
|
|
||||||
chiperasepolltimeout { yylval=NULL; ccap(); return K_CHIPERASEPOLLTIMEOUT; }
|
|
||||||
chiperasepulsewidth { yylval=NULL; ccap(); return K_CHIPERASEPULSEWIDTH; }
|
|
||||||
chiperasetime { yylval=NULL; ccap(); return K_CHIPERASETIME; }
|
|
||||||
cmdexedelay { yylval=NULL; ccap(); return K_CMDEXEDELAY; }
|
|
||||||
connection_type { yylval=NULL; ccap(); return K_CONNTYPE; }
|
connection_type { yylval=NULL; ccap(); return K_CONNTYPE; }
|
||||||
dedicated { yylval=new_token(K_DEDICATED); return K_DEDICATED; }
|
dedicated { yylval=new_token(K_DEDICATED); return K_DEDICATED; }
|
||||||
default_bitclock { yylval=NULL; return K_DEFAULT_BITCLOCK; }
|
default_bitclock { yylval=NULL; return K_DEFAULT_BITCLOCK; }
|
||||||
@@ -163,14 +161,11 @@ default_parallel { yylval=NULL; return K_DEFAULT_PARALLEL; }
|
|||||||
default_programmer { yylval=NULL; return K_DEFAULT_PROGRAMMER; }
|
default_programmer { yylval=NULL; return K_DEFAULT_PROGRAMMER; }
|
||||||
default_serial { yylval=NULL; return K_DEFAULT_SERIAL; }
|
default_serial { yylval=NULL; return K_DEFAULT_SERIAL; }
|
||||||
default_spi { yylval=NULL; return K_DEFAULT_SPI; }
|
default_spi { yylval=NULL; return K_DEFAULT_SPI; }
|
||||||
delay { yylval=NULL; ccap(); return K_DELAY; }
|
|
||||||
desc { yylval=NULL; ccap(); return K_DESC; }
|
|
||||||
devicecode { yylval=NULL; ccap(); return K_DEVICECODE; }
|
devicecode { yylval=NULL; ccap(); return K_DEVICECODE; }
|
||||||
eeprom { yylval=NULL; return K_EEPROM; }
|
eeprom { yylval=NULL; return K_EEPROM; }
|
||||||
eeprom_instr { yylval=NULL; ccap(); return K_EEPROM_INSTR; }
|
eeprom_instr { yylval=NULL; ccap(); return K_EEPROM_INSTR; }
|
||||||
enablepageprogramming { yylval=NULL; ccap(); return K_ENABLEPAGEPROGRAMMING; }
|
enablepageprogramming { yylval=NULL; ccap(); return K_ENABLEPAGEPROGRAMMING; }
|
||||||
errled { yylval=NULL; ccap(); return K_ERRLED; }
|
errled { yylval=NULL; ccap(); return K_ERRLED; }
|
||||||
family_id { yylval=NULL; ccap(); return K_FAMILY_ID; }
|
|
||||||
flash { yylval=NULL; return K_FLASH; }
|
flash { yylval=NULL; return K_FLASH; }
|
||||||
flash_instr { yylval=NULL; ccap(); return K_FLASH_INSTR; }
|
flash_instr { yylval=NULL; ccap(); return K_FLASH_INSTR; }
|
||||||
has_debugwire { yylval=NULL; ccap(); return K_HAS_DW; }
|
has_debugwire { yylval=NULL; ccap(); return K_HAS_DW; }
|
||||||
@@ -178,99 +173,49 @@ has_jtag { yylval=NULL; ccap(); return K_HAS_JTAG; }
|
|||||||
has_pdi { yylval=NULL; ccap(); return K_HAS_PDI; }
|
has_pdi { yylval=NULL; ccap(); return K_HAS_PDI; }
|
||||||
has_tpi { yylval=NULL; ccap(); return K_HAS_TPI; }
|
has_tpi { yylval=NULL; ccap(); return K_HAS_TPI; }
|
||||||
has_updi { yylval=NULL; ccap(); return K_HAS_UPDI; }
|
has_updi { yylval=NULL; ccap(); return K_HAS_UPDI; }
|
||||||
hventerstabdelay { yylval=NULL; ccap(); return K_HVENTERSTABDELAY; }
|
|
||||||
hvleavestabdelay { yylval=NULL; ccap(); return K_HVLEAVESTABDELAY; }
|
|
||||||
hvsp_controlstack { yylval=NULL; ccap(); return K_HVSP_CONTROLSTACK; }
|
hvsp_controlstack { yylval=NULL; ccap(); return K_HVSP_CONTROLSTACK; }
|
||||||
hvspcmdexedelay { yylval=NULL; ccap(); return K_HVSPCMDEXEDELAY; }
|
|
||||||
hvupdi_support { yylval=NULL; ccap(); return K_HVUPDI_SUPPORT; }
|
hvupdi_support { yylval=NULL; ccap(); return K_HVUPDI_SUPPORT; }
|
||||||
hvupdi_variant { yylval=NULL; ccap(); return K_HVUPDI_VARIANT; }
|
|
||||||
id { yylval=NULL; ccap(); return K_ID; }
|
id { yylval=NULL; ccap(); return K_ID; }
|
||||||
io { yylval=new_token(K_IO); return K_IO; }
|
io { yylval=new_token(K_IO); return K_IO; }
|
||||||
is_at90s1200 { yylval=NULL; ccap(); return K_IS_AT90S1200; }
|
is_at90s1200 { yylval=NULL; ccap(); return K_IS_AT90S1200; }
|
||||||
is_avr32 { yylval=NULL; ccap(); return K_IS_AVR32; }
|
is_avr32 { yylval=NULL; ccap(); return K_IS_AVR32; }
|
||||||
latchcycles { yylval=NULL; ccap(); return K_LATCHCYCLES; }
|
|
||||||
load_ext_addr { yylval=new_token(K_LOAD_EXT_ADDR); ccap(); return K_LOAD_EXT_ADDR; }
|
load_ext_addr { yylval=new_token(K_LOAD_EXT_ADDR); ccap(); return K_LOAD_EXT_ADDR; }
|
||||||
loadpage_hi { yylval=new_token(K_LOADPAGE_HI); ccap(); return K_LOADPAGE_HI; }
|
loadpage_hi { yylval=new_token(K_LOADPAGE_HI); ccap(); return K_LOADPAGE_HI; }
|
||||||
loadpage_lo { yylval=new_token(K_LOADPAGE_LO); ccap(); return K_LOADPAGE_LO; }
|
loadpage_lo { yylval=new_token(K_LOADPAGE_LO); ccap(); return K_LOADPAGE_LO; }
|
||||||
max_write_delay { yylval=NULL; ccap(); return K_MAX_WRITE_DELAY; }
|
|
||||||
mcu_base { yylval=NULL; ccap(); return K_MCU_BASE; }
|
|
||||||
memory { yylval=NULL; ccap(); current_strct = COMP_AVRMEM; return K_MEMORY; }
|
memory { yylval=NULL; ccap(); current_strct = COMP_AVRMEM; return K_MEMORY; }
|
||||||
min_write_delay { yylval=NULL; ccap(); return K_MIN_WRITE_DELAY; }
|
miso { yylval=NULL; ccap(); yywarning("miso is deprecated, will be removed in v8.0, use sdi"); return K_SDI; }
|
||||||
miso { yylval=NULL; ccap(); return K_SDI; } // Deprecated
|
mosi { yylval=NULL; ccap(); yywarning("mosi is deprecated, will be removed in v8.0, use sdo"); return K_SDO; }
|
||||||
mode { yylval=NULL; ccap(); return K_MODE; }
|
|
||||||
mosi { yylval=NULL; ccap(); return K_SDO; } // Deprecated
|
|
||||||
no { yylval=new_token(K_NO); return K_NO; }
|
|
||||||
NULL { yylval=NULL; return K_NULL; }
|
NULL { yylval=NULL; return K_NULL; }
|
||||||
num_banks { yylval=NULL; return K_NUM_PAGES; }
|
|
||||||
num_pages { yylval=NULL; ccap(); return K_NUM_PAGES; }
|
|
||||||
nvm_base { yylval=NULL; ccap(); return K_NVM_BASE; }
|
|
||||||
ocd_base { yylval=NULL; ccap(); return K_OCD_BASE; }
|
|
||||||
ocdrev { yylval=NULL; ccap(); return K_OCDREV; }
|
|
||||||
offset { yylval=NULL; ccap(); return K_OFFSET; }
|
|
||||||
paged { yylval=NULL; ccap(); return K_PAGED; }
|
|
||||||
pagel { yylval=NULL; ccap(); return K_PAGEL; }
|
|
||||||
page_size { yylval=NULL; ccap(); return K_PAGE_SIZE; }
|
page_size { yylval=NULL; ccap(); return K_PAGE_SIZE; }
|
||||||
parallel { yylval=NULL; ccap(); return K_PARALLEL; }
|
parallel { yylval=NULL; ccap(); return K_PARALLEL; }
|
||||||
parent { yylval=NULL; return K_PARENT; }
|
parent { yylval=NULL; return K_PARENT; }
|
||||||
part { yylval=NULL; ccap(); current_strct = COMP_AVRPART; return K_PART; }
|
part { yylval=NULL; ccap(); current_strct = COMP_AVRPART; return K_PART; }
|
||||||
pgm_enable { yylval=new_token(K_PGM_ENABLE); ccap(); return K_PGM_ENABLE; }
|
pgm_enable { yylval=new_token(K_PGM_ENABLE); ccap(); return K_PGM_ENABLE; }
|
||||||
pgmled { yylval=NULL; ccap(); return K_PGMLED; }
|
pgmled { yylval=NULL; ccap(); return K_PGMLED; }
|
||||||
pollindex { yylval=NULL; ccap(); return K_POLLINDEX; }
|
|
||||||
pollmethod { yylval=NULL; ccap(); return K_POLLMETHOD; }
|
|
||||||
pollvalue { yylval=NULL; ccap(); return K_POLLVALUE; }
|
|
||||||
postdelay { yylval=NULL; ccap(); return K_POSTDELAY; }
|
|
||||||
poweroffdelay { yylval=NULL; ccap(); return K_POWEROFFDELAY; }
|
|
||||||
pp_controlstack { yylval=NULL; ccap(); return K_PP_CONTROLSTACK; }
|
pp_controlstack { yylval=NULL; ccap(); return K_PP_CONTROLSTACK; }
|
||||||
predelay { yylval=NULL; ccap(); return K_PREDELAY; }
|
|
||||||
progmodedelay { yylval=NULL; ccap(); return K_PROGMODEDELAY; }
|
|
||||||
programfusepolltimeout { yylval=NULL; ccap(); return K_PROGRAMFUSEPOLLTIMEOUT; }
|
|
||||||
programfusepulsewidth { yylval=NULL; ccap(); return K_PROGRAMFUSEPULSEWIDTH; }
|
|
||||||
programlockpolltimeout { yylval=NULL; ccap(); return K_PROGRAMLOCKPOLLTIMEOUT; }
|
|
||||||
programlockpulsewidth { yylval=NULL; ccap(); return K_PROGRAMLOCKPULSEWIDTH; }
|
|
||||||
programmer { yylval=NULL; ccap(); current_strct = COMP_PROGRAMMER; return K_PROGRAMMER; }
|
programmer { yylval=NULL; ccap(); current_strct = COMP_PROGRAMMER; return K_PROGRAMMER; }
|
||||||
pseudo { yylval=new_token(K_PSEUDO); return K_PSEUDO; }
|
|
||||||
pwroff_after_write { yylval=NULL; ccap(); return K_PWROFF_AFTER_WRITE; }
|
|
||||||
rdyled { yylval=NULL; ccap(); return K_RDYLED; }
|
rdyled { yylval=NULL; ccap(); return K_RDYLED; }
|
||||||
read { yylval=new_token(K_READ); ccap(); return K_READ; }
|
read { yylval=new_token(K_READ); ccap(); return K_READ; }
|
||||||
read_hi { yylval=new_token(K_READ_HI); ccap(); return K_READ_HI; }
|
read_hi { yylval=new_token(K_READ_HI); ccap(); return K_READ_HI; }
|
||||||
read_lo { yylval=new_token(K_READ_LO); ccap(); return K_READ_LO; }
|
read_lo { yylval=new_token(K_READ_LO); ccap(); return K_READ_LO; }
|
||||||
readback { yylval=NULL; ccap(); return K_READBACK; }
|
readback { yylval=NULL; ccap(); return K_READBACK; }
|
||||||
readback_p1 { yylval=NULL; ccap(); return K_READBACK_P1; }
|
|
||||||
readback_p2 { yylval=NULL; ccap(); return K_READBACK_P2; }
|
|
||||||
readsize { yylval=NULL; ccap(); return K_READSIZE; }
|
|
||||||
reset { yylval=new_token(K_RESET); ccap(); return K_RESET; }
|
reset { yylval=new_token(K_RESET); ccap(); return K_RESET; }
|
||||||
resetdelay { yylval=NULL; ccap(); return K_RESETDELAY; }
|
|
||||||
resetdelayms { yylval=NULL; ccap(); return K_RESETDELAYMS; }
|
|
||||||
resetdelayus { yylval=NULL; ccap(); return K_RESETDELAYUS; }
|
|
||||||
retry_pulse { yylval=NULL; ccap(); return K_RETRY_PULSE; }
|
retry_pulse { yylval=NULL; ccap(); return K_RETRY_PULSE; }
|
||||||
sck { yylval=new_token(K_SCK); ccap(); return K_SCK; }
|
sck { yylval=new_token(K_SCK); ccap(); return K_SCK; }
|
||||||
sdi { yylval=NULL; ccap(); return K_SDI; }
|
sdi { yylval=NULL; ccap(); return K_SDI; }
|
||||||
sdo { yylval=NULL; ccap(); return K_SDO; }
|
sdo { yylval=NULL; ccap(); return K_SDO; }
|
||||||
serial { yylval=NULL; ccap(); return K_SERIAL; }
|
serial { yylval=NULL; ccap(); return K_SERIAL; }
|
||||||
signature { yylval=NULL; ccap(); return K_SIGNATURE; }
|
signature { yylval=NULL; ccap(); return K_SIGNATURE; }
|
||||||
size { yylval=NULL; ccap(); return K_SIZE; }
|
|
||||||
spi { yylval=NULL; return K_SPI; }
|
spi { yylval=NULL; return K_SPI; }
|
||||||
stabdelay { yylval=NULL; ccap(); return K_STABDELAY; }
|
|
||||||
stk500_devcode { yylval=NULL; ccap(); return K_STK500_DEVCODE; }
|
|
||||||
synchcycles { yylval=NULL; ccap(); return K_SYNCHCYCLES; }
|
|
||||||
synchloops { yylval=NULL; ccap(); return K_SYNCHLOOPS; }
|
|
||||||
timeout { yylval=NULL; ccap(); return K_TIMEOUT; }
|
|
||||||
togglevtg { yylval=NULL; ccap(); return K_TOGGLEVTG; }
|
|
||||||
type { yylval=NULL; ccap(); return K_TYPE; }
|
type { yylval=NULL; ccap(); return K_TYPE; }
|
||||||
usb { yylval=NULL; return K_USB; }
|
usb { yylval=NULL; return K_USB; }
|
||||||
usbdev { yylval=NULL; ccap(); return K_USBDEV; }
|
|
||||||
usbpid { yylval=NULL; ccap(); return K_USBPID; }
|
usbpid { yylval=NULL; ccap(); return K_USBPID; }
|
||||||
usbproduct { yylval=NULL; ccap(); return K_USBPRODUCT; }
|
|
||||||
usbsn { yylval=NULL; ccap(); return K_USBSN; }
|
|
||||||
usbvendor { yylval=NULL; ccap(); return K_USBVENDOR; }
|
|
||||||
usbvid { yylval=NULL; ccap(); return K_USBVID; }
|
|
||||||
vcc { yylval=NULL; ccap(); return K_VCC; }
|
vcc { yylval=NULL; ccap(); return K_VCC; }
|
||||||
vfyled { yylval=NULL; ccap(); return K_VFYLED; }
|
vfyled { yylval=NULL; ccap(); return K_VFYLED; }
|
||||||
write { yylval=new_token(K_WRITE); ccap(); return K_WRITE; }
|
write { yylval=new_token(K_WRITE); ccap(); return K_WRITE; }
|
||||||
write_hi { yylval=new_token(K_WRITE_HI); ccap(); return K_WRITE_HI; }
|
write_hi { yylval=new_token(K_WRITE_HI); ccap(); return K_WRITE_HI; }
|
||||||
write_lo { yylval=new_token(K_WRITE_LO); ccap(); return K_WRITE_LO; }
|
write_lo { yylval=new_token(K_WRITE_LO); ccap(); return K_WRITE_LO; }
|
||||||
writepage { yylval=new_token(K_WRITEPAGE); ccap(); return K_WRITEPAGE; }
|
writepage { yylval=new_token(K_WRITEPAGE); ccap(); return K_WRITEPAGE; }
|
||||||
yes { yylval=new_token(K_YES); return K_YES; }
|
|
||||||
|
|
||||||
"," { yylval = NULL; pyytext(); return TKN_COMMA; }
|
"," { yylval = NULL; pyytext(); return TKN_COMMA; }
|
||||||
"=" { yylval = NULL; pyytext(); return TKN_EQUAL; }
|
"=" { yylval = NULL; pyytext(); return TKN_EQUAL; }
|
||||||
|
|||||||
+8
-8
@@ -795,7 +795,7 @@ lget ( LISTID lid )
|
|||||||
void *
|
void *
|
||||||
lget_n ( LISTID lid, unsigned int n )
|
lget_n ( LISTID lid, unsigned int n )
|
||||||
{
|
{
|
||||||
int i;
|
unsigned int i;
|
||||||
LIST * l;
|
LIST * l;
|
||||||
LISTNODE * ln;
|
LISTNODE * ln;
|
||||||
|
|
||||||
@@ -803,7 +803,7 @@ lget_n ( LISTID lid, unsigned int n )
|
|||||||
|
|
||||||
CKLMAGIC(l);
|
CKLMAGIC(l);
|
||||||
|
|
||||||
if ((n<1)||(n>lsize(l))) {
|
if (n < 1 || n > (unsigned int) lsize(l)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -836,7 +836,7 @@ lget_n ( LISTID lid, unsigned int n )
|
|||||||
LNODEID
|
LNODEID
|
||||||
lget_ln ( LISTID lid, unsigned int n )
|
lget_ln ( LISTID lid, unsigned int n )
|
||||||
{
|
{
|
||||||
int i;
|
unsigned int i;
|
||||||
LIST * l;
|
LIST * l;
|
||||||
LISTNODE * ln;
|
LISTNODE * ln;
|
||||||
|
|
||||||
@@ -844,7 +844,7 @@ lget_ln ( LISTID lid, unsigned int n )
|
|||||||
|
|
||||||
CKLMAGIC(l);
|
CKLMAGIC(l);
|
||||||
|
|
||||||
if ((n<1)||(n>lsize(l))) {
|
if (n < 1 || n > (unsigned int) lsize(l)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -944,7 +944,7 @@ insert_ln ( LIST * l, LISTNODE * ln, void * data_ptr )
|
|||||||
int
|
int
|
||||||
lins_n ( LISTID lid, void * data_ptr, unsigned int n )
|
lins_n ( LISTID lid, void * data_ptr, unsigned int n )
|
||||||
{
|
{
|
||||||
int i;
|
unsigned int i;
|
||||||
LIST * l;
|
LIST * l;
|
||||||
LISTNODE * ln;
|
LISTNODE * ln;
|
||||||
|
|
||||||
@@ -952,7 +952,7 @@ lins_n ( LISTID lid, void * data_ptr, unsigned int n )
|
|||||||
|
|
||||||
CKLMAGIC(l);
|
CKLMAGIC(l);
|
||||||
|
|
||||||
if ((n<1)||(n>(l->num+1))) {
|
if (n < 1 || n > (unsigned int) (l->num+1)) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1185,7 +1185,7 @@ lrmv_ln ( LISTID lid, LNODEID lnid )
|
|||||||
void *
|
void *
|
||||||
lrmv_n ( LISTID lid, unsigned int n )
|
lrmv_n ( LISTID lid, unsigned int n )
|
||||||
{
|
{
|
||||||
int i;
|
unsigned int i;
|
||||||
LIST * l;
|
LIST * l;
|
||||||
LISTNODE * ln;
|
LISTNODE * ln;
|
||||||
|
|
||||||
@@ -1193,7 +1193,7 @@ lrmv_n ( LISTID lid, unsigned int n )
|
|||||||
|
|
||||||
CKLMAGIC(l);
|
CKLMAGIC(l);
|
||||||
|
|
||||||
if ((n<1)||(n>l->num)) {
|
if (n < 1 || n > (unsigned int) l->num) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -191,7 +191,7 @@ static int micronucleus_get_bootloader_info_v1(pdata_t* pdata)
|
|||||||
pmsg_warning("unable to get bootloader info block: %s\n", usb_strerror());
|
pmsg_warning("unable to get bootloader info block: %s\n", usb_strerror());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
else if (result < sizeof(buffer))
|
else if ((size_t) result < sizeof(buffer))
|
||||||
{
|
{
|
||||||
pmsg_warning("received invalid bootloader info block size: %d\n", result);
|
pmsg_warning("received invalid bootloader info block size: %d\n", result);
|
||||||
return -1;
|
return -1;
|
||||||
@@ -258,7 +258,7 @@ static int micronucleus_get_bootloader_info_v2(pdata_t* pdata)
|
|||||||
pmsg_warning("unable to get bootloader info block: %s\n", usb_strerror());
|
pmsg_warning("unable to get bootloader info block: %s\n", usb_strerror());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
else if (result < sizeof(buffer))
|
else if ((size_t) result < sizeof(buffer))
|
||||||
{
|
{
|
||||||
pmsg_warning("received invalid bootloader info block size: %d\n", result);
|
pmsg_warning("received invalid bootloader info block size: %d\n", result);
|
||||||
return -1;
|
return -1;
|
||||||
@@ -449,7 +449,7 @@ static int micronucleus_write_page_v2(pdata_t* pdata, uint32_t address, uint8_t*
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < size; i += 4)
|
for (uint32_t i = 0; i < size; i += 4)
|
||||||
{
|
{
|
||||||
int w1 = (buffer[i + 1] << 8) | (buffer[i + 0] << 0);
|
int w1 = (buffer[i + 1] << 8) | (buffer[i + 0] << 0);
|
||||||
int w2 = (buffer[i + 3] << 8) | (buffer[i + 2] << 0);
|
int w2 = (buffer[i + 3] << 8) | (buffer[i + 2] << 0);
|
||||||
@@ -491,7 +491,7 @@ static int micronucleus_write_page(pdata_t* pdata, uint32_t address, uint8_t* bu
|
|||||||
// Require software start.
|
// Require software start.
|
||||||
pdata->start_program = true;
|
pdata->start_program = true;
|
||||||
}
|
}
|
||||||
else if (address >= pdata->bootloader_start - pdata->page_size)
|
else if (address >= (uint32_t) (pdata->bootloader_start - pdata->page_size))
|
||||||
{
|
{
|
||||||
if (pdata->major_version >= 2)
|
if (pdata->major_version >= 2)
|
||||||
{
|
{
|
||||||
|
|||||||
+13
-45
@@ -111,29 +111,17 @@ const PROGRAMMER_TYPE programmers_types[] = { // Name(s) the programmers call th
|
|||||||
{"xbee", xbee_initpgm, xbee_desc}, // "XBee"
|
{"xbee", xbee_initpgm, xbee_desc}, // "XBee"
|
||||||
};
|
};
|
||||||
|
|
||||||
const PROGRAMMER_TYPE * locate_programmer_type(const char * id)
|
const PROGRAMMER_TYPE *locate_programmer_type(const char *id) {
|
||||||
{
|
for(size_t i = 0; i < sizeof programmers_types/sizeof*programmers_types; i++)
|
||||||
const PROGRAMMER_TYPE * p = NULL;
|
if(strcasecmp(id, programmers_types[i].id) == 0)
|
||||||
int i;
|
return programmers_types + i;
|
||||||
int found;
|
|
||||||
|
|
||||||
found = 0;
|
|
||||||
|
|
||||||
for (i = 0; i < sizeof(programmers_types)/sizeof(programmers_types[0]) && !found; i++) {
|
|
||||||
p = &(programmers_types[i]);
|
|
||||||
if (strcasecmp(id, p->id) == 0)
|
|
||||||
found = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (found)
|
|
||||||
return p;
|
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return type id given the init function or "" if not found
|
// Return type id given the init function or "" if not found
|
||||||
const char *locate_programmer_type_id(void (*initpgm)(PROGRAMMER *pgm)) {
|
const char *locate_programmer_type_id(void (*initpgm)(PROGRAMMER *pgm)) {
|
||||||
for (int i=0; i < sizeof programmers_types/sizeof*programmers_types; i++)
|
for(size_t i=0; i < sizeof programmers_types/sizeof*programmers_types; i++)
|
||||||
if(programmers_types[i].initpgm == initpgm)
|
if(programmers_types[i].initpgm == initpgm)
|
||||||
return programmers_types[i].id;
|
return programmers_types[i].id;
|
||||||
|
|
||||||
@@ -142,35 +130,15 @@ const char *locate_programmer_type_id(void (*initpgm)(PROGRAMMER *pgm)) {
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Iterate over the list of programmers given as "programmers", and
|
* Iterate over the list of programmer types given in the table above and
|
||||||
* call the callback function cb for each entry found. cb is being
|
* call the callback function cb for each entry found. cb is being
|
||||||
* passed the following arguments:
|
* passed the following arguments:
|
||||||
* . the name of the programmer (for -c)
|
* - Name of the programmer
|
||||||
* . the descriptive text given in the config file
|
* - Descriptive text
|
||||||
* . the name of the config file this programmer has been defined in
|
* - "Cookie" passed into walk_programmer_types() for opaque client data
|
||||||
* . the line number of the config file this programmer has been defined at
|
|
||||||
* . the "cookie" passed into walk_programmers() (opaque client data)
|
|
||||||
*/
|
*/
|
||||||
/*
|
|
||||||
void walk_programmer_types(LISTID programmer_types, walk_programmer_types_cb cb, void *cookie)
|
|
||||||
{
|
|
||||||
LNODEID ln1;
|
|
||||||
PROGRAMMER * p;
|
|
||||||
|
|
||||||
for (ln1 = lfirst(programmers); ln1; ln1 = lnext(ln1)) {
|
void walk_programmer_types(walk_programmer_types_cb cb, void *cookie) {
|
||||||
p = ldata(ln1);
|
for (size_t i = 0; i < sizeof(programmers_types)/sizeof(programmers_types[0]); i++)
|
||||||
cb(p->id, p->desc, cookie);
|
cb(programmers_types[i].id, programmers_types[i].desc, cookie);
|
||||||
}
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
void walk_programmer_types(walk_programmer_types_cb cb, void *cookie)
|
|
||||||
{
|
|
||||||
const PROGRAMMER_TYPE * p;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < sizeof(programmers_types)/sizeof(programmers_types[0]); i++) {
|
|
||||||
p = &(programmers_types[i]);
|
|
||||||
cb(p->id, p->desc, cookie);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+3
-3
@@ -199,7 +199,7 @@ static int pickit2_open(PROGRAMMER *pgm, const char *port) {
|
|||||||
strcpy(cbuf, pgm->desc);
|
strcpy(cbuf, pgm->desc);
|
||||||
|
|
||||||
// Convert from wide chars and overlay over initial part of desc
|
// Convert from wide chars and overlay over initial part of desc
|
||||||
for (int i = 0; i < sizeof wbuf/sizeof*wbuf && wbuf[i]; i++)
|
for(size_t i = 0; i < sizeof wbuf/sizeof*wbuf && wbuf[i]; i++)
|
||||||
cbuf[i] = (char) wbuf[i]; // TODO what about little/big endian???
|
cbuf[i] = (char) wbuf[i]; // TODO what about little/big endian???
|
||||||
pgm->desc = cache_string(cbuf);
|
pgm->desc = cache_string(cbuf);
|
||||||
}
|
}
|
||||||
@@ -1058,7 +1058,7 @@ static int usb_read_interrupt(const PROGRAMMER *pgm, void *buff, int size, int t
|
|||||||
|
|
||||||
GetOverlappedResult(PDATA(pgm)->usb_handle, &ovr, &bytesRead, 0);
|
GetOverlappedResult(PDATA(pgm)->usb_handle, &ovr, &bytesRead, 0);
|
||||||
|
|
||||||
return bytesRead > 0 ? bytesRead : -1;
|
return bytesRead > 0? (int) bytesRead: -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// simple write with timeout
|
// simple write with timeout
|
||||||
@@ -1083,7 +1083,7 @@ static int usb_write_interrupt(const PROGRAMMER *pgm, const void *buff, int size
|
|||||||
|
|
||||||
GetOverlappedResult(PDATA(pgm)->usb_handle, &ovr, &bytesWritten, 0);
|
GetOverlappedResult(PDATA(pgm)->usb_handle, &ovr, &bytesWritten, 0);
|
||||||
|
|
||||||
return bytesWritten > 0 ? bytesWritten : -1;
|
return bytesWritten > 0? (int) bytesWritten: -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pickit2_write_report(const PROGRAMMER *pgm, const unsigned char report[65]) {
|
static int pickit2_write_report(const PROGRAMMER *pgm, const unsigned char report[65]) {
|
||||||
|
|||||||
+2
-5
@@ -84,9 +84,7 @@ static int pin_fill_old_pinno(const struct pindef_t * const pindef, unsigned int
|
|||||||
* @param[out] pinno old pin definition integer
|
* @param[out] pinno old pin definition integer
|
||||||
*/
|
*/
|
||||||
static int pin_fill_old_pinlist(const struct pindef_t * const pindef, unsigned int * const pinno) {
|
static int pin_fill_old_pinlist(const struct pindef_t * const pindef, unsigned int * const pinno) {
|
||||||
int i;
|
for(size_t i = 0; i < PIN_FIELD_SIZE; i++) {
|
||||||
|
|
||||||
for(i = 0; i < PIN_FIELD_SIZE; i++) {
|
|
||||||
if(i == 0) {
|
if(i == 0) {
|
||||||
if((pindef->mask[i] & ~PIN_MASK) != 0) {
|
if((pindef->mask[i] & ~PIN_MASK) != 0) {
|
||||||
pmsg_error("pins of higher index than max field size for old pinno found\n");
|
pmsg_error("pins of higher index than max field size for old pinno found\n");
|
||||||
@@ -229,7 +227,6 @@ int pins_check(const PROGRAMMER *const pgm, const struct pin_checklist_t *const
|
|||||||
bool invalid = false;
|
bool invalid = false;
|
||||||
bool inverse = false;
|
bool inverse = false;
|
||||||
int index;
|
int index;
|
||||||
int segment;
|
|
||||||
bool mandatory_used = false;
|
bool mandatory_used = false;
|
||||||
pinmask_t invalid_used[PIN_FIELD_SIZE] = {0};
|
pinmask_t invalid_used[PIN_FIELD_SIZE] = {0};
|
||||||
pinmask_t inverse_used[PIN_FIELD_SIZE] = {0};
|
pinmask_t inverse_used[PIN_FIELD_SIZE] = {0};
|
||||||
@@ -246,7 +243,7 @@ int pins_check(const PROGRAMMER *const pgm, const struct pin_checklist_t *const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(segment = 0; segment < PIN_FIELD_SIZE; segment++) {
|
for(size_t segment = 0; segment < PIN_FIELD_SIZE; segment++) {
|
||||||
// check if for mandatory any pin is defined
|
// check if for mandatory any pin is defined
|
||||||
invalid_used[segment] = pgm->pin[pinname].mask[segment] & ~valid_pins->mask[segment];
|
invalid_used[segment] = pgm->pin[pinname].mask[segment] & ~valid_pins->mask[segment];
|
||||||
if(is_mandatory && (0 != (pgm->pin[pinname].mask[segment] & valid_pins->mask[segment]))) {
|
if(is_mandatory && (0 != (pgm->pin[pinname].mask[segment] & valid_pins->mask[segment]))) {
|
||||||
|
|||||||
+9
-5
@@ -55,7 +55,7 @@
|
|||||||
#define USB_VENDOR_ID 0x16c0
|
#define USB_VENDOR_ID 0x16c0
|
||||||
#define USB_PRODUCT_ID 0x05df
|
#define USB_PRODUCT_ID 0x05df
|
||||||
|
|
||||||
static int reportDataSizes[4] = {13, 29, 61, 125};
|
static const int reportDataSizes[4] = {13, 29, 61, 125};
|
||||||
|
|
||||||
static unsigned char avrdoperRxBuffer[280]; /* buffer for receive data */
|
static unsigned char avrdoperRxBuffer[280]; /* buffer for receive data */
|
||||||
static int avrdoperRxLength = 0; /* amount of valid bytes in rx buffer */
|
static int avrdoperRxLength = 0; /* amount of valid bytes in rx buffer */
|
||||||
@@ -232,7 +232,7 @@ static void avrdoper_close(union filedescriptor *fdp)
|
|||||||
|
|
||||||
static int chooseDataSize(int len)
|
static int chooseDataSize(int len)
|
||||||
{
|
{
|
||||||
int i;
|
size_t i;
|
||||||
|
|
||||||
for(i = 0; i < sizeof(reportDataSizes)/sizeof(reportDataSizes[0]); i++){
|
for(i = 0; i < sizeof(reportDataSizes)/sizeof(reportDataSizes[0]); i++){
|
||||||
if(reportDataSizes[i] >= len)
|
if(reportDataSizes[i] >= len)
|
||||||
@@ -243,13 +243,17 @@ static int chooseDataSize(int len)
|
|||||||
|
|
||||||
static int avrdoper_send(const union filedescriptor *fdp, const unsigned char *buf, size_t buflen)
|
static int avrdoper_send(const union filedescriptor *fdp, const unsigned char *buf, size_t buflen)
|
||||||
{
|
{
|
||||||
|
if(buflen > INT_MAX) {
|
||||||
|
pmsg_error("%s() called with too large buflen = %lu\n", __func__, (unsigned long) buflen);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if(verbose > 3)
|
if(verbose > 3)
|
||||||
dumpBlock("Send", buf, buflen);
|
dumpBlock("Send", buf, buflen);
|
||||||
while(buflen > 0){
|
while(buflen > 0){
|
||||||
unsigned char buffer[256];
|
unsigned char buffer[256];
|
||||||
int rval, lenIndex = chooseDataSize(buflen);
|
int rval, lenIndex = chooseDataSize(buflen);
|
||||||
int thisLen = buflen > reportDataSizes[lenIndex] ?
|
int thisLen = (int) buflen > reportDataSizes[lenIndex]?
|
||||||
reportDataSizes[lenIndex] : buflen;
|
reportDataSizes[lenIndex]: (int) buflen;
|
||||||
buffer[0] = lenIndex + 1; /* report ID */
|
buffer[0] = lenIndex + 1; /* report ID */
|
||||||
buffer[1] = thisLen;
|
buffer[1] = thisLen;
|
||||||
memcpy(buffer + 2, buf, thisLen);
|
memcpy(buffer + 2, buf, thisLen);
|
||||||
@@ -290,7 +294,7 @@ static int avrdoperFillBuffer(const union filedescriptor *fdp) {
|
|||||||
bytesPending = buffer[1] - len; /* amount still buffered */
|
bytesPending = buffer[1] - len; /* amount still buffered */
|
||||||
if(len > buffer[1]) /* cut away padding */
|
if(len > buffer[1]) /* cut away padding */
|
||||||
len = buffer[1];
|
len = buffer[1];
|
||||||
if(avrdoperRxLength + len > sizeof(avrdoperRxBuffer)){
|
if(avrdoperRxLength + len > (int) sizeof(avrdoperRxBuffer)){
|
||||||
pmsg_error("buffer overflow\n");
|
pmsg_error("buffer overflow\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-4
@@ -705,11 +705,17 @@ static int serialupdi_paged_load(const PROGRAMMER *pgm, const AVRPART *p, const
|
|||||||
unsigned int page_size,
|
unsigned int page_size,
|
||||||
unsigned int addr, unsigned int n_bytes)
|
unsigned int addr, unsigned int n_bytes)
|
||||||
{
|
{
|
||||||
if (n_bytes > m->readsize) {
|
if(n_bytes > 65535) {
|
||||||
|
pmsg_error("%s() called with implausibly high n_bytes = %u\n", __func__, n_bytes);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((int) n_bytes > m->readsize) {
|
||||||
unsigned int read_offset = addr;
|
unsigned int read_offset = addr;
|
||||||
unsigned int remaining_bytes = n_bytes;
|
int remaining_bytes = n_bytes;
|
||||||
int read_bytes = 0;
|
int read_bytes = 0;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
while (remaining_bytes > 0) {
|
while (remaining_bytes > 0) {
|
||||||
rc = updi_read_data(pgm, m->offset + read_offset, m->buf + read_offset,
|
rc = updi_read_data(pgm, m->offset + read_offset, m->buf + read_offset,
|
||||||
remaining_bytes > m->readsize ? m->readsize : remaining_bytes);
|
remaining_bytes > m->readsize ? m->readsize : remaining_bytes);
|
||||||
@@ -733,10 +739,16 @@ static int serialupdi_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const
|
|||||||
unsigned int addr, unsigned int n_bytes)
|
unsigned int addr, unsigned int n_bytes)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
if (n_bytes > m->page_size) {
|
|
||||||
|
if(n_bytes > 65535) {
|
||||||
|
pmsg_error("%s() called with implausibly high n_bytes = %u\n", __func__, n_bytes);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if ((int) n_bytes > m->page_size) {
|
||||||
unsigned int write_offset = addr;
|
unsigned int write_offset = addr;
|
||||||
unsigned int remaining_bytes = n_bytes;
|
int remaining_bytes = n_bytes;
|
||||||
int write_bytes = 0;
|
int write_bytes = 0;
|
||||||
|
|
||||||
while (remaining_bytes > 0) {
|
while (remaining_bytes > 0) {
|
||||||
|
|
||||||
if (strcmp(m->desc, "eeprom")==0) {
|
if (strcmp(m->desc, "eeprom")==0) {
|
||||||
|
|||||||
+5
-1
@@ -2279,7 +2279,11 @@ static int stk500v2_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const A
|
|||||||
|
|
||||||
memcpy(buf+10,m->buf+addr, block_size);
|
memcpy(buf+10,m->buf+addr, block_size);
|
||||||
|
|
||||||
result = stk500v2_command(pgm,buf,block_size+10, sizeof(buf));
|
// Do not send request to write empty flash pages except for bootloaders (fixes Issue #425)
|
||||||
|
unsigned char *p = m->buf+addr;
|
||||||
|
result = (pgm->prog_modes & PM_SPM) || !addrshift || *p != 0xff || memcmp(p, p+1, block_size-1)?
|
||||||
|
stk500v2_command(pgm, buf, block_size+10, sizeof buf): 0;
|
||||||
|
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
pmsg_error("write command failed\n");
|
pmsg_error("write command failed\n");
|
||||||
return -1;
|
return -1;
|
||||||
|
|||||||
+2
-1
@@ -560,8 +560,9 @@ int do_op(const PROGRAMMER *pgm, const AVRPART *p, UPDATE *upd, enum updateflags
|
|||||||
pmsg_info("%d byte%s of %s%s written\n", fs.nbytes,
|
pmsg_info("%d byte%s of %s%s written\n", fs.nbytes,
|
||||||
update_plural(fs.nbytes), mem->desc, alias_mem_desc);
|
update_plural(fs.nbytes), mem->desc, alias_mem_desc);
|
||||||
|
|
||||||
if (!(flags & UF_VERIFY)) // Fall through for auto verify unless -V was specified
|
if (!(flags & UF_VERIFY)) // Fall through for auto verify unless
|
||||||
break;
|
break;
|
||||||
|
// Fall through
|
||||||
|
|
||||||
case DEVICE_VERIFY:
|
case DEVICE_VERIFY:
|
||||||
// Verify that the in memory file is the same as what is on the chip
|
// Verify that the in memory file is the same as what is on the chip
|
||||||
|
|||||||
+4
-1
@@ -272,7 +272,9 @@ static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_
|
|||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
rv = i = hid_read_timeout(udev, buf, nbytes, 10000);
|
rv = i = hid_read_timeout(udev, buf, nbytes, 10000);
|
||||||
if (i != nbytes)
|
if (i < 0)
|
||||||
|
pmsg_error("hid_read_timeout(usb, %lu, 10000) failed\n", (unsigned long) nbytes);
|
||||||
|
else if ((size_t) i != nbytes)
|
||||||
pmsg_error("short read, read only %d out of %lu bytes\n", i, (unsigned long) nbytes);
|
pmsg_error("short read, read only %d out of %lu bytes\n", i, (unsigned long) nbytes);
|
||||||
|
|
||||||
if (verbose > 4) {
|
if (verbose > 4) {
|
||||||
@@ -291,6 +293,7 @@ static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_
|
|||||||
}
|
}
|
||||||
msg_trace2("\n");
|
msg_trace2("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -932,7 +932,7 @@ static int usbasp_spi_set_sck_period(const PROGRAMMER *pgm, double sckperiod) {
|
|||||||
pmsg_notice2("try to set SCK period to %g s (= %i Hz)\n", sckperiod, sckfreq);
|
pmsg_notice2("try to set SCK period to %g s (= %i Hz)\n", sckperiod, sckfreq);
|
||||||
|
|
||||||
/* Check if programmer is capable of 3 MHz SCK, if not then ommit 3 MHz setting */
|
/* Check if programmer is capable of 3 MHz SCK, if not then ommit 3 MHz setting */
|
||||||
int i;
|
size_t i;
|
||||||
if (PDATA(pgm)->sck_3mhz) {
|
if (PDATA(pgm)->sck_3mhz) {
|
||||||
pmsg_notice2("connected USBasp is capable of 3 MHz SCK\n");
|
pmsg_notice2("connected USBasp is capable of 3 MHz SCK\n");
|
||||||
i = 0;
|
i = 0;
|
||||||
@@ -1122,7 +1122,7 @@ static int usbasp_tpi_paged_load(const PROGRAMMER *pgm, const AVRPART *p, const
|
|||||||
pr = addr + m->offset;
|
pr = addr + m->offset;
|
||||||
readed = 0;
|
readed = 0;
|
||||||
|
|
||||||
while(readed < n_bytes)
|
while(readed < (int) n_bytes)
|
||||||
{
|
{
|
||||||
clen = n_bytes - readed;
|
clen = n_bytes - readed;
|
||||||
if(clen > 32)
|
if(clen > 32)
|
||||||
@@ -1187,7 +1187,7 @@ static int usbasp_tpi_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const
|
|||||||
usbasp_tpi_send_byte(pgm, TPI_OP_SSTPR(1));
|
usbasp_tpi_send_byte(pgm, TPI_OP_SSTPR(1));
|
||||||
usbasp_tpi_send_byte(pgm, (pr >> 8) );
|
usbasp_tpi_send_byte(pgm, (pr >> 8) );
|
||||||
|
|
||||||
while(writed < n_bytes)
|
while(writed < (int) n_bytes)
|
||||||
{
|
{
|
||||||
clen = n_bytes - writed;
|
clen = n_bytes - writed;
|
||||||
if(clen > 32)
|
if(clen > 32)
|
||||||
|
|||||||
+2
-3
@@ -735,7 +735,7 @@ static int usbtiny_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const AV
|
|||||||
}
|
}
|
||||||
|
|
||||||
// we can only write a page at a time anyways
|
// we can only write a page at a time anyways
|
||||||
if (m->paged && chunk > page_size)
|
if (m->paged && chunk > (int) page_size)
|
||||||
chunk = page_size;
|
chunk = page_size;
|
||||||
|
|
||||||
if (usb_out(pgm,
|
if (usb_out(pgm,
|
||||||
@@ -752,8 +752,7 @@ static int usbtiny_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const AV
|
|||||||
}
|
}
|
||||||
|
|
||||||
next = addr + chunk; // Calculate what address we're at now
|
next = addr + chunk; // Calculate what address we're at now
|
||||||
if (m->paged
|
if (m->paged && (next % page_size == 0 || next == (int) maxaddr) ) {
|
||||||
&& ((next % page_size) == 0 || next == maxaddr) ) {
|
|
||||||
// If we're at a page boundary, send the SPI command to flush it.
|
// If we're at a page boundary, send the SPI command to flush it.
|
||||||
avr_write_page(pgm, p, m, (unsigned long) addr);
|
avr_write_page(pgm, p, m, (unsigned long) addr);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user