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

Rework of bitbanging functions setpin, getpin, highpulsepin to make simplier use of new pindefs data in pgm structure

Browse Source 
* linuxgpio.c, bitbang.c, buspirate.c, par.c, pgm.h, term.c, serbb_*.c: changed 
	  interface of setpin, getpin, highpulsepin to take pin function as parameter 
	  (not the real number, which can be found by pgm->pinno[function])

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1252 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Rene Liebscher
2013-12-04 19:02:55 +00:00
parent 3b793351bb
commit 1c401d5d08
9 changed files with 107 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
serbb_posix.c
View File

@@ -71,10 +71,11 @@ static char *serpins[DB9PINS + 1] =
{ "NONE", "CD", "RXD", "TXD", "DTR", "GND", "DSR", "RTS", "CTS", "RI" };
#endif
static int serbb_setpin(PROGRAMMER * pgm, int pin, int value)
static int serbb_setpin(PROGRAMMER * pgm, int pinfunc, int value)
{
unsigned int ctl;
int r;
int pin = pgm->pinno[pinfunc]; // get its value
if (pin & PIN_INVERSE)
{
@@ -127,11 +128,12 @@ static int serbb_setpin(PROGRAMMER * pgm, int pin, int value)
return 0;
}
static int serbb_getpin(PROGRAMMER * pgm, int pin)
static int serbb_getpin(PROGRAMMER * pgm, int pinfunc)
{
unsigned int ctl;
unsigned char invert;
int r;
int pin = pgm->pinno[pinfunc]; // get its value
if (pin & PIN_INVERSE)
{
@@ -177,13 +179,15 @@ static int serbb_getpin(PROGRAMMER * pgm, int pin)
}
}
static int serbb_highpulsepin(PROGRAMMER * pgm, int pin)
static int serbb_highpulsepin(PROGRAMMER * pgm, int pinfunc)
{
int pin = pgm->pinno[pinfunc]; // replace pin name by its value
if ( (pin & PIN_MASK) < 1 || (pin & PIN_MASK) > DB9PINS )
return -1;
serbb_setpin(pgm, pin, 1);
serbb_setpin(pgm, pin, 0);
serbb_setpin(pgm, pinfunc, 1);
serbb_setpin(pgm, pinfunc, 0);
return 0;
}
@@ -277,7 +281,7 @@ static void serbb_close(PROGRAMMER *pgm)
if (pgm->fd.ifd != -1)
{
(void)tcsetattr(pgm->fd.ifd, TCSANOW, &oldmode);
pgm->setpin(pgm, pgm->pinno[PIN_AVR_RESET], 1);
pgm->setpin(pgm, PIN_AVR_RESET, 1);
close(pgm->fd.ifd);
}
return;