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

Move static serdev structure into stk500's PDATA area

Browse Source
This commit is contained in:
Stefan Rueger
2024-04-19 22:10:54 +01:00
parent 94714812d7
commit b2e71428b9
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/stk500.h
View File

@@ -42,6 +42,7 @@ struct pdata {
unsigned char ext_addr_byte; // Record ext-addr byte set in the target device (if used)
int retry_attempts; // Number of connection attempts provided by the user
int xbeeResetPin; // Piggy back variable used by xbee programmmer
struct serial_device xbee_serdev; // Piggy back device descriptor for XBee framing
// Get/set flags for adjustable target voltage
bool vtarg_get;

24
src/xbee.c
View File

@@ -1499,20 +1499,6 @@ static int xbeedev_set_dtr_rts(const union filedescriptor *fdp, int is_on)
return 0;
}
/*
* Device descriptor for XBee framing.
*/
static struct serial_device xbee_serdev_frame = {
.open = xbeedev_open,
.close = xbeedev_close,
.rawclose = xbeedev_close,
.send = xbeedev_send,
.recv = xbeedev_recv,
.drain = xbeedev_drain,
.set_dtr_rts = xbeedev_set_dtr_rts,
.flags = SERDEV_FL_NONE,
};
static int xbee_getsync(const PROGRAMMER *pgm) {
unsigned char buf[2], resp[2];
@@ -1562,7 +1548,15 @@ static int xbee_open(PROGRAMMER *pgm, const char *port) {
/* Wireless is lossier than normal serial */
serial_recv_timeout = 1000;
serdev = &xbee_serdev_frame;
serdev = &PDATA(pgm)->xbee_serdev;
serdev->open = xbeedev_open;
serdev->close = xbeedev_close;
serdev->rawclose = xbeedev_close;
serdev->send = xbeedev_send;
serdev->recv = xbeedev_recv;
serdev->drain = xbeedev_drain;
serdev->set_dtr_rts = xbeedev_set_dtr_rts;
serdev->flags = SERDEV_FL_NONE;
if (serial_open(port, pinfo, &pgm->fd) == -1) {
return -1;