Menu
▾
▴
[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-391-gb695cb7
|
From: David B. <dbr...@us...> - 2009-11-16 09:35:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via b695cb75220100cd9bbfaec5bd1740958454130d (commit)
via 8193f17c3aeb948ca8f70ed3361e8b2bccefffed (commit)
via 1186f7efa72a86a7000dce60b090bd4f822cdceb (commit)
via db094c2e60176b3c63ce788159b04a7024ad1010 (commit)
via aa7c449600d6f6d634f587de6091421a1a877af5 (commit)
from 5d1a9033ab89b017c95e79590d76abbfa61f7512 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b695cb75220100cd9bbfaec5bd1740958454130d
Author: David Brownell <dbr...@us...>
Date: Mon Nov 16 00:35:24 2009 -0800
#include "target.h" less wildly
Don't include "target.h" from more headers than necessary. This
avoids needless interdependencies and duplicated include paths.
Don't needlessly include it in source files, either.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/ecosboard.c b/src/ecosboard.c
index 95d41cb..0cbba3e 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -26,7 +26,6 @@
#include "configuration.h"
#include "xsvf.h"
#include "svf.h"
-#include "target.h"
#include "nand.h"
#include "pld.h"
diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index 0f2be3c..4507888 100644
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -62,7 +62,6 @@
#include <stddef.h>
#include "types.h"
#include "flash.h"
-#include "target.h"
#include "membuf.h"
#include "at91sam3.h"
#include "time_support.h"
diff --git a/src/flash/lpc3180_nand_controller.h b/src/flash/lpc3180_nand_controller.h
index b965be9..0891ced 100644
--- a/src/flash/lpc3180_nand_controller.h
+++ b/src/flash/lpc3180_nand_controller.h
@@ -20,8 +20,6 @@
#ifndef LPC3180_NAND_CONTROLLER_H
#define LPC3180_NAND_CONTROLLER_H
-#include "target.h"
-
enum lpc3180_selected_controller
{
LPC3180_NO_CONTROLLER,
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index c2d04ca..49dc432 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -22,6 +22,7 @@
#endif
#include "mflash.h"
+#include "target.h"
#include "time_support.h"
#include "fileio.h"
#include "log.h"
diff --git a/src/flash/mflash.h b/src/flash/mflash.h
index ed4a2cd..358d253 100644
--- a/src/flash/mflash.h
+++ b/src/flash/mflash.h
@@ -20,7 +20,7 @@
#ifndef _MFLASH_H
#define _MFLASH_H
-#include "target.h"
+struct command_context;
typedef unsigned long mg_io_uint32;
typedef unsigned short mg_io_uint16;
diff --git a/src/openocd.c b/src/openocd.c
index e35a0ae..4c07511 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -32,7 +32,6 @@
#include "configuration.h"
#include "xsvf.h"
#include "svf.h"
-#include "target.h"
#include "nand.h"
#include "pld.h"
#include "mflash.h"
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 21db296..f6b44cd 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -27,12 +27,12 @@
#include "config.h"
#endif
-#include "gdb_server.h"
#include "breakpoints.h"
#include "target_request.h"
#include "register.h"
#include "server.h"
#include "flash.h"
+#include "gdb_server.h"
#include "image.h"
#include "jtag.h"
diff --git a/src/server/gdb_server.h b/src/server/gdb_server.h
index 4513e8a..a8e8dad 100644
--- a/src/server/gdb_server.h
+++ b/src/server/gdb_server.h
@@ -26,8 +26,6 @@
#ifndef GDB_SERVER_H
#define GDB_SERVER_H
-#include "target.h"
-
struct image;
#define GDB_BUFFER_SIZE 16384
diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 9aac806..a78193c 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -23,7 +23,6 @@
#ifndef ARM_ADI_V5_H
#define ARM_ADI_V5_H
-#include "target.h"
#include "arm_jtag.h"
#define DAP_IR_DPACC 0xA
diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c
index d84da48..4651960 100644
--- a/src/target/armv4_5_mmu.c
+++ b/src/target/armv4_5_mmu.c
@@ -22,6 +22,7 @@
#endif
#include "log.h"
+#include "target.h"
#include "armv4_5_mmu.h"
diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h
index bbe50c6..6b9ed34 100644
--- a/src/target/armv4_5_mmu.h
+++ b/src/target/armv4_5_mmu.h
@@ -21,7 +21,8 @@
#define ARMV4_5_MMU_H
#include "armv4_5_cache.h"
-#include "target.h"
+
+struct target;
struct armv4_5_mmu_common
{
diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 7b33053..7f2c387 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -25,7 +25,6 @@
#include "armv7a.h"
#include "arm_disassembler.h"
-#include "target.h"
#include "register.h"
#include "binarybuffer.h"
#include "command.h"
diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index facd150..a4be9e2 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -19,7 +19,6 @@
#ifndef ARMV7A_H
#define ARMV7A_H
-#include "target.h"
#include "arm_adi_v5.h"
#include "armv4_5.h"
#include "armv4_5_mmu.h"
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 7ccdf54..d8718f9 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -35,6 +35,7 @@
#endif
#include "breakpoints.h"
+#include "target.h"
#include "armv7m.h"
#include "algorithm.h"
#include "register.h"
diff --git a/src/target/cortex_a8.h b/src/target/cortex_a8.h
index 230008a..393a310 100644
--- a/src/target/cortex_a8.h
+++ b/src/target/cortex_a8.h
@@ -29,7 +29,6 @@
#ifndef CORTEX_A8_H
#define CORTEX_A8_H
-#include "target.h"
#include "armv7a.h"
extern char* cortex_a8_state_strings[];
diff --git a/src/target/target_request.c b/src/target/target_request.c
index 283ce55..7215155 100644
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -27,6 +27,7 @@
#include "config.h"
#endif
+#include "target.h"
#include "target_request.h"
#include "target_type.h"
#include "binarybuffer.h"
diff --git a/src/target/target_request.h b/src/target/target_request.h
index cc9f3b9..e50c425 100644
--- a/src/target/target_request.h
+++ b/src/target/target_request.h
@@ -26,7 +26,8 @@
#ifndef TARGET_REQUEST_H
#define TARGET_REQUEST_H
-#include "target.h"
+struct target;
+struct command_context;
typedef enum target_req_cmd
{
commit 8193f17c3aeb948ca8f70ed3361e8b2bccefffed
Author: David Brownell <dbr...@us...>
Date: Mon Nov 16 00:35:14 2009 -0800
target: no implicit #includes of "register.h"
Same deal: "register.h" got needlessly included all over the
place because of being in a few widely included headers.
So take it out of the header files which included it, and put
it in files which use it ... reduce needless interdependencies.
Also, don't need that extra "types.h" inclusion.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/target/arm11.c b/src/target/arm11.c
index cdeb420..46f332e 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -34,6 +34,7 @@
#include "time_support.h"
#include "target_type.h"
#include "algorithm.h"
+#include "register.h"
#if 0
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 7bfb97d..5d83517 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -27,6 +27,7 @@
#include "arm720t.h"
#include "time_support.h"
#include "target_type.h"
+#include "register.h"
/*
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 76c79c3..780ccf9 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -37,6 +37,7 @@
#include "time_support.h"
#include "arm_simulator.h"
#include "algorithm.h"
+#include "register.h"
/**
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 51fbddf..ba993ee 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -29,6 +29,7 @@
#include "arm7tdmi.h"
#include "target_type.h"
+#include "register.h"
/*
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index fd61020..fca3743 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -24,6 +24,7 @@
#include "arm920t.h"
#include "time_support.h"
#include "target_type.h"
+#include "register.h"
/*
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 00b7865..f305390 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -27,6 +27,7 @@
#include "arm926ejs.h"
#include "time_support.h"
#include "target_type.h"
+#include "register.h"
/*
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 1b7b645..8e8f4d6 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -29,6 +29,7 @@
#include "arm9tdmi.h"
#include "target_type.h"
+#include "register.h"
/*
diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 56b6206..9aac806 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -24,7 +24,6 @@
#define ARM_ADI_V5_H
#include "target.h"
-#include "register.h"
#include "arm_jtag.h"
#define DAP_IR_DPACC 0xA
diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 120d5b9..a353c13 100644
--- a/src/target/arm_simulator.c
+++ b/src/target/arm_simulator.c
@@ -28,6 +28,7 @@
#include "arm_disassembler.h"
#include "arm_simulator.h"
#include "binarybuffer.h"
+#include "register.h"
static uint32_t arm_shift(uint8_t shift, uint32_t Rm,
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index e6e0bd7..884f8f6 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -32,6 +32,7 @@
#include "arm_disassembler.h"
#include "binarybuffer.h"
#include "algorithm.h"
+#include "register.h"
char* armv4_5_core_reg_list[] =
diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index 6c0b881..ea46488 100644
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -26,7 +26,6 @@
#ifndef ARMV4_5_H
#define ARMV4_5_H
-#include "register.h"
#include "target.h"
#include "etm.h"
diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 625c3a9..facd150 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -19,7 +19,6 @@
#ifndef ARMV7A_H
#define ARMV7A_H
-#include "register.h"
#include "target.h"
#include "arm_adi_v5.h"
#include "armv4_5.h"
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 3f9e7f5..7ccdf54 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -37,6 +37,7 @@
#include "breakpoints.h"
#include "armv7m.h"
#include "algorithm.h"
+#include "register.h"
#define ARRAY_SIZE(x) ((int)(sizeof(x)/sizeof((x)[0])))
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 832efe9..f099be9 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -35,9 +35,8 @@
#include "breakpoints.h"
#include "cortex_a8.h"
-#include "armv7a.h"
#include "armv4_5.h"
-
+#include "register.h"
#include "target_request.h"
#include "target_type.h"
diff --git a/src/target/cortex_a8.h b/src/target/cortex_a8.h
index f11d9dd..230008a 100644
--- a/src/target/cortex_a8.h
+++ b/src/target/cortex_a8.h
@@ -29,7 +29,6 @@
#ifndef CORTEX_A8_H
#define CORTEX_A8_H
-#include "register.h"
#include "target.h"
#include "armv7a.h"
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 35ca5a5..e4949d2 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -36,6 +36,7 @@
#include "target_request.h"
#include "target_type.h"
#include "arm_disassembler.h"
+#include "register.h"
/* NOTE: most of this should work fine for the Cortex-M1 and
diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index ed08323..759c2bc 100644
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -26,7 +26,6 @@
#ifndef CORTEX_M3_H
#define CORTEX_M3_H
-#include "register.h"
#include "target.h"
#include "armv7m.h"
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index 292504b..4a7cf12 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -28,6 +28,7 @@
#endif
#include "embeddedice.h"
+#include "register.h"
#define ARRAY_SIZE(x) ((int)(sizeof(x)/sizeof((x)[0])))
diff --git a/src/target/etb.c b/src/target/etb.c
index e65cd5a..72474cd 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -23,6 +23,7 @@
#include "armv4_5.h"
#include "etb.h"
+#include "register.h"
static char* etb_reg_list[] =
diff --git a/src/target/etm.c b/src/target/etm.c
index 4c94e6b..e70df10 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -25,6 +25,7 @@
#include "etb.h"
#include "image.h"
#include "arm_disassembler.h"
+#include "register.h"
/*
diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index 03a5afc..8c05276 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -55,6 +55,8 @@
#include "arm926ejs.h"
#include "arm966e.h"
#include "target_type.h"
+#include "register.h"
+
int feroceon_assert_reset(struct target *target)
{
diff --git a/src/target/mips32.c b/src/target/mips32.c
index 6432a90..6ba433c 100644
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -27,6 +27,7 @@
#endif
#include "mips32.h"
+#include "register.h"
char* mips32_core_reg_list[] =
diff --git a/src/target/mips32.h b/src/target/mips32.h
index 7a4ba57..1ac682b 100644
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -24,7 +24,6 @@
#define MIPS32_H
#include "target.h"
-#include "register.h"
#include "mips32_pracc.h"
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index fff401c..d1d3481 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -28,6 +28,7 @@
#include "mips_m4k.h"
#include "mips32_dmaacc.h"
#include "target_type.h"
+#include "register.h"
/* cli handling */
diff --git a/src/target/register.c b/src/target/register.c
index f26835b..bb046a1 100644
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "types.h"
#include "register.h"
#include "log.h"
diff --git a/src/target/register.h b/src/target/register.h
index c21edf6..84d2aaa 100644
--- a/src/target/register.h
+++ b/src/target/register.h
@@ -23,8 +23,6 @@
#ifndef REGISTER_H
#define REGISTER_H
-#include "types.h"
-
struct target;
struct reg
diff --git a/src/target/xscale.c b/src/target/xscale.c
index d8977e2..30ca3bf 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -34,6 +34,7 @@
#include "arm_simulator.h"
#include "arm_disassembler.h"
#include "time_support.h"
+#include "register.h"
#include "image.h"
commit 1186f7efa72a86a7000dce60b090bd4f822cdceb
Author: David Brownell <dbr...@us...>
Date: Mon Nov 16 00:35:11 2009 -0800
target: less implicit inclusion of "command.h"
Lots of files still include it, often through needless
duplicate inclusion of "log.h"; sigh.
This cleans up the inclusion graph a bunch, so there are
fewer inclusion paths, but it doesn't change much otherwise.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/ecosboard.c b/src/ecosboard.c
index e38316c..95d41cb 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -21,18 +21,15 @@
#include "config.h"
#endif
-#include "log.h"
#include "types.h"
#include "jtag.h"
#include "configuration.h"
#include "xsvf.h"
#include "svf.h"
#include "target.h"
-#include "flash.h"
#include "nand.h"
#include "pld.h"
-#include "command.h"
#include "server.h"
#include "telnet_server.h"
#include "gdb_server.h"
diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index ad45bd5..0f2be3c 100644
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -60,7 +60,6 @@
#include <stdio.h>
#include <string.h>
#include <stddef.h>
-#include "log.h"
#include "types.h"
#include "flash.h"
#include "target.h"
diff --git a/src/helper/log.c b/src/helper/log.c
index c690654..5a65c87 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -27,7 +27,6 @@
#include "config.h"
#endif
-#include "log.h"
#include "time_support.h"
// @todo the inclusion of server.h here is a layering violation
#include "server.h"
diff --git a/src/helper/options.c b/src/helper/options.c
index 3ffc673..e26782f 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -25,7 +25,6 @@
#endif
#include "configuration.h"
-#include "log.h"
// @todo the inclusion of server.h here is a layering violation
#include "server.h"
diff --git a/src/openocd.c b/src/openocd.c
index 234b01c..e35a0ae 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -33,7 +33,6 @@
#include "xsvf.h"
#include "svf.h"
#include "target.h"
-#include "flash.h"
#include "nand.h"
#include "pld.h"
#include "mflash.h"
diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 46cd558..120d5b9 100644
--- a/src/target/arm_simulator.c
+++ b/src/target/arm_simulator.c
@@ -27,7 +27,6 @@
#include "armv4_5.h"
#include "arm_disassembler.h"
#include "arm_simulator.h"
-#include "log.h"
#include "binarybuffer.h"
diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index 83b38b6..6c0b881 100644
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -28,7 +28,6 @@
#include "register.h"
#include "target.h"
-#include "log.h"
#include "etm.h"
typedef enum armv4_5_mode
diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index c94d3b0..7b33053 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -27,7 +27,6 @@
#include "target.h"
#include "register.h"
-#include "log.h"
#include "binarybuffer.h"
#include "command.h"
diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 5cdffd8..625c3a9 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -21,7 +21,6 @@
#include "register.h"
#include "target.h"
-#include "log.h"
#include "arm_adi_v5.h"
#include "armv4_5.h"
#include "armv4_5_mmu.h"
diff --git a/src/target/target.h b/src/target/target.h
index 75bc4f0..51fb299 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -27,8 +27,8 @@
#define TARGET_H
#include <stddef.h>
-
-#include "command.h"
+#include "types.h"
+#include "jim.h"
struct reg;
struct trace;
@@ -230,7 +230,7 @@ enum target_event
struct target_event_action {
enum target_event event;
- Jim_Obj *body;
+ struct Jim_Obj *body;
int has_percent;
struct target_event_action *next;
};
commit db094c2e60176b3c63ce788159b04a7024ad1010
Author: David Brownell <dbr...@us...>
Date: Mon Nov 16 00:35:05 2009 -0800
target: don't implicitly include "algorithm.h"
Most files in the tree seem to have ended up including this,
and *quite* needlessly ... only code implementing or using
downloadable algorithms actually needs these declarations.
So take it out of the header files which included it, and put
it in files which use it ... reduce needless interdependencies.
Also: "algorithm.h" doesn't need to include "types.h" again;
it already comes from a different header.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c
index c2a1884..643705c 100644
--- a/src/flash/aduc702x.c
+++ b/src/flash/aduc702x.c
@@ -27,6 +27,7 @@
#include "armv4_5.h"
#include "binarybuffer.h"
#include "time_support.h"
+#include "algorithm.h"
static int aduc702x_build_sector_list(struct flash_bank *bank);
diff --git a/src/flash/arm_nandio.c b/src/flash/arm_nandio.c
index 63eb041..81697fa 100644
--- a/src/flash/arm_nandio.c
+++ b/src/flash/arm_nandio.c
@@ -26,6 +26,7 @@
#include "arm_nandio.h"
#include "armv4_5.h"
+#include "algorithm.h"
/*
@@ -43,8 +44,8 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
{
struct target *target = nand->target;
struct armv4_5_algorithm algo;
- struct arm *armv4_5 = target->arch_info;
- struct reg_param reg_params[3];
+ struct arm *armv4_5 = target->arch_info;
+ struct reg_param reg_params[3];
uint32_t target_buf;
uint32_t exit = 0;
int retval;
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 17f5c32..c0ad50d 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -27,6 +27,7 @@
#include "non_cfi.h"
#include "armv4_5.h"
#include "binarybuffer.h"
+#include "algorithm.h"
#define CFI_MAX_BUS_WIDTH 4
diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index 0525fbe..c12ed9d 100644
--- a/src/flash/ecos.c
+++ b/src/flash/ecos.c
@@ -24,6 +24,7 @@
#include "flash.h"
#include "embeddedice.h"
#include "image.h"
+#include "algorithm.h"
#if 0
diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index df1f082..09bb13f 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -29,6 +29,7 @@
#include "armv4_5.h"
#include "armv7m.h"
#include "binarybuffer.h"
+#include "algorithm.h"
/* flash programming support for NXP LPC17xx and LPC2xxx devices
diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c
index 556a151..35f1507 100644
--- a/src/flash/lpc2900.c
+++ b/src/flash/lpc2900.c
@@ -27,6 +27,7 @@
#include "flash.h"
#include "binarybuffer.h"
#include "armv4_5.h"
+#include "algorithm.h"
/* 1024 bytes */
diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index 56762d1..7b94675 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -31,6 +31,7 @@
#include "stellaris.h"
#include "armv7m.h"
#include "binarybuffer.h"
+#include "algorithm.h"
#define DID0_VER(did0) ((did0 >> 28)&0x07)
diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 7ac06a6..7072715 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -27,6 +27,7 @@
#include "stm32x.h"
#include "armv7m.h"
#include "binarybuffer.h"
+#include "algorithm.h"
static int stm32x_mass_erase(struct flash_bank *bank);
diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 71709bb..19ee160 100644
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -27,6 +27,7 @@
#include "str7x.h"
#include "armv4_5.h"
#include "binarybuffer.h"
+#include "algorithm.h"
struct str7x_mem_layout mem_layout_str7bank0[] = {
diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 1506cb5..870871c 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -29,6 +29,7 @@
#include "str9x.h"
#include "arm966e.h"
+#include "algorithm.h"
static uint32_t bank1start = 0x00080000;
diff --git a/src/target/algorithm.h b/src/target/algorithm.h
index 80f081d..abb8ecf 100644
--- a/src/target/algorithm.h
+++ b/src/target/algorithm.h
@@ -20,8 +20,6 @@
#ifndef ALGORITHM_H
#define ALGORITHM_H
-#include "types.h"
-
enum param_direction
{
PARAM_IN,
diff --git a/src/target/arm11.c b/src/target/arm11.c
index f4e2c0d..cdeb420 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -33,6 +33,7 @@
#include "arm_simulator.h"
#include "time_support.h"
#include "target_type.h"
+#include "algorithm.h"
#if 0
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index b07111e..76c79c3 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -36,6 +36,7 @@
#include "arm7_9_common.h"
#include "time_support.h"
#include "arm_simulator.h"
+#include "algorithm.h"
/**
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 47b32ad..e6e0bd7 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -31,6 +31,7 @@
#include "breakpoints.h"
#include "arm_disassembler.h"
#include "binarybuffer.h"
+#include "algorithm.h"
char* armv4_5_core_reg_list[] =
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 6c6a9ec..3f9e7f5 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -36,6 +36,7 @@
#include "breakpoints.h"
#include "armv7m.h"
+#include "algorithm.h"
#define ARRAY_SIZE(x) ((int)(sizeof(x)/sizeof((x)[0])))
diff --git a/src/target/target.h b/src/target/target.h
index 06105ee..75bc4f0 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -28,7 +28,6 @@
#include <stddef.h>
-#include "algorithm.h"
#include "command.h"
struct reg;
@@ -36,6 +35,8 @@ struct trace;
struct command_context;
struct breakpoint;
struct watchpoint;
+struct mem_param;
+struct reg_param;
/**
commit aa7c449600d6f6d634f587de6091421a1a877af5
Author: David Brownell <dbr...@us...>
Date: Mon Nov 16 00:34:57 2009 -0800
target: don't implicitly include "breakpoint.h"
Most files in the tree seem to have ended up including this,
and *quite* needlessly ... only code implementing or using
breakpoints actually needs these declarations.
So take it out of the header files which included it, and put
it in files which use it ... reduce needless interdependencies.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 4151ec7..21db296 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -28,6 +28,7 @@
#endif
#include "gdb_server.h"
+#include "breakpoints.h"
#include "target_request.h"
#include "register.h"
#include "server.h"
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 348dd87..f4e2c0d 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -27,6 +27,7 @@
#endif
#include "arm11.h"
+#include "breakpoints.h"
#include "arm11_dbgtap.h"
#include "armv4_5.h"
#include "arm_simulator.h"
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index c35c825..b07111e 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -30,6 +30,7 @@
#include "config.h"
#endif
+#include "breakpoints.h"
#include "embeddedice.h"
#include "target_request.h"
#include "arm7_9_common.h"
diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index d70bae2..e5a2bb7 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -29,7 +29,6 @@
#ifndef ARM7_9_COMMON_H
#define ARM7_9_COMMON_H
-#include "breakpoints.h"
#include "armv4_5.h"
#define ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index f9b22b9..47b32ad 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -28,6 +28,7 @@
#endif
#include "armv4_5.h"
+#include "breakpoints.h"
#include "arm_disassembler.h"
#include "binarybuffer.h"
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index ff97a4c..6c6a9ec 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -34,6 +34,7 @@
#include "config.h"
#endif
+#include "breakpoints.h"
#include "armv7m.h"
#define ARRAY_SIZE(x) ((int)(sizeof(x)/sizeof((x)[0])))
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 0d00b3a..832efe9 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -33,6 +33,7 @@
#include "config.h"
#endif
+#include "breakpoints.h"
#include "cortex_a8.h"
#include "armv7a.h"
#include "armv4_5.h"
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index e236df2..35ca5a5 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -31,6 +31,7 @@
#include "config.h"
#endif
+#include "breakpoints.h"
#include "cortex_m3.h"
#include "target_request.h"
#include "target_type.h"
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 6dd00ad..fff401c 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -23,6 +23,7 @@
#include "config.h"
#endif
+#include "breakpoints.h"
#include "mips32.h"
#include "mips_m4k.h"
#include "mips32_dmaacc.h"
diff --git a/src/target/target.c b/src/target/target.c
index f7e2ad6..f5a092a 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -36,6 +36,7 @@
#include "target.h"
#include "target_type.h"
#include "target_request.h"
+#include "breakpoints.h"
#include "time_support.h"
#include "register.h"
#include "trace.h"
diff --git a/src/target/target.h b/src/target/target.h
index e4de2c7..06105ee 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -28,13 +28,14 @@
#include <stddef.h>
-#include "breakpoints.h"
#include "algorithm.h"
#include "command.h"
struct reg;
struct trace;
struct command_context;
+struct breakpoint;
+struct watchpoint;
/**
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 0b5b26b..d8977e2 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -27,6 +27,7 @@
#include "config.h"
#endif
+#include "breakpoints.h"
#include "xscale.h"
#include "target_type.h"
#include "arm7_9_common.h"
-----------------------------------------------------------------------
Summary of changes:
src/ecosboard.c | 4 ----
src/flash/aduc702x.c | 1 +
src/flash/arm_nandio.c | 5 +++--
src/flash/at91sam3.c | 2 --
src/flash/cfi.c | 1 +
src/flash/ecos.c | 1 +
src/flash/lpc2000.c | 1 +
src/flash/lpc2900.c | 1 +
src/flash/lpc3180_nand_controller.h | 2 --
src/flash/mflash.c | 1 +
src/flash/mflash.h | 2 +-
src/flash/stellaris.c | 1 +
src/flash/stm32x.c | 1 +
src/flash/str7x.c | 1 +
src/flash/str9x.c | 1 +
src/helper/log.c | 1 -
src/helper/options.c | 1 -
src/openocd.c | 2 --
src/server/gdb_server.c | 3 ++-
src/server/gdb_server.h | 2 --
src/target/algorithm.h | 2 --
src/target/arm11.c | 3 +++
src/target/arm720t.c | 1 +
src/target/arm7_9_common.c | 3 +++
src/target/arm7_9_common.h | 1 -
src/target/arm7tdmi.c | 1 +
src/target/arm920t.c | 1 +
src/target/arm926ejs.c | 1 +
src/target/arm9tdmi.c | 1 +
src/target/arm_adi_v5.h | 2 --
src/target/arm_simulator.c | 2 +-
src/target/armv4_5.c | 3 +++
src/target/armv4_5.h | 2 --
src/target/armv4_5_mmu.c | 1 +
src/target/armv4_5_mmu.h | 3 ++-
src/target/armv7a.c | 2 --
src/target/armv7a.h | 3 ---
src/target/armv7m.c | 4 ++++
src/target/cortex_a8.c | 4 ++--
src/target/cortex_a8.h | 2 --
src/target/cortex_m3.c | 2 ++
src/target/cortex_m3.h | 1 -
src/target/embeddedice.c | 1 +
src/target/etb.c | 1 +
src/target/etm.c | 1 +
src/target/feroceon.c | 2 ++
src/target/mips32.c | 1 +
src/target/mips32.h | 1 -
src/target/mips_m4k.c | 2 ++
src/target/register.c | 1 +
src/target/register.h | 2 --
src/target/target.c | 1 +
src/target/target.h | 12 +++++++-----
src/target/target_request.c | 1 +
src/target/target_request.h | 3 ++-
src/target/xscale.c | 2 ++
56 files changed, 64 insertions(+), 46 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
