Skip to content

Commit

Permalink
Deprecate obsolete features and options
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefanrueger
stefanrueger committed Aug 8, 2024
1 parent 28ebfa0 commit d911282
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 260 deletions.
6 changes: 0 additions & 6 deletions src/avr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,6 @@ int avr_mem_hiaddr(const AVRMEM * mem)
{
int i, n;

// Deprecated: calling with NULL disables trailing 0xff optimisation (remove in v8.0)
if(!mem) {
cx->avr_disableffopt = 1;
return 0;
}

if(cx->avr_disableffopt)
return mem->size;

Expand Down
15 changes: 3 additions & 12 deletions src/avrdude.conf.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ avrdude_conf_version = "@AVRDUDE_FULL_VERSION@";
# buff = <pin1> [, <pin2> ... ] ; # pin number(s)
# reset = <pin> ; # pin number
# sck = <pin> ; # pin number
# sdo = <pin> ; # pin number
# sdi = <pin> ; # pin number
# sdo|pico = <pin> ; # pin number
# sdi|poci = <pin> ; # pin number
# tck = <pin> ; # pin number
# tdi = <pin> ; # pin number
# tdo = <pin> ; # pin number
Expand Down Expand Up @@ -111,15 +111,8 @@ avrdude_conf_version = "@AVRDUDE_FULL_VERSION@";
# n_boot_sections = <num>; # Number of boot sections
# boot_section_size = <num>; # Size of (smallest) boot section, if any
# hvupdi_variant = <num> ; # numeric -1 (n/a) or 0..2
# devicecode = <num> ; # deprecated, use stk500_devcode
# stk500_devcode = <num> ; # numeric
# avr910_devcode = <num> ; # numeric
# has_jtag = <yes/no> ; # part has JTAG i/f (deprecated, use prog_modes)
# has_debugwire = <yes/no> ; # part has debugWire i/f (deprecated, use prog_modes)
# has_pdi = <yes/no> ; # part has PDI i/f (deprecated, use prog_modes)
# has_updi = <yes/no> ; # part has UPDI i/f (deprecated, use prog_modes)
# has_tpi = <yes/no> ; # part has TPI i/f (deprecated, use prog_modes)
# is_avr32 = <yes/no> ; # AVR32 part (deprecated, use prog_modes)
# is_at90s1200 = <yes/no> ; # AT90S1200 part
# signature = <num> <num> <num> ; # signature bytes
# usbpid = <num> ; # DFU USB PID
Expand Down Expand Up @@ -242,8 +235,6 @@ avrdude_conf_version = "@AVRDUDE_FULL_VERSION@";
# ;
#
# NOTES:
# * 'devicecode' is the device code used by the STK500 (see codes
# listed below)
# * Not all memories will implement all instructions
# * AVR Fuse bits and Lock bits are implemented as a type of memory
# * Example memories are:
Expand Down Expand Up @@ -313,7 +304,7 @@ avrdude_conf_version = "@AVRDUDE_FULL_VERSION@";
#
#
# The following are STK500 part device codes to use for the
# "devicecode" field of the part. These came from Atmel's software
# stk500_devcode field of the part. These came from Atmel's software
# section avr061.zip which accompanies the application note
# AVR061 available from:
#
Expand Down
4 changes: 2 additions & 2 deletions src/avrdude.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ int avrdude_message2(FILE *fp, int lno, const char *file, const char *func, int
#define MSG_TRACE2 5 // Displayed with -vvvvv

#define MSG2_PROGNAME 1 // Start by printing progname
#define MSG2_FUNCTION 2 // Print calling function (1st arg) after progname if >= notice
#define MSG2_FILELINE 4 // Print source file and line number after function if >= debug
#define MSG2_FUNCTION 2 // Print calling function (1st arg) after progname if >= notice2
#define MSG2_FILELINE 4 // Print source file and line number after function if >= notice2
#define MSG2_TYPE 8 // Print message type after progname
#define MSG2_INDENT1 16 // Start by printing indentation of progname+1 blanks
#define MSG2_INDENT2 32 // Start by printing indentation of progname+2 blanks
Expand Down
74 changes: 0 additions & 74 deletions src/config_gram.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ static int parse_cmdbits(OPCODE * op, int opnum);
%token K_DEFAULT_SPI
%token K_DEFAULT_LINUXGPIO
%token K_HVUPDI_SUPPORT
%token K_DEVICECODE
%token K_EEPROM
%token K_ERRLED
%token K_FLASH
Expand Down Expand Up @@ -137,13 +136,7 @@ static int parse_cmdbits(OPCODE * op, int opnum);
* MCUs.
*/
%token K_ENABLEPAGEPROGRAMMING /* ? yes for mega256*, mega406 */
%token K_HAS_JTAG /* MCU has JTAG i/f. */
%token K_HAS_DW /* MCU has debugWire i/f. */
%token K_HAS_PDI /* MCU has PDI i/f rather than ISP (ATxmega). */
%token K_HAS_UPDI /* MCU has UPDI i/f (AVR8X). */
%token K_HAS_TPI /* MCU has TPI i/f rather than ISP (ATtiny4/5/9/10). */
%token K_IS_AT90S1200 /* chip is an AT90S1200 (needs special treatment) */
%token K_IS_AVR32 /* chip is in the avr32 family */
%token K_FLASH_INSTR /* flash instructions */
%token K_EEPROM_INSTR /* EEPROM instructions */

Expand Down Expand Up @@ -681,13 +674,6 @@ part_parm :
}
} |

K_DEVICECODE TKN_EQUAL numexpr {
{
yyerror("devicecode is deprecated, will be removed in v8.0, use stk500_devcode instead");
YYABORT;
}
} |

K_SIGNATURE TKN_EQUAL TKN_NUMBER TKN_NUMBER TKN_NUMBER {
{
current_part->signature[0] = $3->value.number;
Expand Down Expand Up @@ -864,56 +850,6 @@ part_parm :
free_tokens(2, $1, $3);
} |

K_HAS_JTAG TKN_EQUAL numexpr
{
yywarning("has_jtag is deprecated, will be removed in v8.0, use prog_modes");
if ($3->value.number == 1)
current_part->prog_modes |= PM_JTAG;
else if ($3->value.number == 0)
current_part->prog_modes &= ~(PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG);
free_token($3);
} |

K_HAS_DW TKN_EQUAL numexpr
{
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;
else if ($3->value.number == 0)
current_part->prog_modes &= ~PM_debugWIRE;
free_token($3);
} |

K_HAS_PDI TKN_EQUAL numexpr
{
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;
else if ($3->value.number == 0)
current_part->prog_modes &= ~PM_PDI;
free_token($3);
} |

K_HAS_UPDI TKN_EQUAL numexpr
{
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;
else if ($3->value.number == 0)
current_part->prog_modes &= ~PM_UPDI;
free_token($3);
} |

K_HAS_TPI TKN_EQUAL numexpr
{
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;
else if ($3->value.number == 0)
current_part->prog_modes &= ~PM_TPI;
free_token($3);
} |

K_IS_AT90S1200 TKN_EQUAL numexpr
{
if ($3->value.number == 1)
Expand All @@ -929,16 +865,6 @@ part_parm :
free_token($3);
} |

K_IS_AVR32 TKN_EQUAL numexpr
{
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;
else if ($3->value.number == 0)
current_part->prog_modes &= ~PM_aWire;
free_token($3);
} |

K_ALLOWFULLPAGEBITSTREAM TKN_EQUAL numexpr
{
if ($3->value.number == 1)
Expand Down
Loading

0 comments on commit d911282

Please sign in to comment.