Eliminate MixedCaps symbol from public JTAG TAP API:

[openocd] / src / flash / str9xpec.c

diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index dc195c148fa1f5ef662a049a74f4ca0008e712b1..1ca7360c09195dcdb41858458b0bf69b237795fc 100644 (file)
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -113,12 +113,7 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
                field.num_bits = tap->ir_length;
                field.out_value = calloc(CEIL(field.num_bits, 8), 1);
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               
                field.in_value = NULL;
-               
-               
-               
-               
 
                jtag_add_ir_scan(1, &field, end_state);
 
@@ -139,14 +134,10 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap)
        field.tap = tap;
        field.num_bits = 8;
        field.out_value = NULL;
-       
        field.in_value = &status;
-       
-       
-       
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        LOG_DEBUG("status: 0x%2.2x", status);
@@ -231,14 +222,10 @@ static int str9xpec_read_config(struct flash_bank_s *bank)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = NULL;
-       
        field.in_value = str9xpec_info->options;
-       
-       
-       
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        status = str9xpec_isc_status(tap);
@@ -338,7 +325,7 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
        arm7_9 = armv4_5->arch_info;
        jtag_info = &arm7_9->jtag_info;
 
-       str9xpec_info->tap = jtag_TapByAbsPosition( jtag_info->tap->abs_chain_position - 1);
+       str9xpec_info->tap = jtag_tap_by_abs_position( jtag_info->tap->abs_chain_position - 1);
        str9xpec_info->isc_enable = 0;
 
        str9xpec_build_block_list(bank);
@@ -383,26 +370,16 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = buffer;
-       
        field.in_value = NULL;
-       
-       
-       
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_add_sleep(40000);
 
        /* read blank check result */
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = NULL;
-       
        field.in_value = buffer;
-       
-       
-       
-       
 
        jtag_add_dr_scan(1, &field, TAP_IRPAUSE);
        jtag_execute_queue();
@@ -499,14 +476,9 @@ static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = buffer;
-       
        field.in_value = NULL;
-       
-       
-       
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        jtag_add_sleep(10);
@@ -565,14 +537,9 @@ static int str9xpec_lock_device(struct flash_bank_s *bank)
                field.tap = tap;
                field.num_bits = 8;
                field.out_value = NULL;
-               
                field.in_value = &status;
-               
-               
-               
-               
 
-               jtag_add_dr_scan(1, &field, -1);
+               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                jtag_execute_queue();
 
        } while(!(status & ISC_STATUS_BUSY));
@@ -651,14 +618,9 @@ static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector)
        field.tap = tap;
        field.num_bits = 8;
        field.out_value = &sector;
-       
        field.in_value = NULL;
-       
-       
-       
-       
 
-       jtag_add_dr_scan(1, &field, -1);
+       jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        return ERROR_OK;
 }
@@ -740,14 +702,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                        field.tap = tap;
                        field.num_bits = 64;
                        field.out_value = (buffer + bytes_written);
-                       
                        field.in_value = NULL;
-                       
-                       
-                       
-                       
 
-                       jtag_add_dr_scan(1, &field, TAP_IDLE);
+                       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
                        /* small delay before polling */
                        jtag_add_sleep(50);
@@ -758,14 +715,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                                field.tap = tap;
                                field.num_bits = 8;
                                field.out_value = NULL;
-                               
                                field.in_value = scanbuf;
-                               
-                               
-                               
-                               
 
-                               jtag_add_dr_scan(1, &field, -1);
+                               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                                jtag_execute_queue();
 
                                status = buf_get_u32(scanbuf, 0, 8);
@@ -800,14 +752,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                field.tap = tap;
                field.num_bits = 64;
                field.out_value = last_dword;
-               
                field.in_value = NULL;
-               
-               
-               
-               
 
-               jtag_add_dr_scan(1, &field, TAP_IDLE);
+               jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
                /* small delay before polling */
                jtag_add_sleep(50);
@@ -818,14 +765,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                        field.tap = tap;
                        field.num_bits = 8;
                        field.out_value = NULL;
-                       
                        field.in_value = scanbuf;
-                       
-                       
-                       
-                       
 
-                       jtag_add_dr_scan(1, &field, -1);
+                       jtag_add_dr_scan(1, &field, jtag_get_end_state());
                        jtag_execute_queue();
 
                        status = buf_get_u32(scanbuf, 0, 8);
@@ -882,14 +824,9 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch
        field.tap = tap;
        field.num_bits = 32;
        field.out_value = NULL;
-       
        field.in_value = buffer;
-       
-       
-       
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        idcode = buf_get_u32(buffer, 0, 32);
@@ -1007,14 +944,9 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = str9xpec_info->options;
-       
        field.in_value = NULL;
-       
-       
-       
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
        /* small delay before polling */
        jtag_add_sleep(50);
@@ -1025,14 +957,9 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
                field.tap = tap;
                field.num_bits = 8;
                field.out_value = NULL;
-               
                field.in_value = &status;
-               
-               
-               
-               
 
-               jtag_add_dr_scan(1, &field, -1);
+               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                jtag_execute_queue();
 
        } while(!(status & ISC_STATUS_BUSY));