summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/jtag/jtag.c10
-rw-r--r--src/jtag/jtag.h2
-rw-r--r--src/jtag/jtag_driver.c12
-rw-r--r--src/jtag/zy1000.c10
4 files changed, 17 insertions, 17 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index e9d21d45..cfffe702 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -987,7 +987,7 @@ static int jtag_examine_chain(void)
}
/* point at the 1st tap */
- tap = jtag_NextEnabledTap(NULL);
+ tap = jtag_tap_next_enabled(NULL);
if( tap == NULL ){
LOG_ERROR("JTAG: No taps enabled?");
return ERROR_JTAG_INIT_FAILED;
@@ -1094,7 +1094,7 @@ static int jtag_examine_chain(void)
tap->idcode);
#endif
}
- tap = jtag_NextEnabledTap(tap);
+ tap = jtag_tap_next_enabled(tap);
}
device_count++;
}
@@ -1122,7 +1122,7 @@ static int jtag_validate_chain(void)
tap = NULL;
total_ir_length = 0;
for(;;){
- tap = jtag_NextEnabledTap(tap);
+ tap = jtag_tap_next_enabled(tap);
if( tap == NULL ){
break;
}
@@ -1146,7 +1146,7 @@ static int jtag_validate_chain(void)
chain_pos = 0;
int val;
for(;;){
- tap = jtag_NextEnabledTap(tap);
+ tap = jtag_tap_next_enabled(tap);
if( tap == NULL ){
break;
}
@@ -1677,7 +1677,7 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
LOG_DEBUG("Init JTAG chain");
- tap = jtag_NextEnabledTap(NULL);
+ tap = jtag_tap_next_enabled(NULL);
if( tap == NULL ){
LOG_ERROR("There are no enabled taps?");
return ERROR_JTAG_INIT_FAILED;
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index b8e33563..89b1de82 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -184,7 +184,7 @@ extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
extern int jtag_tap_count_enabled(void);
extern int jtag_tap_count(void);
-static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)
+static __inline__ jtag_tap_t* jtag_tap_next_enabled(jtag_tap_t* p)
{
if (p == NULL)
{
diff --git a/src/jtag/jtag_driver.c b/src/jtag/jtag_driver.c
index 55c657e5..ec211bf1 100644
--- a/src/jtag/jtag_driver.c
+++ b/src/jtag/jtag_driver.c
@@ -96,7 +96,7 @@ int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields,
/* loop over all enabled TAPs */
- for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+ for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
{
/* search the input field list for fields for the current TAP */
@@ -138,7 +138,7 @@ int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields,
field++;
}
- assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_NextEnabledTap() not in sync */
+ assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_tap_next_enabled() not in sync */
return ERROR_OK;
}
@@ -182,7 +182,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields,
size_t bypass_devices = 0;
- for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+ for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
{
if (tap->bypass)
bypass_devices++;
@@ -207,7 +207,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields,
/* loop over all enabled TAPs */
- for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+ for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
{
/* if TAP is not bypassed insert matching input fields */
@@ -271,7 +271,7 @@ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
size_t bypass_devices = 0;
- for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+ for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
{
if (tap->bypass)
bypass_devices++;
@@ -299,7 +299,7 @@ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
/* loop over all enabled TAPs */
- for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+ for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
{
/* if TAP is not bypassed insert matching input fields */
diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
index b694cf8d..ad148f1d 100644
--- a/src/jtag/zy1000.c
+++ b/src/jtag/zy1000.c
@@ -511,9 +511,9 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
int j;
int scan_size = 0;
jtag_tap_t *tap, *nextTap;
- for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
+ for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
{
- nextTap=jtag_NextEnabledTap(tap);
+ nextTap=jtag_tap_next_enabled(tap);
tap_state_t end_state;
if (nextTap==NULL)
{
@@ -580,9 +580,9 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s
int j;
jtag_tap_t *tap, *nextTap;
- for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
+ for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
{
- nextTap=jtag_NextEnabledTap(tap);
+ nextTap=jtag_tap_next_enabled(tap);
int found=0;
tap_state_t end_state;
if (nextTap==NULL)
@@ -749,7 +749,7 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little
{
// static int const reg_addr=0x5;
tap_state_t end_state=jtag_get_end_state();
- if (jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL)
+ if (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL)
{
/* better performance via code duplication */
if (little)
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-25 21:01:16 +0000