Skip to content

Commit dd93afc

Browse files
committed
Print notice of linuxspi port incl reset pin
1 parent abb2150 commit dd93afc

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/libavrdude.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,10 @@ enum {
675675
N_PINS
676676
};
677677

678-
#define PIN_MASK (UINT_MAX>>1)
679-
#define PIN_INVERSE (~(PIN_MASK)) // Flag for inverted pin in serbb
680-
#define PIN_MIN 0 // Smallest allowed pin number
681-
#define PIN_MAX 31 // Largest allowed pin number
678+
#define PIN_MASK (UINT_MAX>>1)
679+
#define PIN_INVERSE (~PIN_MASK) // Flag for inverted pin in serbb
680+
#define PIN_MIN 0 // Smallest allowed pin number
681+
#define PIN_MAX 31 // Largest allowed pin number
682682

683683
#ifdef HAVE_LINUXGPIO
684684

src/linuxspi.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,8 @@ static int linuxspi_open(PROGRAMMER *pgm, const char *pt) {
152152
struct gpiohandle_request req;
153153
int ret;
154154

155-
if(str_eq(port, "unknown")) {
155+
if(str_eq(port, "unknown"))
156156
port = port_default;
157-
}
158157

159158
spidev = strtok(port, ":");
160159
if(!spidev) {
@@ -180,6 +179,8 @@ static int linuxspi_open(PROGRAMMER *pgm, const char *pt) {
180179
}
181180
}
182181

182+
pmsg_notice("opening %s:%s:%d\n", spidev, gpiochip, pgm->pinno[PIN_AVR_RESET] & PIN_MASK);
183+
183184
pgm->port = port;
184185
my.fd_spidev = open(pgm->port, O_RDWR);
185186
if(my.fd_spidev < 0) {

src/par.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static void par_setmany(const PROGRAMMER *pgm, int pinfunc, int value) {
114114
pinset = pgm->pinno[pinfunc];
115115

116116
// Mask is anything non-pin - needs to be applied to each par_setpin to preserve inversion
117-
mask = pinset & (~PIN_MASK);
117+
mask = pinset & ~PIN_MASK;
118118

119119
for(pin = 1; pin <= 17; pin++) {
120120
if(pinset & (1 << pin))

0 commit comments

Comments
 (0)