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

s/\bRegister_file_t\b/Register_file/g

Browse Source
This commit is contained in:
Stefan Rueger
2024-05-20 01:04:43 +01:00
parent 97c4f89851
commit cd90f3c958
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/avrpart.c
View File

@@ -531,7 +531,7 @@ const char * const *avr_locate_isrtable(const AVRPART *p, int *nip) {
}
// Return pointer to register file for the part and set number of registers
const Register_file_t *avr_locate_register_file(const AVRPART *p, int *nrp) {
const Register_file *avr_locate_register_file(const AVRPART *p, int *nrp) {
int idx = avr_locate_upidx(p);
if(idx < 0)
return NULL;
@@ -556,13 +556,13 @@ const Register_file_t *avr_locate_register_file(const AVRPART *p, int *nrp) {
* though there are other registers that start with adc, eg, adc.adcsra.
*/
const Register_file_t *avr_locate_register(const Register_file_t *rgf, int nr, const char *reg,
const Register_file *avr_locate_register(const Register_file *rgf, int nr, const char *reg,
int (*match)(const char *, const char*)) {
if(!rgf || nr < 1 || !reg || !match)
return NULL;
const Register_file_t *ret = NULL;
const Register_file *ret = NULL;
int nmatches = 0, eqmatch = match == str_eq;
for(int i = 0; i < nr; i++) {
@@ -597,10 +597,10 @@ const Register_file_t *avr_locate_register(const Register_file_t *rgf, int nr, c
* behaviour can be suppressed by specifying a pattern for reg, eg, adc*
* together with the matching function str_matched_by.
*/
const Register_file_t **avr_locate_registerlist(const Register_file_t *rgf, int nr, const char *reg,
const Register_file **avr_locate_registerlist(const Register_file *rgf, int nr, const char *reg,
int (*match)(const char *, const char*)) {
const Register_file_t **ret = mmt_malloc(sizeof rgf*(nr>0? nr+1: 1)), **r = ret;
const Register_file **ret = mmt_malloc(sizeof rgf*(nr>0? nr+1: 1)), **r = ret;
int eqmatch = match == str_eq;
if(rgf && reg && match)

2
src/dryrun.c
View File

@@ -191,7 +191,7 @@ static void dryrun_enable(PROGRAMMER *pgm, const AVRPART *p) {
}
} else if(mem_is_io(m)) { // Initialise reset values (if known)
int nr;
const Register_file_t *rf = avr_locate_register_file(p, &nr);
const Register_file *rf = avr_locate_register_file(p, &nr);
if(rf)
for(int i = 0; i < nr; i++)
if(rf[i].initval != -1 && rf[i].size > 0 && rf[i].size < 5)

2
src/libavrdude-avrintel.h
View File

@@ -2760,7 +2760,7 @@ int upmatchingsig(uint8_t sigs[3], char *p, size_t n);
#ifndef TO_BE_DEPRECATED_IN_2026
typedef Configvalue Configvalue;
typedef Configitem Configitem;
typedef Register_file Register_file_t;
typedef Register_file Register_file;
typedef Avrintel Avrintel;
#endif

6
src/libavrdude.h
View File

@@ -1431,10 +1431,10 @@ extern "C" {
int avr_locate_upidx(const AVRPART *p);
const Configitem *avr_locate_configitems(const AVRPART *p, int *ncp);
const char * const *avr_locate_isrtable(const AVRPART *p, int *nip);
const Register_file_t *avr_locate_register_file(const AVRPART *p, int *nrp);
const Register_file_t *avr_locate_register(const Register_file_t *rgf, int nr, const char *reg,
const Register_file *avr_locate_register_file(const AVRPART *p, int *nrp);
const Register_file *avr_locate_register(const Register_file *rgf, int nr, const char *reg,
int (*match)(const char *, const char*));
const Register_file_t **avr_locate_registerlist(const Register_file_t *rgf, int nr, const char *reg,
const Register_file **avr_locate_registerlist(const Register_file *rgf, int nr, const char *reg,
int (*match)(const char *, const char*));
const Configitem *avr_locate_config(const Configitem *cfg, int nc, const char *name,
int (*match)(const char *, const char*));

4
src/term.c
View File

@@ -1727,7 +1727,7 @@ static int cmd_regfile(const PROGRAMMER *pgm, const AVRPART *p, int argc, const
int do_read = p->prog_modes & (PM_UPDI | PM_PDI);
int nr;
const Register_file_t *rf = avr_locate_register_file(p, &nr);
const Register_file *rf = avr_locate_register_file(p, &nr);
if(!rf || nr <= 0) {
pmsg_error("(regfile) .atdf file not published for %s: unknown register file\n", p->desc);
@@ -1739,7 +1739,7 @@ static int cmd_regfile(const PROGRAMMER *pgm, const AVRPART *p, int argc, const
*rhs++ = 0; // Terminate lhs
// Create mmt_malloc'd NULL-terminated list of register pointers
const Register_file_t *r, **rl, **rlist;
const Register_file *r, **rl, **rlist;
rlist = avr_locate_registerlist(rf, nr, reg, str_is_pattern(reg)? str_matched_by: str_contains);
if(rhs) { // Write to single register