remove in_handler usage
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Thu, 7 May 2009 13:26:35 +0000 (13:26 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Thu, 7 May 2009 13:26:35 +0000 (13:26 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@1640 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/target/arm720t.c

index 3cbb653..ec1b323 100644 (file)
@@ -112,31 +112,24 @@ int arm720t_scan_cp15(target_t *target, u32 out, u32 *in, int instruction, int c
        fields[0].tap = jtag_info->tap;
        fields[0].num_bits = 1;
        fields[0].out_value = &instruction_buf;
-       
        fields[0].in_value = NULL;
-       
-       
        fields[0].in_handler = NULL;
-       
 
        fields[1].tap = jtag_info->tap;
        fields[1].num_bits = 32;
        fields[1].out_value = out_buf;
-       
        fields[1].in_value = NULL;
+       fields[1].in_handler = NULL;
        if (in)
        {
-               fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
-               fields[1].in_handler_priv = in;
+               u8 tmp[4];
+               fields[1].in_value = tmp;
+               jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+               *in=flip_u32(le_to_h_u32(tmp), 32);
        } else
        {
-               fields[1].in_handler = NULL;
-               
+               jtag_add_dr_scan(2, fields, TAP_INVALID);
        }
-       
-       
-
-       jtag_add_dr_scan(2, fields, TAP_INVALID);
 
        if (clock)
                jtag_add_runtest(0, TAP_INVALID);