target read/write is no longer attempted for target_xxx() functions when the target...

[openocd] / src / pld / virtex2.c

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index ab715d927be5a8f025545270e6d4bd50ed1ac655..e0ec27deda6d6b2530cd816d9c5033e14f868079 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -62,7 +62,7 @@ int virtex2_set_instr(int chain_pos, u32 new_instr)
                field.in_handler = NULL;
                field.in_handler_priv = NULL;
                
-               jtag_add_ir_scan(1, &field, TAP_RTI, NULL);
+               jtag_add_ir_scan(1, &field, TAP_RTI);
                
                free(field.out_value);
        }
@@ -94,14 +94,14 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)
        
        virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */
        
-       jtag_add_dr_scan(1, &scan_field, TAP_PD, NULL);
+       jtag_add_dr_scan(1, &scan_field, TAP_PD);
        
        free(values);
        
        return ERROR_OK;
 }
 
-int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv)
+int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)
 {
        u32 *dest = priv;
        *dest = flip_u32(le_to_h_u32(in_buf), 32);
@@ -127,7 +127,7 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word
        while (num_words--)
        {
                scan_field.in_handler_priv = words++;
-               jtag_add_dr_scan(1, &scan_field, TAP_PD, NULL);
+               jtag_add_dr_scan(1, &scan_field, TAP_PD);
        }
        
        return ERROR_OK;
@@ -137,7 +137,7 @@ int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
 {
        u32 data[5];
        
-       jtag_add_statemove(TAP_TLR);
+       jtag_add_tlr();
        
        data[0] = 0xaa995566; /* synch word */
        data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */
@@ -150,7 +150,7 @@ int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
        
        jtag_execute_queue();
        
-       DEBUG("status: 0x%8.8x", *status);
+       LOG_DEBUG("status: 0x%8.8x", *status);
        
        return ERROR_OK;
 }
@@ -189,10 +189,10 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename)
        field.num_bits = bit_file.length * 8;
        field.out_value = bit_file.data;
 
-       jtag_add_dr_scan(1, &field, TAP_PD, NULL);
+       jtag_add_dr_scan(1, &field, TAP_PD);
        jtag_execute_queue();
        
-       jtag_add_statemove(TAP_TLR);
+       jtag_add_tlr();
        
        jtag_add_end_state(TAP_RTI);
        virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */
@@ -251,7 +251,7 @@ int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, cha
        
        if (argc < 2)
        {
-               WARNING("incomplete pld device 'virtex2' configuration");
+               LOG_WARNING("incomplete pld device 'virtex2' configuration");
                return ERROR_PLD_DEVICE_INVALID;
        }