From 8b748b3c22691964b07882f05f62b3254aeccf48 Mon Sep 17 00:00:00 2001 From: Stefan Rueger Date: Mon, 20 May 2024 01:15:25 +0100 Subject: [PATCH] s/\bpin_checklist_t\b/pin_checklist/g --- src/avrftdi.c | 4 ++-- src/ft245r.c | 2 +- src/libavrdude.h | 6 +++--- src/pindefs.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/avrftdi.c b/src/avrftdi.c index 9dde9733..36408334 100644 --- a/src/avrftdi.c +++ b/src/avrftdi.c @@ -499,7 +499,7 @@ static int avrftdi_check_pins_bb(const PROGRAMMER *pgm, bool output) { int pin; /* pin checklist. */ - struct pin_checklist_t pin_checklist[N_PINS]; + Pin_checklist pin_checklist[N_PINS]; Avrftdi_data *pdata = to_pdata(pgm); @@ -526,7 +526,7 @@ static int avrftdi_check_pins_mpsse(const PROGRAMMER *pgm, bool output) { int pin; /* pin checklist. */ - struct pin_checklist_t pin_checklist[N_PINS]; + Pin_checklist pin_checklist[N_PINS]; Avrftdi_data *pdata = to_pdata(pgm); diff --git a/src/ft245r.c b/src/ft245r.c index baeb08a0..e52ec3d6 100644 --- a/src/ft245r.c +++ b/src/ft245r.c @@ -806,7 +806,7 @@ static int ft245r_cmd_tpi(const PROGRAMMER *pgm, const unsigned char *cmd, /* lower 8 pins are accepted, they might be also inverted */ static const struct pindef valid_pins = {{0xff}, {0xff}}; -static const struct pin_checklist_t pin_checklist[] = { +static const Pin_checklist pin_checklist[] = { { PIN_AVR_SCK, 1, &valid_pins}, { PIN_AVR_SDO, 1, &valid_pins}, { PIN_AVR_SDI, 1, &valid_pins}, diff --git a/src/libavrdude.h b/src/libavrdude.h index 0fa554b5..3b76a6c5 100644 --- a/src/libavrdude.h +++ b/src/libavrdude.h @@ -680,11 +680,11 @@ struct pindef { /** * Data structure to define a checklist of valid pins for each function. */ -struct pin_checklist_t { +typedef struct pin_checklist { int pinname; ///< logical pinname eg. PIN_AVR_SCK int mandatory; ///< is this a mandatory pin const struct pindef *valid_pins; ///< mask defines allowed pins, inverse define is they might be used inverted -}; +} Pin_checklist; /** * Adds a pin in the pin definition as normal or inverse pin. @@ -729,7 +729,7 @@ int pgm_fill_old_pins(PROGRAMMER * const pgm); * @param[in] output false suppresses error messages to the user * @returns 0 if all pin definitions are valid, -1 otherwise */ -int pins_check(const PROGRAMMER * const pgm, const struct pin_checklist_t * const checklist, const int size, const bool output); +int pins_check(const PROGRAMMER * const pgm, const Pin_checklist * const checklist, const int size, const bool output); /** * Returns the name of the pin as string. diff --git a/src/pindefs.c b/src/pindefs.c index 2e3c7b8b..6aec71ad 100644 --- a/src/pindefs.c +++ b/src/pindefs.c @@ -217,7 +217,7 @@ const char *pinmask_to_str(const Pinmask * const pinmask) { * @param[in] size the number of entries in checklist * @returns 0 if all pin definitions are valid, -1 otherwise */ -int pins_check(const PROGRAMMER *const pgm, const struct pin_checklist_t *const checklist, const int size, const bool output) { +int pins_check(const PROGRAMMER *const pgm, const Pin_checklist *const checklist, const int size, const bool output) { static const struct pindef no_valid_pins = {{0}, {0}}; // default value if check list does not contain anything else int rv = 0; // return value int pinname; // loop counter through pinnames