Menu
▾
▴
[Openocd-svn] r1715 - trunk/src/target
|
From: <zw...@ma...> - 2009-05-11 06:57:36
|
Author: zwelch
Date: 2009-05-11 06:56:37 +0200 (Mon, 11 May 2009)
New Revision: 1715
Modified:
trunk/src/target/algorithm.c
trunk/src/target/avrt.c
trunk/src/target/avrt.h
trunk/src/target/breakpoints.c
trunk/src/target/cortex_a8.c
trunk/src/target/cortex_m3.c
trunk/src/target/embeddedice.c
trunk/src/target/embeddedice.h
trunk/src/target/etb.c
trunk/src/target/etb.h
trunk/src/target/etm.c
trunk/src/target/etm.h
trunk/src/target/etm_dummy.c
trunk/src/target/etm_dummy.h
trunk/src/target/feroceon.c
trunk/src/target/image.c
trunk/src/target/image.h
trunk/src/target/mips32.c
trunk/src/target/mips32.h
trunk/src/target/mips32_dmaacc.c
trunk/src/target/mips32_pracc.c
trunk/src/target/mips_ejtag.c
trunk/src/target/mips_ejtag.h
trunk/src/target/mips_m4k.c
trunk/src/target/mips_m4k.h
trunk/src/target/oocd_trace.c
trunk/src/target/oocd_trace.h
trunk/src/target/register.c
trunk/src/target/register.h
trunk/src/target/target_request.c
trunk/src/target/trace.c
trunk/src/target/trace.h
trunk/src/target/xscale.c
trunk/src/target/xscale.h
Log:
Audit and eliminate redundant #include directives in other target files.
Modified: trunk/src/target/algorithm.c
===================================================================
--- trunk/src/target/algorithm.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/algorithm.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -22,14 +22,10 @@
#endif
#include "algorithm.h"
-
-#include "log.h"
-#include "configuration.h"
+#include "replacements.h"
#include "binarybuffer.h"
-#include <stdlib.h>
-
void init_mem_param(mem_param_t *param, u32 address, u32 size, enum param_direction direction)
{
param->address = address;
Modified: trunk/src/target/avrt.c
===================================================================
--- trunk/src/target/avrt.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/avrt.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -21,27 +21,12 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "avrt.h"
-
-#include "register.h"
#include "target.h"
-#include "log.h"
-#include "jtag.h"
-#include "binarybuffer.h"
-#include "time_support.h"
-#include "breakpoints.h"
-#include "fileio.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
+#define AVR_JTAG_INS_LEN 4
-#define AVR_JTAG_INS_LEN 4
-
/* cli handling */
int avr_register_commands(struct command_context_s *cmd_ctx);
Modified: trunk/src/target/avrt.h
===================================================================
--- trunk/src/target/avrt.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/avrt.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -20,6 +20,8 @@
#ifndef AVRT_H
#define AVRT_H
+#include "jtag.h"
+
typedef struct mcu_jtag_s
{
jtag_tap_t *tap;
Modified: trunk/src/target/breakpoints.c
===================================================================
--- trunk/src/target/breakpoints.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/breakpoints.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -21,15 +21,11 @@
#include "config.h"
#endif
-#include <stdlib.h>
-
-#include "binarybuffer.h"
#include "target.h"
#include "log.h"
-#include "types.h"
-
#include "breakpoints.h"
+
static char *breakpoint_type_strings[] =
{
"hardware",
Modified: trunk/src/target/cortex_a8.c
===================================================================
--- trunk/src/target/cortex_a8.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/cortex_a8.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -33,20 +33,9 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "cortex_a8.h"
-#include "armv7m.h"
-
-#include "register.h"
-#include "target.h"
#include "target_request.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-#include <stdlib.h>
-#include <string.h>
/* cli handling */
int cortex_a8_register_commands(struct command_context_s *cmd_ctx);
Modified: trunk/src/target/cortex_m3.c
===================================================================
--- trunk/src/target/cortex_m3.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/cortex_m3.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -31,20 +31,9 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "cortex_m3.h"
-#include "armv7m.h"
-
-#include "register.h"
-#include "target.h"
#include "target_request.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-#include <stdlib.h>
-#include <string.h>
/* cli handling */
int cortex_m3_register_commands(struct command_context_s *cmd_ctx);
Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/embeddedice.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -29,19 +29,7 @@
#include "embeddedice.h"
-#include "armv4_5.h"
-#include "arm7_9_common.h"
-#include "log.h"
-#include "arm_jtag.h"
-#include "types.h"
-#include "binarybuffer.h"
-#include "target.h"
-#include "register.h"
-#include "jtag.h"
-
-#include <stdlib.h>
-
#if 0
static bitfield_desc_t embeddedice_comms_ctrl_bitfield_desc[] =
{
Modified: trunk/src/target/embeddedice.h
===================================================================
--- trunk/src/target/embeddedice.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/embeddedice.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -26,9 +26,6 @@
#ifndef EMBEDDED_ICE_H
#define EMBEDDED_ICE_H
-#include "target.h"
-#include "register.h"
-#include "arm_jtag.h"
#include "arm7_9_common.h"
enum
Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/etb.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -21,21 +21,10 @@
#include "config.h"
#endif
-#include <string.h>
-
#include "arm7_9_common.h"
#include "etb.h"
-#include "etm.h"
-#include "log.h"
-#include "types.h"
-#include "binarybuffer.h"
-#include "target.h"
-#include "register.h"
-#include "jtag.h"
-#include <stdlib.h>
-
static char* etb_reg_list[] =
{
"ETB_identification",
Modified: trunk/src/target/etb.h
===================================================================
--- trunk/src/target/etb.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/etb.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -20,12 +20,6 @@
#ifndef ETB_H
#define ETB_H
-#include "command.h"
-#include "target.h"
-#include "register.h"
-#include "arm_jtag.h"
-
-#include "etb.h"
#include "etm.h"
/* ETB registers */
Modified: trunk/src/target/etm.c
===================================================================
--- trunk/src/target/etm.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/etm.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -21,27 +21,13 @@
#include "config.h"
#endif
-#include <string.h>
-
#include "etm.h"
#include "etb.h"
-
-#include "armv4_5.h"
+#include "image.h"
#include "arm7_9_common.h"
#include "arm_disassembler.h"
-#include "arm_simulator.h"
-#include "log.h"
-#include "arm_jtag.h"
-#include "types.h"
-#include "binarybuffer.h"
-#include "target.h"
-#include "register.h"
-#include "jtag.h"
-#include "fileio.h"
-#include <stdlib.h>
-
/* ETM register access functionality
*
*/
Modified: trunk/src/target/etm.h
===================================================================
--- trunk/src/target/etm.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/etm.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -23,14 +23,12 @@
#ifndef ETM_H
#define ETM_H
-#include "image.h"
#include "trace.h"
-#include "target.h"
-#include "register.h"
#include "arm_jtag.h"
-
#include "armv4_5.h"
+struct image_s;
+
/* ETM registers (V1.3 protocol) */
enum
{
@@ -152,7 +150,7 @@
etm_portmode_t portmode; /* normal, multiplexed or demultiplexed */
etmv1_tracemode_t tracemode; /* type of information the trace contains (data, addres, contextID, ...) */
armv4_5_state_t core_state; /* current core state (ARM, Thumb, Jazelle) */
- image_t *image; /* source for target opcodes */
+ struct image_s *image; /* source for target opcodes */
u32 pipe_index; /* current trace cycle */
u32 data_index; /* cycle holding next data packet */
int data_half; /* port half on a 16 bit port */
Modified: trunk/src/target/etm_dummy.c
===================================================================
--- trunk/src/target/etm_dummy.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/etm_dummy.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -21,20 +21,9 @@
#include "config.h"
#endif
-#include <string.h>
-
#include "etm_dummy.h"
-#include "etm.h"
-
#include "arm7_9_common.h"
-#include "log.h"
-#include "types.h"
-#include "binarybuffer.h"
-#include "target.h"
-#include "register.h"
-#include "jtag.h"
-#include <stdlib.h>
static int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
Modified: trunk/src/target/etm_dummy.h
===================================================================
--- trunk/src/target/etm_dummy.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/etm_dummy.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -20,11 +20,6 @@
#ifndef ETM_DUMMY_H
#define ETM_DUMMY_H
-#include "command.h"
-#include "target.h"
-#include "register.h"
-#include "arm_jtag.h"
-
#include "etm.h"
extern etm_capture_driver_t etm_dummy_capture_driver;
Modified: trunk/src/target/feroceon.c
===================================================================
--- trunk/src/target/feroceon.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/feroceon.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -50,11 +50,7 @@
#endif
#include "arm926ejs.h"
-#include "jtag.h"
-#include "log.h"
-#include <stdlib.h>
-#include <string.h>
int feroceon_examine(struct target_s *target);
int feroceon_target_create(struct target_s *target, Jim_Interp *interp);
Modified: trunk/src/target/image.c
===================================================================
--- trunk/src/target/image.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/image.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -27,20 +27,10 @@
#include "config.h"
#endif
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_ELF_H
-#include <elf.h>
-#endif
-
#include "image.h"
-
-#include "types.h"
-#include "replacements.h"
+#include "target.h"
#include "log.h"
-#include "fileio.h"
-#include "target.h"
/* convert ELF header field to host endianness */
#define field16(elf,field)\
Modified: trunk/src/target/image.h
===================================================================
--- trunk/src/target/image.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/image.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -26,16 +26,11 @@
#ifndef IMAGE_H
#define IMAGE_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "fileio.h"
#ifdef HAVE_ELF_H
#include <elf.h>
#endif
-#include "replacements.h"
-#include "fileio.h"
-#include "target.h"
#define IMAGE_MAX_ERROR_STRING (256)
#define IMAGE_MAX_SECTIONS (128)
@@ -85,7 +80,7 @@
typedef struct image_memory_s
{
- target_t *target;
+ struct target_s *target;
u8 *cache;
u32 cache_address;
} image_memory_t;
Modified: trunk/src/target/mips32.c
===================================================================
--- trunk/src/target/mips32.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips32.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -27,11 +27,7 @@
#endif
#include "mips32.h"
-#include "jtag.h"
-#include "log.h"
-#include <stdlib.h>
-#include <string.h>
char* mips32_core_reg_list[] =
{
Modified: trunk/src/target/mips32.h
===================================================================
--- trunk/src/target/mips32.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips32.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -25,9 +25,9 @@
#include "target.h"
#include "register.h"
-#include "mips_ejtag.h"
#include "mips32_pracc.h"
+
#define MIPS32_COMMON_MAGIC 0xB320B320
/* offsets into mips32 core register cache */
@@ -69,7 +69,7 @@
typedef struct mips32_core_reg_s
{
u32 num;
- target_t *target;
+ struct target_s *target;
mips32_common_t *mips32_common;
} mips32_core_reg_t;
Modified: trunk/src/target/mips32_dmaacc.c
===================================================================
--- trunk/src/target/mips32_dmaacc.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips32_dmaacc.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -26,11 +26,9 @@
#include "config.h"
#endif
-#include <string.h>
-#include "log.h"
-#include "mips32.h"
#include "mips32_dmaacc.h"
+
/*
* The following logic shamelessly cloned from HairyDairyMaid's wrt54g_debrick
* to support the Broadcom BCM5352 SoC in the Linksys WRT54GL wireless router
Modified: trunk/src/target/mips32_pracc.c
===================================================================
--- trunk/src/target/mips32_pracc.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips32_pracc.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -74,8 +74,6 @@
#include "config.h"
#endif
-#include <string.h>
-#include "log.h"
#include "mips32.h"
#include "mips32_pracc.h"
Modified: trunk/src/target/mips_ejtag.c
===================================================================
--- trunk/src/target/mips_ejtag.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips_ejtag.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -26,12 +26,7 @@
#include "mips32.h"
#include "mips_ejtag.h"
-#include "binarybuffer.h"
-#include "log.h"
-#include "jtag.h"
-#include <stdlib.h>
-
int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch)
{
jtag_tap_t *tap;
Modified: trunk/src/target/mips_ejtag.h
===================================================================
--- trunk/src/target/mips_ejtag.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips_ejtag.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -23,7 +23,6 @@
#ifndef MIPS_EJTAG
#define MIPS_EJTAG
-#include "types.h"
#include "jtag.h"
/* tap instructions */
Modified: trunk/src/target/mips_m4k.c
===================================================================
--- trunk/src/target/mips_m4k.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips_m4k.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -26,11 +26,7 @@
#include "mips32.h"
#include "mips_m4k.h"
#include "mips32_dmaacc.h"
-#include "jtag.h"
-#include "log.h"
-#include <stdlib.h>
-#include <string.h>
/* cli handling */
Modified: trunk/src/target/mips_m4k.h
===================================================================
--- trunk/src/target/mips_m4k.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/mips_m4k.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -23,9 +23,10 @@
#ifndef MIPS_M4K_H
#define MIPS_M4K_H
-#include "register.h"
-#include "target.h"
+#include "types.h"
+struct target_s;
+
#define MIPSM4K_COMMON_MAGIC 0xB321B321
typedef struct mips_m4k_common_s
@@ -34,7 +35,7 @@
mips32_common_t mips32_common;
} mips_m4k_common_t;
-extern int mips_m4k_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffer);
+extern int mips_m4k_bulk_write_memory(struct target_s *target, u32 address, u32 count, u8 *buffer);
extern void mips_m4k_enable_breakpoints(struct target_s *target);
extern int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
Modified: trunk/src/target/oocd_trace.c
===================================================================
--- trunk/src/target/oocd_trace.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/oocd_trace.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -21,25 +21,14 @@
#include "config.h"
#endif
+// we must define _GNU_SOURCE to get strndup
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
-#include <string.h>
-#include <errno.h>
#include "oocd_trace.h"
-#include "etm.h"
-
-#include "log.h"
-#include "types.h"
-#include "binarybuffer.h"
-#include "target.h"
-#include "register.h"
-#include "jtag.h"
#include "arm7_9_common.h"
-#include "replacements.h"
-#include <stdlib.h>
static int oocd_trace_register_commands(struct command_context_s *cmd_ctx);
Modified: trunk/src/target/oocd_trace.h
===================================================================
--- trunk/src/target/oocd_trace.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/oocd_trace.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -20,12 +20,9 @@
#ifndef OOCD_TRACE_H
#define OOCD_TRACE_H
-#include "command.h"
-
#include "etm.h"
#include <termios.h>
-#include <unistd.h>
/* registers */
enum
Modified: trunk/src/target/register.c
===================================================================
--- trunk/src/target/register.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/register.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -25,12 +25,8 @@
#endif
#include "register.h"
-
#include "log.h"
-#include "command.h"
-#include <string.h>
-#include <stdlib.h>
reg_arch_type_t *reg_arch_types = NULL;
Modified: trunk/src/target/register.h
===================================================================
--- trunk/src/target/register.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/register.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -24,7 +24,6 @@
#define REGISTER_H
#include "types.h"
-#include "target.h"
struct target_s;
Modified: trunk/src/target/target_request.c
===================================================================
--- trunk/src/target/target_request.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/target_request.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -27,16 +27,11 @@
#include "config.h"
#endif
-#include "replacements.h"
-#include "log.h"
-#include "target.h"
#include "target_request.h"
#include "binarybuffer.h"
-#include "command.h"
#include "trace.h"
+#include "log.h"
-#include <stdlib.h>
-#include <string.h>
static command_t *target_request_cmd = NULL;
static int charmsg_mode = 0;
Modified: trunk/src/target/trace.c
===================================================================
--- trunk/src/target/trace.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/trace.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -21,14 +21,10 @@
#include "config.h"
#endif
-#include "replacements.h"
#include "log.h"
#include "trace.h"
#include "target.h"
-#include "command.h"
-#include <stdlib.h>
-#include <string.h>
#include <inttypes.h>
int trace_point(target_t *target, u32 number)
Modified: trunk/src/target/trace.h
===================================================================
--- trunk/src/target/trace.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/trace.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -20,10 +20,11 @@
#ifndef TRACE_H
#define TRACE_H
-#include "target.h"
-#include "command.h"
#include "types.h"
+struct target_s;
+struct command_context_s;
+
typedef struct trace_point_s
{
u32 address;
Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/xscale.c 2009-05-11 04:56:37 UTC (rev 1715)
@@ -24,30 +24,13 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "xscale.h"
-
#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
#include "arm_simulator.h"
#include "arm_disassembler.h"
-#include "log.h"
-#include "jtag.h"
-#include "binarybuffer.h"
#include "time_support.h"
-#include "breakpoints.h"
-#include "fileio.h"
+#include "image.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <errno.h>
-
-
/* cli handling */
int xscale_register_commands(struct command_context_s *cmd_ctx);
Modified: trunk/src/target/xscale.h
===================================================================
--- trunk/src/target/xscale.h 2009-05-11 04:46:21 UTC (rev 1714)
+++ trunk/src/target/xscale.h 2009-05-11 04:56:37 UTC (rev 1715)
@@ -23,12 +23,9 @@
#ifndef XSCALE_H
#define XSCALE_H
-#include "target.h"
-#include "register.h"
#include "armv4_5.h"
#include "armv4_5_mmu.h"
#include "trace.h"
-#include "image.h"
#define XSCALE_COMMON_MAGIC 0x58534341
@@ -77,7 +74,7 @@
typedef struct xscale_trace_s
{
trace_status_t capture_status; /* current state of capture run */
- image_t *image; /* source for target opcodes */
+ struct image_s *image; /* source for target opcodes */
xscale_trace_data_t *data; /* linked list of collected trace data */
int buffer_enabled; /* whether trace buffer is enabled */
int buffer_fill; /* maximum number of trace runs to read (-1 for wrap-around) */
|
