avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-09-28 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Prefix pin config entries in the config file with a "c:". Later, I

Browse Source 
might make part descriptions read in this way and we can use a
different letter for those (p).  This will make the parsing easier to
distinguish between the entry types.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@69 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Brian S. Dean
2001-09-20 03:19:31 +00:00
parent 0b7551c3df
commit 3cdf00c76c
3 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
main.c
View File

@@ -264,7 +264,6 @@ int print_module_versions ( FILE * outf, char * timestamp )
}
#define MAX_LINE_LEN 1024
#define MAX_PIN_NAME 64
@@ -457,6 +456,7 @@ int read_config(char * infile, char * config, unsigned int * pinno,
lineno = 0;
buf[0] = 0;
cont = 0;
while (fgets(line, MAX_LINE_LEN, f) != NULL) {
lineno++;
@@ -464,6 +464,9 @@ int read_config(char * infile, char * config, unsigned int * pinno,
while (isspace(*p))
p++;
/*
* skip empty lines and lines that start with '#'
*/
if ((*p == '#')||(*p == '\n')||(*p == 0))
continue;
@@ -473,6 +476,37 @@ int read_config(char * infile, char * config, unsigned int * pinno,
len--;
}
/*
* we're only interested in pin configuration data which begin
* with "c:"
*/
if (((len < 3) || (p[0] != 'c')) && !cont)
continue;
/*
* skip over the "c:"
*/
if (!cont) {
p++;
while (*p && isspace(*p))
p++;
if (*p != ':') {
fprintf(stderr, "line %d:\n%s\n",
lineno, line);
for (i=0; i<(p-line); i++) {
fprintf(stderr, "-");
}
fprintf(stderr, "^\n");
fprintf(stderr, "error at column %d, line %d of %s: expecting ':'\n",
p-line+1, lineno, infile);
return -1;
}
p++;
len = strlen(p);
}
cont = 0;
if (p[len-1] == '\\') {
@@ -547,12 +581,47 @@ int read_config(char * infile, char * config, unsigned int * pinno,
static char vccpins_buf[64];
char * vccpins_str(unsigned int pmask)
{
unsigned int mask;
int pin;
char b2[8];
char * b;
b = vccpins_buf;
b[0] = 0;
for (pin = 2, mask = 1; mask < 0x80; mask = mask << 1, pin++) {
if (pmask & mask) {
sprintf(b2, "%d", pin);
if (b[0] != 0)
strcat(b, ",");
strcat(b, b2);
}
}
return b;
}
void pinconfig_display(char * p, char * config, char * desc)
{
char vccpins[64];
if (pinno[PPI_AVR_VCC]) {
snprintf(vccpins, sizeof(vccpins), " = pins %s",
vccpins_str(pinno[PPI_AVR_VCC]));
}
else {
vccpins[0] = 0;
}
fprintf(stderr, "%sProgrammer Pin Configuration: %s (%s)\n", p,
config ? config : "DEFAULT", desc);
fprintf(stderr,
"%s VCC = 0x%02x\n"
"%s VCC = 0x%02x %s\n"
"%s BUFF = %d\n"
"%s RESET = %d\n"
"%s SCK = %d\n"
@@ -562,7 +631,7 @@ void pinconfig_display(char * p, char * config, char * desc)
"%s RDY LED = %d\n"
"%s PGM LED = %d\n"
"%s VFY LED = %d\n",
p, pinno[PPI_AVR_VCC],
p, pinno[PPI_AVR_VCC], vccpins,
p, pinno[PIN_AVR_BUFF],
p, pinno[PIN_AVR_RESET],
p, pinno[PIN_AVR_SCK],