mark usage of in_handler that can be converted into user code

git-svn-id: svn://svn.berlios.de/openocd/trunk@1607 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 7be68037ddac49a9ace7d0c910172af364f3f9f8..26f0f1fef3919ae860d4ec77541f76facc292eed 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -121,7 +121,7 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word
        scan_field.in_value = NULL;
        scan_field.in_check_value = NULL;
        scan_field.in_check_mask = NULL;
        scan_field.in_value = NULL;
        scan_field.in_check_value = NULL;
        scan_field.in_check_mask = NULL;

-       scan_field.in_handler = virtex2_jtag_buf_to_u32;
+       scan_field.in_handler = virtex2_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

 
        virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
 
 
        virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
 

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 2b684b945715d9c61189fed4d4e7bcb21c90389d..2f474212f11e75700ff5587c216bb4c9de7d81fb 100644 (file)
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -180,7 +180,7 @@ void arm11_add_debug_SCAN_N(arm11_common_t * arm11, u8 chain, tap_state_t state)
 
        arm11_setup_field(arm11, 5, &chain, NULL, &field);
 
 
        arm11_setup_field(arm11, 5, &chain, NULL, &field);
 

-       field.in_handler = arm11_in_handler_SCAN_N;
+       field.in_handler = arm11_in_handler_SCAN_N; /* deprecated! invoke this from user code! */

 
        arm11_add_dr_scan_vc(1, &field, state == ARM11_TAP_DEFAULT ? TAP_DRPAUSE : state);
 }
 
        arm11_add_dr_scan_vc(1, &field, state == ARM11_TAP_DEFAULT ? TAP_DRPAUSE : state);
 }

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 99eede20659c8b1d140f7c53d005229f5557afb1..6cd73e458913f13f957c7e4619f5d8739c91bbbd 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -126,7 +126,7 @@ int arm720t_scan_cp15(target_t *target, u32 out, u32 *in, int instruction, int c
        fields[1].in_value = NULL;
        if (in)
        {
        fields[1].in_value = NULL;
        if (in)
        {

-               fields[1].in_handler = arm_jtag_buf_to_u32_flip;
+               fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */

                fields[1].in_handler_priv = in;
        } else
        {
                fields[1].in_handler_priv = in;
        } else
        {

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 1a448fc33e0b4b5e21ceccde8dac9b8a887d33de..c20594983d0a8416e426b3adabc68a758e9d7515 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -210,7 +210,7 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        fields[1].out_value = NULL;
        fields[1].out_mask = NULL;
        fields[1].in_value = NULL;
        fields[1].out_value = NULL;
        fields[1].out_mask = NULL;
        fields[1].in_value = NULL;

-       fields[1].in_handler = arm_jtag_buf_to_u32_flip;
+       fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */

        fields[1].in_handler_priv = in;
        fields[1].in_check_value = NULL;
        fields[1].in_check_mask = NULL;
        fields[1].in_handler_priv = in;
        fields[1].in_check_value = NULL;
        fields[1].in_check_mask = NULL;


@@ -274,13 +274,13 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
        switch (size)
        {
                case 4:
        switch (size)
        {
                case 4:

-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip;
+                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip; /* deprecated! invoke this from user code! */

                        break;
                case 2:
                        break;
                case 2:

-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip;
+                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip; /* deprecated! invoke this from user code! */

                        break;
                case 1:
                        break;
                case 1:

-                       fields[1].in_handler = arm_jtag_buf_to_8_flip;
+                       fields[1].in_handler = arm_jtag_buf_to_8_flip; /* deprecated! invoke this from user code! */

                        break;
        }
        fields[1].in_handler_priv = in;
                        break;
        }
        fields[1].in_handler_priv = in;

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 29f5b15dee80da415f04e7707f9ba5596cde4f86..cc6ba0a303ebaa5e82ed821c708b594468bbd603 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -153,7 +153,7 @@ int arm920t_read_cp15_physical(target_t *target, int reg_addr, u32 *value)
        jtag_add_dr_scan(4, fields, TAP_INVALID);
 
        fields[1].in_handler_priv = value;
        jtag_add_dr_scan(4, fields, TAP_INVALID);
 
        fields[1].in_handler_priv = value;

-       fields[1].in_handler = arm_jtag_buf_to_u32;
+       fields[1].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

 
        jtag_add_dr_scan(4, fields, TAP_INVALID);
 
 
        jtag_add_dr_scan(4, fields, TAP_INVALID);
 

diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index a6ef5e10cce1758b7a74cd7ab9b4aea6646089e7..8b81c0bfed6fad0147d7369cd3824abaeb36a261 100644 (file)
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -177,7 +177,7 @@ int arm926ejs_cp15_read(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u3
        jtag_add_dr_scan(4, fields, TAP_INVALID);
 
        fields[0].in_handler_priv = value;
        jtag_add_dr_scan(4, fields, TAP_INVALID);
 
        fields[0].in_handler_priv = value;

-       fields[0].in_handler = arm_jtag_buf_to_u32;
+       fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

 
        /*TODO: add timeout*/
        do
 
        /*TODO: add timeout*/
        do

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index dbe707356eee511960f4f773a26a0d1f7b18b386..eee964d797d0dba0922f0ab2f856c8e466333179 100644 (file)
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -217,7 +217,7 @@ int arm966e_read_cp15(target_t *target, int reg_addr, u32 *value)
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
        fields[0].in_handler_priv = value;
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
        fields[0].in_handler_priv = value;

-       fields[0].in_handler = arm_jtag_buf_to_u32;
+       fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 1aab2864f48b8c8e35b3d6619ed93beee5c0481f..95358c43621ee1536732ba558fc085f43fdb7054 100644 (file)
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -220,7 +220,7 @@ int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int s
        fields[0].in_value = NULL;
        if (in)
        {
        fields[0].in_value = NULL;
        if (in)
        {

-               fields[0].in_handler = arm_jtag_buf_to_u32;
+               fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

                fields[0].in_handler_priv = in;
        }
        else
                fields[0].in_handler_priv = in;
        }
        else


@@ -293,7 +293,7 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        fields[0].out_value = NULL;
        fields[0].out_mask = NULL;
        fields[0].in_value = NULL;
        fields[0].out_value = NULL;
        fields[0].out_mask = NULL;
        fields[0].in_value = NULL;

-       fields[0].in_handler = arm_jtag_buf_to_u32;
+       fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

        fields[0].in_handler_priv = in;
        fields[0].in_check_value = NULL;
        fields[0].in_check_mask = NULL;
        fields[0].in_handler_priv = in;
        fields[0].in_check_value = NULL;
        fields[0].in_check_mask = NULL;


@@ -368,13 +368,13 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
        switch (size)
        {
                case 4:
        switch (size)
        {
                case 4:

-                       fields[0].in_handler = (be) ? arm_jtag_buf_to_be32 : arm_jtag_buf_to_le32;
+                       fields[0].in_handler = (be) ? arm_jtag_buf_to_be32 : arm_jtag_buf_to_le32; /* deprecated! invoke this from user code! */

                        break;
                case 2:
                        break;
                case 2:

-                       fields[0].in_handler = (be) ? arm_jtag_buf_to_be16 : arm_jtag_buf_to_le16;
+                       fields[0].in_handler = (be) ? arm_jtag_buf_to_be16 : arm_jtag_buf_to_le16; /* deprecated! invoke this from user code! */

                        break;
                case 1:
                        break;
                case 1:

-                       fields[0].in_handler = arm_jtag_buf_to_8;
+                       fields[0].in_handler = arm_jtag_buf_to_8; /* deprecated! invoke this from user code! */

                        break;
        }
        fields[0].in_handler_priv = in;
                        break;
        }
        fields[0].in_handler_priv = in;

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index b0474b63a0bd2942191689074216840bac49ae66..0ce994c7866e02dff7f8a2ce15314d38805ed1a8 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -127,7 +127,7 @@ int adi_jtag_dp_scan_u32(arm_jtag_t *jtag_info, u8 instr, u8 reg_addr, u8 RnW, u
        fields[1].in_value = NULL;
        if (invalue)
        {
        fields[1].in_value = NULL;
        if (invalue)
        {

-               fields[1].in_handler = arm_jtag_buf_to_u32;
+               fields[1].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

                fields[1].in_handler_priv = invalue;
        }
        else
                fields[1].in_handler_priv = invalue;
        }
        else

diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index b663c1de8026fd379543a1e307e473c21ee06de7..bd7fd3ae02f16d88ffcaa6c79a5230b66bf31e47 100644 (file)
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -352,7 +352,7 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size)
                if (size == 1)
                        buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
 
                if (size == 1)
                        buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
 

-               fields[0].in_handler = arm_jtag_buf_to_u32;
+               fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */

                fields[0].in_handler_priv = data;
                jtag_add_dr_scan(3, fields, TAP_INVALID);
 
                fields[0].in_handler_priv = data;
                jtag_add_dr_scan(3, fields, TAP_INVALID);
 

diff --git a/src/target/etb.c b/src/target/etb.c
index d9b067476017677a59517b417d1e79ad2dfe155b..5af9b910e628e9d93fd9fe1500b0fb0f00eef847 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -217,7 +217,7 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 

-       fields[0].in_handler = buf_to_u32_handler;
+       fields[0].in_handler = buf_to_u32_handler; /* deprecated! invoke this from user code! */

 
        for (i = 0; i < num_frames; i++)
        {
 
        for (i = 0; i < num_frames; i++)
        {

diff --git a/src/target/xscale.c b/src/target/xscale.c
index dec1ede90410a6eaf80e0579c88334acb5b16f93..d270bf4f706e136576d12d6585b4b022825eab83 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -373,8 +373,8 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
                for (i = words_done; i < num_words; i++)
                {
                        fields[0].in_value = &field0[i];
                for (i = words_done; i < num_words; i++)
                {
                        fields[0].in_value = &field0[i];

-                       fields[1].in_handler = buf_to_u32_handler;
-                       fields[1].in_handler_priv = (u8*)&field1[i];
+                       fields[1].in_handler = buf_to_u32_handler; /* deprecated! invoke this from user code! */
+                       fields[1].in_handler_priv = (u8*)&field1[i]; 

 
                        jtag_add_pathmove(3, path);
                        jtag_add_dr_scan(3, fields, TAP_IDLE);
 
                        jtag_add_pathmove(3, path);
                        jtag_add_dr_scan(3, fields, TAP_IDLE);