This is an automated email from Gerrit.
"Erhan Kurubas <erhan.kuru...@espressif.com>" just uploaded a new patch set to
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7080
-- gerrit
commit 6f5f2b63cd5695fd9e99494b4c37cef8f1defa4d
Author: Erhan Kurubas <erhan.kuru...@espressif.com>
Date: Sun Jul 10 15:38:33 2022 +0300
target/espressif: uncrustify espressif and xtensa files
Files are formatted with uncrustify 0.59 with the below config
tok_split_gte=false
utf8_byte=false
utf8_force=false
indent_cmt_with_tabs=true
indent_align_string=false
indent_braces=false
indent_braces_no_func=false
indent_braces_no_class=false
indent_braces_no_struct=false
indent_brace_parent=false
indent_namespace=false
indent_extern=false
indent_class=false
indent_class_colon=false
indent_else_if=false
indent_var_def_cont=false
indent_func_call_param=true
indent_func_def_param=true
indent_func_proto_param=false
indent_func_class_param=false
indent_func_ctor_var_param=false
indent_template_param=false
indent_func_param_double=true
indent_relative_single_line_comments=false
indent_col1_comment=false
indent_access_spec_body=false
indent_paren_nl=false
indent_comma_paren=false
indent_bool_paren=false
indent_first_bool_expr=false
indent_square_nl=false
indent_preserve_sql=false
indent_align_assign=false
sp_balance_nested_parens=false
align_keep_tabs=false
align_with_tabs=true
align_on_tabstop=false
align_number_left=false
align_func_params=false
align_same_func_call_params=false
align_var_def_colon=false
align_var_def_attribute=false
align_var_def_inline=false
align_right_cmt_mix=false
align_on_operator=false
align_mix_var_proto=false
align_single_line_func=false
align_single_line_brace=false
align_nl_cont=false
align_left_shift=true
align_oc_decl_colon=false
nl_collapse_empty_body=false
nl_assign_leave_one_liners=false
nl_class_leave_one_liners=false
nl_enum_leave_one_liners=false
nl_getset_leave_one_liners=false
nl_func_leave_one_liners=false
nl_if_leave_one_liners=false
nl_multi_line_cond=false
nl_multi_line_define=false
nl_before_case=false
nl_after_case=false
nl_after_return=false
nl_after_semicolon=false
nl_after_brace_open=false
nl_after_brace_open_cmt=false
nl_after_vbrace_open=true
nl_after_vbrace_open_empty=false
nl_after_brace_close=false
nl_after_vbrace_close=false
nl_define_macro=false
nl_squeeze_ifdef=false
nl_ds_struct_enum_cmt=false
nl_ds_struct_enum_close_brace=false
nl_create_if_one_liner=false
nl_create_for_one_liner=false
nl_create_while_one_liner=false
ls_for_split_full=false
ls_func_split_full=false
nl_after_multiline_comment=false
eat_blanks_after_open_brace=true
eat_blanks_before_close_brace=true
mod_pawn_semicolon=false
mod_full_paren_if_bool=false
mod_remove_extra_semicolon=false
mod_sort_import=false
mod_sort_using=false
mod_sort_include=false
mod_move_case_break=false
mod_remove_empty_return=false
cmt_indent_multi=false
cmt_c_group=true
cmt_c_nl_start=false
cmt_c_nl_end=false
cmt_cpp_group=false
cmt_cpp_nl_start=false
cmt_cpp_nl_end=false
cmt_cpp_to_c=true
cmt_star_cont=true
cmt_multi_check_last=false
cmt_insert_before_preproc=false
pp_indent_at_level=false
pp_region_indent_code=false
pp_if_indent_code=false
pp_define_at_level=false
indent_columns=8
indent_continue=8
indent_switch_case=0
nl_start_of_file=remove
nl_end_of_file=force
nl_end_of_file_min=1
nl_max=2
code_width=120
mod_full_brace_nl=2
cmt_width=120
cmt_reflow_mode=2
indent_with_tabs=2
sp_paren_brace=add
sp_inside_paren=remove
sp_return_paren=force
sp_sizeof_paren=remove
sp_before_sparen=force
sp_after_sparen=force
sp_after_cast=remove
sp_inside_braces=force
sp_inside_braces_struct=force
sp_inside_braces_enum=force
sp_cmt_cpp_start=add
sp_assign=force
sp_arith=force
sp_bool=force
sp_compare=force
sp_after_comma=force
sp_func_def_paren=remove
sp_func_call_paren=remove
sp_func_proto_paren=remove
sp_before_ptr_star=force
sp_between_ptr_star=remove
sp_after_ptr_star=remove
sp_before_ptr_star_func=force
sp_inside_sparen=remove
sp_inside_fparen=remove
sp_else_brace=force
sp_brace_else=force
nl_end_of_file=force
nl_assign_brace=remove
nl_enum_brace=remove
nl_struct_brace=remove
nl_union_brace=remove
nl_if_brace=remove
nl_brace_else=remove
nl_elseif_brace=remove
nl_else_brace=remove
nl_for_brace=remove
nl_while_brace=remove
nl_switch_brace=remove
nl_func_type_name=remove
nl_fdef_brace=force
mod_full_brace_for=remove
mod_full_brace_if_chain=1
mod_paren_on_return=remove
Signed-off-by: Erhan Kurubas <erhan.kuru...@espressif.com>
Change-Id: I45567eb0e24a5bceb811c91eb8c2e43792c86986
diff --git a/src/jtag/drivers/esp_usb_jtag.c b/src/jtag/drivers/esp_usb_jtag.c
index a73984a3a1..8dc1fd5f10 100644
--- a/src/jtag/drivers/esp_usb_jtag.c
+++ b/src/jtag/drivers/esp_usb_jtag.c
@@ -243,10 +243,11 @@ static int esp_usb_jtag_quit(void);
/* Try to receive from USB endpoint into the current priv->in_buf */
static int esp_usb_jtag_recv_buf(void)
{
- if (priv->in_buf_size_bits[priv->cur_in_buf_wr] != 0)
+ if (priv->in_buf_size_bits[priv->cur_in_buf_wr] != 0) {
LOG_ERROR("esp_usb_jtag: IN buffer overflow! (%d, size %d)",
priv->cur_in_buf_wr,
priv->in_buf_size_bits[priv->cur_in_buf_wr]);
+ }
unsigned int recvd = 0, ct = (priv->pending_in_bits + 7) / 8;
if (ct > IN_BUF_SZ)
diff --git a/src/target/espressif/esp32.c b/src/target/espressif/esp32.c
index 9d5099be03..8ce6fb87d7 100644
--- a/src/target/espressif/esp32.c
+++ b/src/target/espressif/esp32.c
@@ -83,7 +83,6 @@ implementation.
#define ESP32_RTC_CNTL_SW_CPU_STALL_REG (ESP32_RTCCNTL_BASE + 0xac)
#define ESP32_RTC_CNTL_SW_CPU_STALL_DEF 0x0
-
/* this should map local reg IDs to GDB reg mapping as defined in
xtensa-config.c 'rmap' in
*xtensa-overlay */
static const unsigned int esp32_gdb_regs_mapping[ESP32_NUM_REGS] = {
@@ -414,7 +413,8 @@ static int esp32_soc_reset(struct target *target)
alive_sleep(10);
xtensa_poll(target);
if (timeval_ms() >= timeout) {
- LOG_TARGET_ERROR(target, "Timed out waiting for CPU to
be reset, target state=%d", target->state);
+ LOG_TARGET_ERROR(target, "Timed out waiting for CPU to
be reset, target state=%d",
+ target->state);
get_timeout = true;
break;
}
@@ -494,7 +494,6 @@ static int esp32_virt2phys(struct target *target,
return ERROR_FAIL;
}
-
/* The TDI pin is also used as a flash Vcc bootstrap pin. If we reset the CPU
externally, the last state of the TDI pin
* can allow the power to an 1.8V flash chip to be raised to 3.3V, or the
other way around. Users can use the
* esp32 flashbootstrap command to set a level, and this routine will make
sure the tdi line will return to
diff --git a/src/target/espressif/esp32s2.c b/src/target/espressif/esp32s2.c
index 1bf56b9a77..529716472a 100644
--- a/src/target/espressif/esp32s2.c
+++ b/src/target/espressif/esp32s2.c
@@ -488,7 +488,8 @@ static int esp32s2_soc_reset(struct target *target)
alive_sleep(10);
xtensa_poll(target);
if (timeval_ms() >= timeout) {
- LOG_TARGET_ERROR(target, "Timed out waiting for CPU to
be reset, target state=%d", target->state);
+ LOG_TARGET_ERROR(target, "Timed out waiting for CPU to
be reset, target state=%d",
+ target->state);
return ERROR_TARGET_TIMEOUT;
}
}
diff --git a/src/target/espressif/esp32s3.c b/src/target/espressif/esp32s3.c
index 98515834eb..7b8ff99af0 100644
--- a/src/target/espressif/esp32s3.c
+++ b/src/target/espressif/esp32s3.c
@@ -548,7 +548,6 @@ static int esp32s3_virt2phys(struct target *target,
return ERROR_FAIL;
}
-
static int esp32s3_target_init(struct command_context *cmd_ctx, struct target
*target)
{
return esp_xtensa_target_init(cmd_ctx, target);
diff --git a/src/target/xtensa/xtensa.c b/src/target/xtensa/xtensa.c
index a9559600fd..e74a06b446 100644
--- a/src/target/xtensa/xtensa.c
+++ b/src/target/xtensa/xtensa.c
@@ -32,7 +32,6 @@
#include "xtensa.h"
-
#define _XT_INS_FORMAT_RSR(OPCODE, SR, T) ((OPCODE) \
| (((SR) & 0xFF) << 8) \
| (((T) & 0x0F) << 4))
@@ -348,7 +347,6 @@ const struct xtensa_reg_desc xtensa_regs[XT_NUM_REGS] = {
{ "ddr", 0x68, XT_REG_DEBUG, XT_REGF_NOREAD },
};
-
/**
* Types of memory used at xtensa target
*/
@@ -627,13 +625,11 @@ static int xtensa_write_dirty_registers(struct target
*target)
if (xtensa_regs[i].type == XT_REG_USER) {
if (reg_list[i].exist)
xtensa_queue_exec_ins(xtensa,
-
XT_INS_WUR(xtensa_regs[i].reg_num,
- XT_REG_A3));
+
XT_INS_WUR(xtensa_regs[i].reg_num, XT_REG_A3));
} else if (xtensa_regs[i].type == XT_REG_FR) {
if (reg_list[i].exist)
xtensa_queue_exec_ins(xtensa,
-
XT_INS_WFR(xtensa_regs[i].reg_num,
- XT_REG_A3));
+
XT_INS_WFR(xtensa_regs[i].reg_num, XT_REG_A3));
} else {/*SFR */
if (reg_list[i].exist) {
unsigned int reg_num =
xtensa_regs[i].reg_num;
@@ -667,11 +663,12 @@ static int xtensa_write_dirty_registers(struct target
*target)
unsigned int j =
xtensa_windowbase_offset_to_canonical(i, windowbase);
if (reg_list[i].dirty && reg_list[j].dirty) {
if (memcmp(reg_list[i].value, reg_list[j].value,
- sizeof(xtensa_reg_val_t)) != 0)
+ sizeof(xtensa_reg_val_t)) != 0)
{
LOG_WARNING(
"Warning: Both A%d as well as
the physical register it points to (AR%d) are dirty and differs in value.
Results are undefined!",
i - XT_REG_IDX_A0,
j - XT_REG_IDX_AR0);
+ }
}
}
}
@@ -874,16 +871,16 @@ int xtensa_core_status_check(struct target *target)
needclear = 1;
}
if (dsr & OCDDSR_EXECEXCEPTION) {
- if (!xtensa->suppress_dsr_errors)
+ if (!xtensa->suppress_dsr_errors) {
LOG_TARGET_ERROR(target,
"DSR (%08" PRIX32 ") indicates DIR instruction
generated an exception!",
dsr);
+ }
needclear = 1;
}
if (dsr & OCDDSR_EXECOVERRUN) {
if (!xtensa->suppress_dsr_errors)
- LOG_TARGET_ERROR(target,
- "DSR (%08" PRIX32 ") indicates DIR instruction
generated an overrun!",
+ LOG_TARGET_ERROR(target, "DSR (%08" PRIX32 ") indicates
DIR instruction generated an overrun!",
dsr);
needclear = 1;
}
@@ -939,9 +936,7 @@ int xtensa_deassert_reset(struct target *target)
LOG_TARGET_DEBUG(target, "halt=%d", target->reset_halt);
if (target->reset_halt)
- xtensa_queue_dbg_reg_write(xtensa,
- NARADR_DCRSET,
- OCDDCR_ENABLEOCD | OCDDCR_DEBUGINTERRUPT);
+ xtensa_queue_dbg_reg_write(xtensa, NARADR_DCRSET,
OCDDCR_ENABLEOCD | OCDDCR_DEBUGINTERRUPT);
xtensa_queue_pwr_reg_write(xtensa,
DMREG_PWRCTL,
PWRCTL_JTAGDEBUGUSE | PWRCTL_DEBUGWAKEUP | PWRCTL_MEMWAKEUP |
PWRCTL_COREWAKEUP);
@@ -2649,9 +2644,7 @@ COMMAND_HELPER(xtensa_cmd_tracedump_do, struct xtensa
*xtensa, const char *fname
}
free(tracemem);
if (is_all_zeroes)
- command_print(
- CMD,
- "WARNING: File written is all zeroes. Are you sure you
enabled trace memory?");
+ command_print(CMD, "WARNING: File written is all zeroes. Are
you sure you enabled trace memory?");
return ERROR_OK;
}
diff --git a/src/target/xtensa/xtensa.h b/src/target/xtensa/xtensa.h
index d1ca0b40d2..d6c715de1a 100644
--- a/src/target/xtensa/xtensa.h
+++ b/src/target/xtensa/xtensa.h
@@ -302,7 +302,6 @@ int xtensa_fetch_user_regs_u32(struct target *target);
int xtensa_queue_write_dirty_user_regs_u32(struct target *target);
const char *xtensa_get_gdb_arch(struct target *target);
-
COMMAND_HELPER(xtensa_cmd_permissive_mode_do, struct xtensa *xtensa);
COMMAND_HELPER(xtensa_cmd_mask_interrupts_do, struct xtensa *xtensa);
COMMAND_HELPER(xtensa_cmd_smpbreak_do, struct target *target);
diff --git a/src/target/xtensa/xtensa_debug_module.c
b/src/target/xtensa/xtensa_debug_module.c
index c6959ae8e6..5eecbba2f3 100644
--- a/src/target/xtensa/xtensa_debug_module.c
+++ b/src/target/xtensa/xtensa_debug_module.c
@@ -35,7 +35,6 @@
#define TAPINS_IDCODE_LEN 32
#define TAPINS_BYPASS_LEN 1
-
static void xtensa_dm_add_set_ir(struct xtensa_debug_module *dm, uint8_t value)
{
struct scan_field field;
diff --git a/src/target/xtensa/xtensa_debug_module.h
b/src/target/xtensa/xtensa_debug_module.h
index 692f0f60fc..11300aec65 100644
--- a/src/target/xtensa/xtensa_debug_module.h
+++ b/src/target/xtensa/xtensa_debug_module.h
@@ -352,7 +352,7 @@ static inline bool xtensa_dm_is_online(struct
xtensa_debug_module *dm)
int res = xtensa_dm_device_id_read(dm);
if (res != ERROR_OK)
return false;
- return (dm->device_id != 0xffffffff && dm->device_id != 0);
+ return dm->device_id != 0xffffffff && dm->device_id != 0;
}
static inline bool xtensa_dm_tap_was_reset(struct xtensa_debug_module *dm)
--
