From 05752557dd0dcab76250ab12377d59435b74204d Mon Sep 17 00:00:00 2001 From: Yasushi SHOJI Date: Sun, 29 Aug 2021 18:18:01 +0900 Subject: [PATCH] helper: Remove src/helper from include dirs The header files under src/helper/ can currently be included with either #include or #include This is because we specify both "src/" and "src/helper/" directories as include directories. Some files name under "src/helper/", such as types.h, log.h, and util.h are too generic and could be ambiguous depending on the search path. This commit remove "src/helper/" from our include dir and make C files include explicitly. Change-Id: I38fc9b96ba01a513d4a72757d40007e21b502f25 Signed-off-by: Yasushi SHOJI Reviewed-on: https://review.openocd.org/c/openocd/+/6507 Tested-by: jenkins Reviewed-by: Antonio Borneo --- Makefile.am | 1 - src/flash/nor/psoc6.c | 4 ++-- src/flash/nor/stm32l4x.c | 2 +- src/helper/command.h | 2 +- src/helper/jim-nvp.c | 2 +- src/jtag/drivers/libusb_helper.c | 2 +- src/rtos/rtos.h | 2 +- src/server/server.c | 2 +- src/target/armv7m_trace.h | 2 +- src/target/mips64_pracc.c | 2 +- src/target/riscv/riscv-011.c | 2 +- src/target/riscv/riscv-013.c | 2 +- src/target/riscv/riscv.c | 8 ++++---- src/target/riscv/riscv_semihosting.c | 2 +- src/target/target_type.h | 2 +- 15 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3858093b6..7e5e22973 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,6 @@ AM_CFLAGS = $(GCC_WARNINGS) AM_CPPFLAGS = $(HOST_CPPFLAGS)\ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src/helper \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DBINDIR=\"$(bindir)\" diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c index a929d3304..8a4121950 100644 --- a/src/flash/nor/psoc6.c +++ b/src/flash/nor/psoc6.c @@ -24,12 +24,12 @@ #include #include "imp.h" -#include +#include "helper/time_support.h" +#include "target/arm_adi_v5.h" #include "target/target.h" #include "target/cortex_m.h" #include "target/breakpoints.h" #include "target/target_type.h" -#include "time_support.h" #include "target/algorithm.h" /************************************************************************************************** diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c index a363cd42d..e5100a015 100644 --- a/src/flash/nor/stm32l4x.c +++ b/src/flash/nor/stm32l4x.c @@ -26,10 +26,10 @@ #include "imp.h" #include #include +#include #include #include #include -#include "bits.h" #include "stm32l4x.h" /* STM32L4xxx series for reference. diff --git a/src/helper/command.h b/src/helper/command.h index f38701983..fb9e50c85 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -24,8 +24,8 @@ #include #include -#include +#include #include #include diff --git a/src/helper/jim-nvp.c b/src/helper/jim-nvp.c index e21bc680d..738ed7943 100644 --- a/src/helper/jim-nvp.c +++ b/src/helper/jim-nvp.c @@ -41,8 +41,8 @@ * official policies, either expressed or implied, of the Jim Tcl Project. */ +#include "jim-nvp.h" #include -#include int jim_get_nvp(Jim_Interp *interp, Jim_Obj *objptr, const struct jim_nvp *nvp_table, const struct jim_nvp **result) diff --git a/src/jtag/drivers/libusb_helper.c b/src/jtag/drivers/libusb_helper.c index f285bdcac..3308d8742 100644 --- a/src/jtag/drivers/libusb_helper.c +++ b/src/jtag/drivers/libusb_helper.c @@ -20,9 +20,9 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include #include #include "libusb_helper.h" -#include "log.h" /* * comment from libusb: diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h index dc7a64f43..8309de402 100644 --- a/src/rtos/rtos.h +++ b/src/rtos/rtos.h @@ -21,7 +21,7 @@ #include "server/server.h" #include "target/target.h" -#include +#include typedef int64_t threadid_t; typedef int64_t symbol_address_t; diff --git a/src/server/server.c b/src/server/server.c index 64acd3689..3f579bfc6 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -27,13 +27,13 @@ #endif #include "server.h" +#include #include #include #include #include "openocd.h" #include "tcl_server.h" #include "telnet_server.h" -#include "time_support.h" #include diff --git a/src/target/armv7m_trace.h b/src/target/armv7m_trace.h index eaee6a48f..7e4977aba 100644 --- a/src/target/armv7m_trace.h +++ b/src/target/armv7m_trace.h @@ -18,8 +18,8 @@ #ifndef OPENOCD_TARGET_ARMV7M_TRACE_H #define OPENOCD_TARGET_ARMV7M_TRACE_H +#include #include -#include /** * @file diff --git a/src/target/mips64_pracc.c b/src/target/mips64_pracc.c index b2af39ced..9583ad767 100644 --- a/src/target/mips64_pracc.c +++ b/src/target/mips64_pracc.c @@ -20,7 +20,7 @@ #include "mips64.h" #include "mips64_pracc.h" -#include "time_support.h" +#include #define STACK_DEPTH 32 diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c index 7a5e990ca..86a95f635 100644 --- a/src/target/riscv/riscv-011.c +++ b/src/target/riscv/riscv-011.c @@ -16,7 +16,7 @@ #include "target/target.h" #include "target/algorithm.h" #include "target/target_type.h" -#include "log.h" +#include #include "jtag/jtag.h" #include "target/register.h" #include "target/breakpoints.h" diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index 24fb79ccf..fdebdd413 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -16,7 +16,7 @@ #include "target/target.h" #include "target/algorithm.h" #include "target/target_type.h" -#include "log.h" +#include #include "jtag/jtag.h" #include "target/register.h" #include "target/breakpoints.h" diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c index 8f1f398b3..07fb95550 100644 --- a/src/target/riscv/riscv.c +++ b/src/target/riscv/riscv.c @@ -8,14 +8,14 @@ #include "config.h" #endif +#include +#include #include "target/target.h" #include "target/algorithm.h" #include "target/target_type.h" -#include "log.h" #include "jtag/jtag.h" #include "target/register.h" #include "target/breakpoints.h" -#include "helper/time_support.h" #include "riscv.h" #include "gdb_regs.h" #include "rtos/rtos.h" @@ -1870,10 +1870,10 @@ static int riscv_checksum_memory(struct target *target, LOG_DEBUG("address=0x%" TARGET_PRIxADDR "; count=0x%" PRIx32, address, count); static const uint8_t riscv32_crc_code[] = { -#include "../../contrib/loaders/checksum/riscv32_crc.inc" +#include "contrib/loaders/checksum/riscv32_crc.inc" }; static const uint8_t riscv64_crc_code[] = { -#include "../../contrib/loaders/checksum/riscv64_crc.inc" +#include "contrib/loaders/checksum/riscv64_crc.inc" }; static const uint8_t *crc_code; diff --git a/src/target/riscv/riscv_semihosting.c b/src/target/riscv/riscv_semihosting.c index 90b8ddb4f..0072b9afe 100644 --- a/src/target/riscv/riscv_semihosting.c +++ b/src/target/riscv/riscv_semihosting.c @@ -41,7 +41,7 @@ #include "config.h" #endif -#include "log.h" +#include #include "target/target.h" #include "target/semihosting_common.h" diff --git a/src/target/target_type.h b/src/target/target_type.h index cf30cf8cc..d6b6086b3 100644 --- a/src/target/target_type.h +++ b/src/target/target_type.h @@ -25,7 +25,7 @@ #ifndef OPENOCD_TARGET_TARGET_TYPE_H #define OPENOCD_TARGET_TARGET_TYPE_H -#include +#include struct target;