Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-28 03:56:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move static variables into PDATA in serbb_win32.c

Browse Source
This commit is contained in:
Stefan Rueger
2024-05-10 14:27:15 +01:00
parent fbf9a9f539
commit 8a807b8a53
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/serbb_win32.c
View File

@@ -40,8 +40,12 @@
#include "bitbang.h"
#include "serbb.h"
/* cached status lines */
static int dtr, rts, txd;
struct pdata {
int dtr, rts, txd; // Cached status lines
};
// Use private programmer data as if they were a global structure my
#define my (*(struct pdata *)(pgm->cookie))
#define W32SERBUFSIZE 1024
@@ -85,13 +89,13 @@ static int serbb_setpin(const PROGRAMMER *pgm, int pinfunc, int value) {
case 3: /* txd */
dwFunc = value? SETBREAK: CLRBREAK;
name = value? "SETBREAK": "CLRBREAK";
txd = value;
my.txd = value;
break;
case 4: /* dtr */
dwFunc = value? SETDTR: CLRDTR;
name = value? "SETDTR": "CLRDTR";
dtr = value;
my.dtr = value;
break;
case 7: /* rts */
@@ -191,15 +195,15 @@ static int serbb_getpin(const PROGRAMMER *pgm, int pinfunc) {
switch (pin)
{
case 3: /* txd */
rv = txd;
rv = my.txd;
name = "TXD";
break;
case 4: /* dtr */
rv = dtr;
rv = my.dtr;
name = "DTR";
break;
case 7: /* rts */
rv = rts;
rv = my.rts;
name = "RTS";
break;
default:
@@ -303,7 +307,7 @@ static int serbb_open(PROGRAMMER *pgm, const char *port) {
pgm->fd.pfd = (void *)hComPort;
dtr = rts = txd = 0;
my.dtr = my.rts = my.txd = 0;
return 0;
}
@@ -320,6 +324,15 @@ static void serbb_close(PROGRAMMER *pgm) {
hComPort = INVALID_HANDLE_VALUE;
}
static void serbb_setup(PROGRAMMER *pgm) {
pgm->cookie = mmt_malloc(sizeof(struct pdata));
}
static void serbb_teardown(PROGRAMMER *pgm) {
mmt_free(pgm->cookie);
pgm->cookie = NULL;
}
const char serbb_desc[] = "Serial port bitbanging";
void serbb_initpgm(PROGRAMMER *pgm) {
@@ -327,6 +340,8 @@ void serbb_initpgm(PROGRAMMER *pgm) {
pgm_fill_old_pins(pgm); // TODO to be removed if old pin data no longer needed
pgm->setup = serbb_setup;
pgm->teardown = serbb_teardown;
pgm->rdy_led = bitbang_rdy_led;
pgm->err_led = bitbang_err_led;
pgm->pgm_led = bitbang_pgm_led;