From 3129ba277b0121de2a228e512e06997af3944e97 Mon Sep 17 00:00:00 2001 From: Stefan Rueger Date: Fri, 12 Apr 2024 23:22:17 +0100 Subject: [PATCH 1/3] Update avrintel based on current atdf --- src/avrintel.c | 15 ++++++++------- src/libavrdude-avrintel.h | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/avrintel.c b/src/avrintel.c index 3c67cf630..7c79f793c 100644 --- a/src/avrintel.c +++ b/src/avrintel.c @@ -9,11 +9,11 @@ * Meta-author Stefan Rueger * * v 1.3 - * 14.02.2024 + * 12.04.2024 * */ -#include +#include "ac_cfg.h" #include #include @@ -2151,7 +2151,7 @@ const uPcore_t uP_table[] = { // Value of -1 typically means unknown {"AVR16EB20", 381, F_AVR8X, {0x1E, 0x94, 0x40}, // ID /*AVR16EB20*/ 0, 0x04000, 0x040, 1, 0, 0x01400, 0x0200, 8, 0x7800, 0x0800, // Mem /*AVR16EB20*/ 16, 4, 31, vtab_avr16eb32, 18, cfgtab_avr16eb14, // ISRs, Config - /*AVR16EB20*/ 392, rgftab_avr16eb20}, // Register file + /*AVR16EB20*/ 393, rgftab_avr16eb20}, // Register file //AVR16DD28 atdf, avrdude // Sources {"AVR16DD28", 331, F_AVR8X, {0x1E, 0x94, 0x32}, // ID @@ -2169,7 +2169,7 @@ const uPcore_t uP_table[] = { // Value of -1 typically means unknown {"AVR16EB28", 382, F_AVR8X, {0x1E, 0x94, 0x3F}, // ID /*AVR16EB28*/ 0, 0x04000, 0x040, 1, 0, 0x01400, 0x0200, 8, 0x7800, 0x0800, // Mem /*AVR16EB28*/ 16, 4, 31, vtab_avr16eb32, 18, cfgtab_avr16eb14, // ISRs, Config - /*AVR16EB28*/ 392, rgftab_avr16eb20}, // Register file + /*AVR16EB28*/ 393, rgftab_avr16eb20}, // Register file //AVR16DD32 atdf, avrdude // Sources {"AVR16DD32", 333, F_AVR8X, {0x1E, 0x94, 0x31}, // ID @@ -2187,7 +2187,7 @@ const uPcore_t uP_table[] = { // Value of -1 typically means unknown {"AVR16EB32", 383, F_AVR8X, {0x1E, 0x94, 0x3E}, // ID /*AVR16EB32*/ 0, 0x04000, 0x040, 1, 0, 0x01400, 0x0200, 8, 0x7800, 0x0800, // Mem /*AVR16EB32*/ 16, 4, 31, vtab_avr16eb32, 18, cfgtab_avr16eb14, // ISRs, Config - /*AVR16EB32*/ 392, rgftab_avr16eb20}, // Register file + /*AVR16EB32*/ 393, rgftab_avr16eb20}, // Register file //AVR16EA48 atdf, avrdude // Sources {"AVR16EA48", 335, F_AVR8X, {0x1E, 0x94, 0x35}, // ID @@ -7136,7 +7136,7 @@ const char * const vtab_avr16eb32[vts_avr16eb32] = { "RTC_PIT", // 4: RTC Periodic Interrupt Timer "CCL_CCL", // 5: Configurable Custom Logic "PORTA_PORT", // 6: Interrupt PORT A - "WEX0_FDFEVA/WEX0_FDFEVB/WEX0_FDFEVC", // 7: Waveform Extention 0 Fault Detection on Event Input A/B/C + "WEX0_FAULTDET/WEX0_FDFEVA/WEX0_FDFEVB/WEX0_FDFEVC", // 7: Waveform Extention 0 Fault Detection/... on Event Input A/B/C "TCE0_OVF", // 8: TC E0 Overflow "TCE0_CMP0", // 9: TC E0 Compare 0 "TCE0_CMP1", // 10: TC E0 Compare 1 @@ -44374,7 +44374,7 @@ const Register_file_t rgftab_avr16eb14[391] = { // I/O memory [0, 4159] }; // AVR16EB20 AVR16EB28 AVR16EB32 -const Register_file_t rgftab_avr16eb20[392] = { // I/O memory [0, 4159] +const Register_file_t rgftab_avr16eb20[393] = { // I/O memory [0, 4159] {"vporta.dir", 0x0000, 1, -1, 0x00, "data direction register"}, {"vporta.out", 0x0001, 1, -1, 0x00, "I/O port output register"}, {"vporta.in", 0x0002, 1, -1, 0x00, "I/O port input register"}, @@ -44602,6 +44602,7 @@ const Register_file_t rgftab_avr16eb20[392] = { // I/O memory [0, 4159] {"portmux.twiroutea", 0x05e6, 1, -1, 0x00, "TWI route A register"}, {"portmux.tceroutea", 0x05e7, 1, -1, 0x00, "TCE route A register"}, {"portmux.tcbroutea", 0x05e8, 1, -1, 0x00, "TCB route A register"}, + {"portmux.acroutea", 0x05ea, 1, -1, 0x00, "AC route A register"}, {"portmux.tcfroutea", 0x05ec, 1, -1, 0x00, "TCF route A register"}, {"adc0.ctrla", 0x0600, 1, -1, 0x00, "control register A"}, {"adc0.ctrlb", 0x0601, 1, -1, 0x00, "control register B"}, diff --git a/src/libavrdude-avrintel.h b/src/libavrdude-avrintel.h index 830f19605..d37f44c85 100644 --- a/src/libavrdude-avrintel.h +++ b/src/libavrdude-avrintel.h @@ -1,8 +1,8 @@ /* * Do not edit: automatically generated by mkavrintel.pl * - * Do NOT directly "#include " into your code. - * DO "#include " instead. + * Do not directly #include into user code. + * Instead, #include . * * libavrdude-avrintel.h * @@ -12,7 +12,7 @@ * Meta-author Stefan Rueger * * v 1.3 - * 14.02.2024 + * 12.04.2024 * */ @@ -2656,7 +2656,7 @@ extern const Register_file_t rgftab_atmega3209[432]; extern const Register_file_t rgftab_avr16eb14[391]; -extern const Register_file_t rgftab_avr16eb20[392]; +extern const Register_file_t rgftab_avr16eb20[393]; #define rgftab_avr16eb28 rgftab_avr16eb20 #define rgftab_avr16eb32 rgftab_avr16eb20 From 5361668c0e561cde1865d585c93453c32c27a13d Mon Sep 17 00:00:00 2001 From: Stefan Rueger Date: Fri, 12 Apr 2024 23:28:35 +0100 Subject: [PATCH 2/3] No longer warn when part configuration disables SPI interface SPI programming cannot disable SPI programming for the part configuration. Hence. when another programming interface disables SPI that very same interface can enable SPI again. The warning disabling SPI might brick the part is therefore incorrect. --- src/avrintel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/avrintel.c b/src/avrintel.c index 7c79f793c..6a58f824c 100644 --- a/src/avrintel.c +++ b/src/avrintel.c @@ -9265,7 +9265,7 @@ static const Valueitem_t _values_wdton_atmega328[2] = { */ static const Valueitem_t _values_spien_atmega328[2] = { {0, "isp_enabled", "serial programming enabled"}, - {1, "isp_disabled_warning_might_brick_the_board", "serial programming disabled (warning: might brick the board)"}, + {1, "isp_disabled", "serial programming disabled"}, }; /* From ece865216283723ec4be9146fa4c2d6afcc4ffcc Mon Sep 17 00:00:00 2001 From: Stefan Rueger Date: Sat, 13 Apr 2024 00:59:26 +0100 Subject: [PATCH 3/3] Include instead of "ac_cfg.h" See https://github.com/avrdudes/avrdude/commit/9616b3709c8fdeaf67163bf526c9591d24135d62 --- src/avrintel.c | 4 ++-- src/libavrdude-avrintel.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/avrintel.c b/src/avrintel.c index 6a58f824c..df1ee6b1e 100644 --- a/src/avrintel.c +++ b/src/avrintel.c @@ -9,11 +9,11 @@ * Meta-author Stefan Rueger * * v 1.3 - * 12.04.2024 + * 13.04.2024 * */ -#include "ac_cfg.h" +#include #include #include diff --git a/src/libavrdude-avrintel.h b/src/libavrdude-avrintel.h index d37f44c85..95d612795 100644 --- a/src/libavrdude-avrintel.h +++ b/src/libavrdude-avrintel.h @@ -12,7 +12,7 @@ * Meta-author Stefan Rueger * * v 1.3 - * 12.04.2024 + * 13.04.2024 * */