This is a second example of how to remove in_handler usage handling
it on the caller side.
This example focuses on a more or less mechanical fix with changing
as little code as possible. From here the code can be cleaned up
significantly, but I'm splitting that into a separate patch for illustration
purposes.
--
Øyvind Harboe
Embedded software and hardware consulting services
http://consulting.zylin.com
### Eclipse Workspace Patch 1.0
#P openocd
Index: src/target/arm7tdmi.c
===================================================================
--- src/target/arm7tdmi.c (revision 1629)
+++ src/target/arm7tdmi.c (working copy)
@@ -256,28 +256,39 @@
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 = NULL;
- fields[1].in_value = NULL;
+ u8 tmp[4];
+ fields[1].in_value = tmp;
+ fields[1].in_handler = NULL;
+
+ jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+
switch (size)
{
case 4:
- fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip
: arm_jtag_buf_to_le32_flip; /* deprecated! invoke this from user code! */
+ if (be)
+ {
+ h_u32_to_be(((u8*)in),
flip_u32(le_to_h_u32(tmp), 32));
+ } else
+ {
+ h_u32_to_le(((u8*)in),
flip_u32(le_to_h_u32(tmp), 32));
+ }
break;
case 2:
- fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip
: arm_jtag_buf_to_le16_flip; /* deprecated! invoke this from user code! */
+ if (be)
+ {
+ h_u16_to_be(((u8*)in),
flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
+ } else
+ {
+ h_u16_to_le(((u8*)in),
flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
+ }
break;
case 1:
- fields[1].in_handler = arm_jtag_buf_to_8_flip; /*
deprecated! invoke this from user code! */
+ *((u8 *)in)= flip_u32(le_to_h_u32(tmp), 32) & 0xff;
break;
}
- fields[1].in_handler_priv = in;
-
-
-
- jtag_add_dr_scan(2, fields, TAP_INVALID);
jtag_add_runtest(0, TAP_INVALID);
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
