avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-18 11:24:42 +00:00
Code Issues Projects Releases Wiki Activity

bug #35186 inverting pins with "~" doesn't work for pin lists (i.e. vcc)

Browse Source 
bug #37727 Add support for LM3S811 dev board as a programmer
* lexer.l,config_gram.y: accepting inverted pins at pin lists 
	        syntax: ~num or ~(num,num,...)
* par.c: par_set_many_bits is now usable with inverted pins
* avrftdi.c: fixed wrong index in ftdi_pin_name
* avrdude.conf.in: added programmer lm3s811

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1106 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
rliebscher
2012-11-13 21:34:02 +00:00
parent 8af36ef451
commit 52e3323b6e
6 changed files with 77 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
config_gram.y
View File

@@ -48,6 +48,7 @@ int yylex(void);
int yyerror(char * errmsg);
static int assign_pin(int pinno, TOKEN * v, int invert);
static int assign_pin_list(int invert);
static int which_opcode(TOKEN * opcode);
static int parse_cmdbits(OPCODE * op);
@@ -199,6 +200,8 @@ static int pin_name;
%token TKN_EQUAL
%token TKN_SEMI
%token TKN_TILDE
%token TKN_LEFT_PAREN
%token TKN_RIGHT_PAREN
%token TKN_NUMBER
%token TKN_NUMBER_REAL
%token TKN_STRING
@@ -539,22 +542,11 @@ pin_number:
;
pin_list:
num_list {
{
TOKEN * t;
int pin;
current_prog->pinno[pin_name] = 0;
while (lsize(number_list)) {
t = lrmv_n(number_list, 1);
pin = t->value.number;
current_prog->pinno[pin_name] |= (1 << pin);
free_token(t);
}
}
}
num_list { assign_pin_list(0); }
|
TKN_TILDE TKN_NUMBER { assign_pin(pin_name, $2, 1); }
|
TKN_TILDE TKN_LEFT_PAREN num_list TKN_RIGHT_PAREN { assign_pin_list(1); }
|
/* empty */ {
current_prog->pinno[pin_name] = 0;
@@ -1331,7 +1323,8 @@ mem_spec :
static char * vtypestr(int type)
{
switch (type) {
case V_NUM : return "NUMERIC";
case V_NUM : return "INTEGER";
case V_NUM_REAL: return "REAL";
case V_STR : return "STRING";
default:
return "<UNKNOWN>";
@@ -1362,6 +1355,24 @@ static int assign_pin(int pinno, TOKEN * v, int invert)
return 0;
}
static int assign_pin_list(int invert)
{
TOKEN * t;
int pin;
current_prog->pinno[pin_name] = 0;
while (lsize(number_list)) {
t = lrmv_n(number_list, 1);
pin = t->value.number;
current_prog->pinno[pin_name] |= (1 << pin);
if (invert)
current_prog->pinno[pin_name] |= PIN_INVERSE;
free_token(t);
}
return 0;
}
static int which_opcode(TOKEN * opcode)
{
switch (opcode->primary) {