aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2012-05-17 12:27:30 +0100
committerSpencer Oliver <spen@spen-soft.co.uk>2012-05-21 16:15:26 +0000
commit7bfcc10839d2a9190cb7ae9fae02280e643b3450 (patch)
treeabc492151151ee445f06765ce20cfdea5bec9a4e
parenta34b38d621d3598979aecd83a821258bf87a3591 (diff)
downloadriscv-openocd-7bfcc10839d2a9190cb7ae9fae02280e643b3450.zip
riscv-openocd-7bfcc10839d2a9190cb7ae9fae02280e643b3450.tar.gz
riscv-openocd-7bfcc10839d2a9190cb7ae9fae02280e643b3450.tar.bz2
build: add helper/types.h to config.h
this header is used in numerous files and adding to config.h simplifies its use globally. Change-Id: Id724a9950b90504721233022c7fb5768e9bc5548 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/649 Tested-by: jenkins Reviewed-by: Xiaofan <xiaofanc@gmail.com>
-rw-r--r--configure.ac1
-rw-r--r--src/helper/binarybuffer.h2
-rw-r--r--src/helper/command.h2
-rw-r--r--src/helper/fileio.h2
-rw-r--r--src/helper/replacements.h4
-rw-r--r--src/jtag/drivers/libusb0_common.h1
-rw-r--r--src/jtag/drivers/libusb1_common.h1
-rw-r--r--src/jtag/drivers/rlink.h2
-rw-r--r--src/jtag/drivers/ulink.c1
-rw-r--r--src/jtag/drivers/usb_common.h2
-rw-r--r--src/pld/xilinx_bit.h2
-rw-r--r--src/rtos/rtos.h1
-rw-r--r--src/target/arm_disassembler.h2
-rw-r--r--src/target/arm_simulator.h2
-rw-r--r--src/target/armv4_5_cache.h2
-rw-r--r--src/target/avr32_ap7k.h2
-rw-r--r--src/target/avr32_jtag.c1
-rw-r--r--src/target/breakpoints.h2
-rw-r--r--src/target/mips_m4k.h2
-rw-r--r--src/target/register.c1
-rw-r--r--src/target/smp.c1
-rw-r--r--src/target/target.h2
-rw-r--r--src/target/target_type.h1
-rw-r--r--src/target/trace.h2
24 files changed, 1 insertions, 40 deletions
diff --git a/configure.ac b/configure.ac
index 4d7b7d7..642fb2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,7 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER([config.h])
AH_BOTTOM([
#include <helper/system.h>
+#include <helper/types.h>
#include <helper/replacements.h>
])
diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index a289abd..6b142dd 100644
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -24,8 +24,6 @@
#ifndef BINARYBUFFER_H
#define BINARYBUFFER_H
-#include <helper/types.h>
-
/** @file
* Support functions to access arbitrary bits in a byte array
*/
diff --git a/src/helper/command.h b/src/helper/command.h
index 7cd5cc4..6c0e0f6 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -24,8 +24,6 @@
#ifndef COMMAND_H
#define COMMAND_H
-#include <helper/types.h>
-
#include <jim.h>
#include <jim-nvp.h>
diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index bd64424..25b079d 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -27,8 +27,6 @@
#ifndef FILEIO_H
#define FILEIO_H
-#include <helper/types.h>
-
#define FILEIO_MAX_ERROR_STRING (128)
enum fileio_type {
diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index bdd3ae7..7c2e44b 100644
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -139,8 +139,6 @@ static inline unsigned usleep(unsigned int usecs)
#include <windows.h>
#include <time.h>
-#include <helper/types.h>
-
/* Windows does not declare sockaddr_un */
#define UNIX_PATH_LEN 108
struct sockaddr_un {
@@ -230,8 +228,6 @@ static inline int socket_select(int max_fd,
#ifndef HAVE_ELF_H
-#include <helper/types.h>
-
typedef uint32_t Elf32_Addr;
typedef uint16_t Elf32_Half;
typedef uint32_t Elf32_Off;
diff --git a/src/jtag/drivers/libusb0_common.h b/src/jtag/drivers/libusb0_common.h
index 9ca65c5..2473c27 100644
--- a/src/jtag/drivers/libusb0_common.h
+++ b/src/jtag/drivers/libusb0_common.h
@@ -22,7 +22,6 @@
#ifndef JTAG_LIBUSB_COMMON_H
#define JTAG_LIBUSB_COMMON_H
-#include <helper/types.h>
#include <usb.h>
#define jtag_libusb_device usb_device
diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb1_common.h
index 2c570fa..b38fe66 100644
--- a/src/jtag/drivers/libusb1_common.h
+++ b/src/jtag/drivers/libusb1_common.h
@@ -22,7 +22,6 @@
#ifndef JTAG_LIBUSB_COMMON_H
#define JTAG_LIBUSB_COMMON_H
-#include <helper/types.h>
#include <libusb-1.0/libusb.h>
#define jtag_libusb_device libusb_device
diff --git a/src/jtag/drivers/rlink.h b/src/jtag/drivers/rlink.h
index 0217060..9d1099c 100644
--- a/src/jtag/drivers/rlink.h
+++ b/src/jtag/drivers/rlink.h
@@ -18,8 +18,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <helper/types.h>
-
struct rlink_speed_table {
uint8_t const *dtc;
uint16_t dtc_size;
diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index 4de1a77..2638d4e 100644
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -26,7 +26,6 @@
#include <jtag/interface.h>
#include <jtag/commands.h>
#include <target/image.h>
-#include <helper/types.h>
#include "usb_common.h"
#include "OpenULINK/include/msgtypes.h"
diff --git a/src/jtag/drivers/usb_common.h b/src/jtag/drivers/usb_common.h
index 468acf9..ebf0c40 100644
--- a/src/jtag/drivers/usb_common.h
+++ b/src/jtag/drivers/usb_common.h
@@ -20,8 +20,6 @@
#ifndef JTAG_USB_COMMON_H
#define JTAG_USB_COMMON_H
-#include <helper/types.h>
-
#include <usb.h>
int jtag_usb_open(const uint16_t vids[], const uint16_t pids[],
diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h
index 37f1811..131a783 100644
--- a/src/pld/xilinx_bit.h
+++ b/src/pld/xilinx_bit.h
@@ -21,8 +21,6 @@
#ifndef XILINX_BIT_H
#define XILINX_BIT_H
-#include <helper/types.h>
-
struct xilinx_bit_file {
uint8_t unknown_header[13];
uint8_t *source_file;
diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h
index a93daee..d8335b4 100644
--- a/src/rtos/rtos.h
+++ b/src/rtos/rtos.h
@@ -22,7 +22,6 @@
#define RTOS_H
#include "server/server.h"
-#include <helper/types.h>
#include <jim-nvp.h>
typedef int64_t threadid_t;
diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h
index bdfdb03..07564d6 100644
--- a/src/target/arm_disassembler.h
+++ b/src/target/arm_disassembler.h
@@ -21,8 +21,6 @@
#ifndef ARM_DISASSEMBLER_H
#define ARM_DISASSEMBLER_H
-#include <helper/types.h>
-
enum arm_instruction_type {
ARM_UNKNOWN_INSTUCTION,
diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index 3a7ac13..38ba4d4 100644
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -21,8 +21,6 @@
#ifndef ARM_SIMULATOR_H
#define ARM_SIMULATOR_H
-#include <helper/types.h>
-
struct target;
struct arm_sim_interface {
diff --git a/src/target/armv4_5_cache.h b/src/target/armv4_5_cache.h
index fc5e2c7..95273a7 100644
--- a/src/target/armv4_5_cache.h
+++ b/src/target/armv4_5_cache.h
@@ -21,8 +21,6 @@
#ifndef ARMV4_5_CACHE_H
#define ARMV4_5_CACHE_H
-#include <helper/types.h>
-
struct command_context;
struct armv4_5_cachesize {
diff --git a/src/target/avr32_ap7k.h b/src/target/avr32_ap7k.h
index 0b5b281..1e4889a 100644
--- a/src/target/avr32_ap7k.h
+++ b/src/target/avr32_ap7k.h
@@ -20,8 +20,6 @@
#ifndef AVR32_AP7K
#define AVR32_AP7K
-#include <helper/types.h>
-
struct target;
#define AP7k_COMMON_MAGIC 0x4150374b
diff --git a/src/target/avr32_jtag.c b/src/target/avr32_jtag.c
index c88f44e..a363c70 100644
--- a/src/target/avr32_jtag.c
+++ b/src/target/avr32_jtag.c
@@ -22,7 +22,6 @@
#endif
#include "target.h"
-#include "helper/types.h"
#include "jtag/jtag.h"
#include "avr32_jtag.h"
diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 8b1631a..a019e96 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -21,8 +21,6 @@
#ifndef BREAKPOINTS_H
#define BREAKPOINTS_H
-#include <helper/types.h>
-
struct target;
enum breakpoint_type {
diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index 5a9ed77..e21d57e 100644
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -26,8 +26,6 @@
#ifndef MIPS_M4K_H
#define MIPS_M4K_H
-#include <helper/types.h>
-
struct target;
#define MIPSM4K_COMMON_MAGIC 0xB321B321
diff --git a/src/target/register.c b/src/target/register.c
index 65dc24f..ab1e40b 100644
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -25,7 +25,6 @@
#include "config.h"
#endif
-#include <helper/types.h>
#include "register.h"
#include <helper/log.h>
diff --git a/src/target/smp.c b/src/target/smp.c
index c0936ff..9cd4b01 100644
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -23,7 +23,6 @@
#endif
#include "server/server.h"
-#include <helper/types.h>
#include "target/target.h"
diff --git a/src/target/target.h b/src/target/target.h
index 9dc928f..b3025dc 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -33,8 +33,6 @@
#ifndef TARGET_H
#define TARGET_H
-#include <helper/types.h>
-
struct reg;
struct trace;
struct command_context;
diff --git a/src/target/target_type.h b/src/target/target_type.h
index f6f0ea7..7eacd7f 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -27,7 +27,6 @@
#ifndef TARGET_TYPE_H
#define TARGET_TYPE_H
-#include <helper/types.h>
#include <jim-nvp.h>
struct target;
diff --git a/src/target/trace.h b/src/target/trace.h
index 5eaf8c8..ebcf6b0 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -21,8 +21,6 @@
#ifndef TRACE_H
#define TRACE_H
-#include <helper/types.h>
-
struct target;
struct command_context;