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

Merge pull request #943 from stefanrueger/issue942 

Fix Issue #942: Treat x bits in .conf SPI commands as 0
This commit is contained in:
Stefan Rueger 2022-06-28 22:50:53 +01:00 committed by GitHub
parent a6ea797c1c 43c6b04226
commit 66c69a7584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -31,6 +31,7 @@ Changes since version 7.0:
- adding support for all Linux baud rates v.2 #993 - adding support for all Linux baud rates v.2 #993
- Replace internal knowledge in jtag3.c by a public API #996 - Replace internal knowledge in jtag3.c by a public API #996
- JTAG3 UPDI EEPROM fix #1013 - JTAG3 UPDI EEPROM fix #1013
- Treat x bits in .conf SPI commands as 0 #943
* Internals: * Internals:

4
src/avrpart.c
View File

@ -82,11 +82,11 @@ int avr_set_bits(OPCODE * op, unsigned char * cmd)
unsigned char mask; unsigned char mask;
for (i=0; i<32; i++) { for (i=0; i<32; i++) {
if (op->bit[i].type == AVR_CMDBIT_VALUE) { if (op->bit[i].type == AVR_CMDBIT_VALUE || op->bit[i].type == AVR_CMDBIT_IGNORE) {
j = 3 - i / 8; j = 3 - i / 8;
bit = i % 8; bit = i % 8;
mask = 1 << bit; mask = 1 << bit;
if (op->bit[i].value) if (op->bit[i].value && op->bit[i].type == AVR_CMDBIT_VALUE)
cmd[j] = cmd[j] | mask; cmd[j] = cmd[j] | mask;
else else
cmd[j] = cmd[j] & ~mask; cmd[j] = cmd[j] & ~mask;