Andreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes

[fw/openocd] / src / target / xscale.c

diff --git a/src/target/xscale.c b/src/target/xscale.c
index e07000d52b5a7f192bebd9f402c86c4aea55e24e..71edee2e3108287dcef3c047e61b5b84918436ae 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2006, 2007 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -264,8 +264,8 @@ int xscale_read_dcsr(target_t *target)
 
        jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
-       jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
-       jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+       jtag_check_value_mask(fields + 0, &field0_check_value, &field0_check_mask);
+       jtag_check_value_mask(fields + 2, &field2_check_value, &field2_check_mask);
 
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
@@ -362,11 +362,11 @@ int xscale_receive(target_t *target, uint32_t *buffer, int num_words)
 
                        jtag_add_pathmove(3, path);
 
-                       fields[1].in_value = (uint8_t *)(field1+i);
+                       fields[1].in_value = (uint8_t *)(field1 + i);
 
                        jtag_add_dr_scan_check(3, fields, jtag_set_end_state(TAP_IDLE));
 
-                       jtag_add_callback(xscale_getbuf, (jtag_callback_data_t)(field1+i));
+                       jtag_add_callback(xscale_getbuf, (jtag_callback_data_t)(field1 + i));
 
                        words_scheduled++;
                }
@@ -386,8 +386,8 @@ int xscale_receive(target_t *target, uint32_t *buffer, int num_words)
                                int j;
                                for (j = i; j < num_words - 1; j++)
                                {
-                                       field0[j] = field0[j+1];
-                                       field1[j] = field1[j+1];
+                                       field0[j] = field0[j + 1];
+                                       field1[j] = field1[j + 1];
                                }
                                words_scheduled--;
                        }
@@ -480,8 +480,8 @@ int xscale_read_tx(target_t *target, int consume)
 
                jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
 
-               jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
-               jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+               jtag_check_value_mask(fields + 0, &field0_check_value, &field0_check_mask);
+               jtag_check_value_mask(fields + 2, &field2_check_value, &field2_check_mask);
 
                if ((retval = jtag_execute_queue()) != ERROR_OK)
                {
@@ -563,8 +563,8 @@ int xscale_write_rx(target_t *target)
        {
                jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
 
-               jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
-               jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+               jtag_check_value_mask(fields + 0, &field0_check_value, &field0_check_mask);
+               jtag_check_value_mask(fields + 2, &field2_check_value, &field2_check_mask);
 
                if ((retval = jtag_execute_queue()) != ERROR_OK)
                {
@@ -728,8 +728,8 @@ int xscale_write_dcsr(target_t *target, int hold_rst, int ext_dbg_brk)
 
        jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
-       jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
-       jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+       jtag_check_value_mask(fields + 0, &field0_check_value, &field0_check_mask);
+       jtag_check_value_mask(fields + 2, &field2_check_value, &field2_check_mask);
 
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
@@ -959,7 +959,7 @@ int xscale_arch_state(struct target_s *target)
                        "MMU: %s, D-Cache: %s, I-Cache: %s"
                        "%s",
                         armv4_5_state_strings[armv4_5->core_state],
-                        Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name ,
+                        Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name ,
                         armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
                         buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32),
@@ -1202,7 +1202,7 @@ int xscale_halt(target_t *target)
        xscale_common_t *xscale = armv4_5->arch_info;
 
        LOG_DEBUG("target->state: %s",
-                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+                 target_state_name(target));
 
        if (target->state == TARGET_HALTED)
        {
@@ -1568,7 +1568,7 @@ int xscale_assert_reset(target_t *target)
        xscale_common_t *xscale = armv4_5->arch_info;
 
        LOG_DEBUG("target->state: %s",
-                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+                 target_state_name(target));
 
        /* select DCSR instruction (set endstate to R-T-I to ensure we don't
         * end up in T-L-R, which would reset JTAG
@@ -3693,7 +3693,7 @@ int xscale_register_commands(struct command_context_s *cmd_ctx)
 
        register_command(cmd_ctx, xscale_cmd, "vector_catch", xscale_handle_vector_catch_command, COMMAND_EXEC, "<mask> of vectors that should be catched");
 
-       register_command(cmd_ctx, xscale_cmd, "trace_buffer", xscale_handle_trace_buffer_command, COMMAND_EXEC, "<enable|disable> ['fill' [n]|'wrap']");
+       register_command(cmd_ctx, xscale_cmd, "trace_buffer", xscale_handle_trace_buffer_command, COMMAND_EXEC, "<enable | disable> ['fill' [n]|'wrap']");
 
        register_command(cmd_ctx, xscale_cmd, "dump_trace", xscale_handle_dump_trace_command, COMMAND_EXEC, "dump content of trace buffer to <file>");
        register_command(cmd_ctx, xscale_cmd, "analyze_trace", xscale_handle_analyze_trace_buffer_command, COMMAND_EXEC, "analyze content of trace buffer");