avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Inform user of -x disable_no_spi when needed (without -v)

This commit is contained in:
Stefan Rueger 2022-09-22 10:31:59 +01:00
parent be40d3b260
commit 93df07866a
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/linuxspi.c
View File

@ -65,8 +65,7 @@
/* /*
* Private data for this programmer. * Private data for this programmer.
*/ */
struct pdata struct pdata {
{
int disable_no_cs; int disable_no_cs;
}; };
@ -99,12 +98,7 @@ static int linuxspi_spi_duplex(const PROGRAMMER *pgm, const unsigned char *tx, u
} }
static void linuxspi_setup(PROGRAMMER *pgm) { static void linuxspi_setup(PROGRAMMER *pgm) {
if ((pgm->cookie = malloc(sizeof(struct pdata))) == 0) { pgm->cookie = cfg_malloc("linuxspi_setup()", sizeof(struct pdata));
avrdude_message(MSG_INFO, "%s: linuxspi_setup(): Out of memory allocating private data\n",
progname);
exit(1);
}
memset(pgm->cookie, 0, sizeof(struct pdata));
} }
static void linuxspi_teardown(PROGRAMMER* pgm) { static void linuxspi_teardown(PROGRAMMER* pgm) {
@ -180,18 +174,16 @@ static int linuxspi_open(PROGRAMMER *pgm, const char *pt) {
} }
uint32_t mode = SPI_MODE_0; uint32_t mode = SPI_MODE_0;
if (!PDATA(pgm)->disable_no_cs) { if (!PDATA(pgm)->disable_no_cs)
mode |= SPI_NO_CS; mode |= SPI_NO_CS;
}
ret = ioctl(fd_spidev, SPI_IOC_WR_MODE32, &mode); ret = ioctl(fd_spidev, SPI_IOC_WR_MODE32, &mode);
if (ret == -1) { if (ret == -1) {
int ioctl_errno = errno; int ioctl_errno = errno;
avrdude_message(MSG_INFO, "%s: error: Unable to set SPI mode %0X on %s\n", avrdude_message(MSG_INFO, "%s: error: Unable to set SPI mode %0X on %s\n",
progname, mode, spidev); progname, mode, spidev);
if(ioctl_errno == EINVAL || !PDATA(pgm)->disable_no_cs) { if(ioctl_errno == EINVAL || !PDATA(pgm)->disable_no_cs)
avrdude_message(MSG_NOTICE, "%s: Try \"-x disable_no_cs\" option\n", avrdude_message(MSG_INFO, "%s: try -x disable_no_cs\n", progname);
progname);
}
goto close_spidev; goto close_spidev;
} }
fd_gpiochip = open(gpiochip, 0); fd_gpiochip = open(gpiochip, 0);