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

s/\bpinmask_t\b/pinmask/g

Browse Source
This commit is contained in:
Stefan Rueger
2024-05-20 01:02:11 +01:00
parent 5148038401
commit 8acd181f78
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libavrdude.h
View File

@@ -51,7 +51,7 @@
* compiled from source together with the application.
*/
typedef uint32_t pinmask_t;
typedef uint32_t Pinmask;
/*
* Values returned by library functions.
* Some library functions also return a count, i.e. a positive
@@ -627,7 +627,7 @@ enum {
#endif
/** Number of pins in each element of the bitfield */
#define PIN_FIELD_ELEMENT_SIZE (sizeof(pinmask_t) * 8)
#define PIN_FIELD_ELEMENT_SIZE (sizeof(Pinmask) * 8)
/** Numer of elements to store the complete bitfield of all pins */
#define PIN_FIELD_SIZE ((PIN_MAX+1 + PIN_FIELD_ELEMENT_SIZE-1)/PIN_FIELD_ELEMENT_SIZE)
@@ -673,8 +673,8 @@ enum {
* Data structure to hold used pins by logical function (PIN_AVR_*, ...)
*/
struct pindef {
pinmask_t mask[PIN_FIELD_SIZE]; ///< bitfield of used pins
pinmask_t inverse[PIN_FIELD_SIZE]; ///< bitfield of inverse/normal usage of used pins
Pinmask mask[PIN_FIELD_SIZE]; ///< bitfield of used pins
Pinmask inverse[PIN_FIELD_SIZE]; ///< bitfield of inverse/normal usage of used pins
};
/**
@@ -762,7 +762,7 @@ const char *pins_to_str(const struct pindef * const pindef);
* @param[in] pinmask the pin mask for which we want the string representation
* @returns a temporary string that lives in closed-circuit space
*/
const char *pinmask_to_str(const pinmask_t * const pinmask);
const char *pinmask_to_str(const Pinmask * const pinmask);
/* formerly serial.h */

10
src/pindefs.c
View File

@@ -158,7 +158,7 @@ int pgm_fill_old_pins(PROGRAMMER * const pgm) {
* @param[in] pinmask the pin mask for which we want the string representation
* @returns a temporary string that lives in closed-circuit space
*/
const char *pinmask_to_str(const pinmask_t * const pinmask) {
const char *pinmask_to_str(const Pinmask * const pinmask) {
char buf[6 * (PIN_MAX + 1)];
char *p = buf;
int n;
@@ -221,7 +221,7 @@ int pins_check(const PROGRAMMER *const pgm, const struct pin_checklist_t *const
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
pinmask_t already_used_all[PIN_FIELD_SIZE] = {0}; // collect pin definitions of all pin names for check of double use
Pinmask already_used_all[PIN_FIELD_SIZE] = {0}; // collect pin definitions of all pin names for check of double use
// loop over all possible pinnames
for(pinname = 0; pinname < N_PINS; pinname++) {
bool used = false;
@@ -229,9 +229,9 @@ int pins_check(const PROGRAMMER *const pgm, const struct pin_checklist_t *const
bool inverse = false;
int index;
bool mandatory_used = false;
pinmask_t invalid_used[PIN_FIELD_SIZE] = {0};
pinmask_t inverse_used[PIN_FIELD_SIZE] = {0};
pinmask_t already_used[PIN_FIELD_SIZE] = {0};
Pinmask invalid_used[PIN_FIELD_SIZE] = {0};
Pinmask inverse_used[PIN_FIELD_SIZE] = {0};
Pinmask already_used[PIN_FIELD_SIZE] = {0};
const struct pindef * valid_pins = &no_valid_pins;
bool is_mandatory = false;
bool is_ok = true;