Browse Source

Audit and eliminate redundant #include directives in other target files.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1715 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.2.0
zwelch 13 years ago
parent
commit
56504fdd73
34 changed files with 28 additions and 218 deletions
  1. +1
    -5
      src/target/algorithm.c
  2. +1
    -16
      src/target/avrt.c
  3. +2
    -0
      src/target/avrt.h
  4. +1
    -5
      src/target/breakpoints.c
  5. +0
    -11
      src/target/cortex_a8.c
  6. +0
    -11
      src/target/cortex_m3.c
  7. +0
    -12
      src/target/embeddedice.c
  8. +0
    -3
      src/target/embeddedice.h
  9. +0
    -11
      src/target/etb.c
  10. +0
    -6
      src/target/etb.h
  11. +2
    -16
      src/target/etm.c
  12. +3
    -5
      src/target/etm.h
  13. +1
    -12
      src/target/etm_dummy.c
  14. +0
    -5
      src/target/etm_dummy.h
  15. +0
    -4
      src/target/feroceon.c
  16. +1
    -11
      src/target/image.c
  17. +2
    -7
      src/target/image.h
  18. +0
    -4
      src/target/mips32.c
  19. +2
    -2
      src/target/mips32.h
  20. +1
    -3
      src/target/mips32_dmaacc.c
  21. +0
    -2
      src/target/mips32_pracc.c
  22. +0
    -5
      src/target/mips_ejtag.c
  23. +0
    -1
      src/target/mips_ejtag.h
  24. +0
    -4
      src/target/mips_m4k.c
  25. +4
    -3
      src/target/mips_m4k.h
  26. +1
    -12
      src/target/oocd_trace.c
  27. +0
    -3
      src/target/oocd_trace.h
  28. +0
    -4
      src/target/register.c
  29. +0
    -1
      src/target/register.h
  30. +1
    -6
      src/target/target_request.c
  31. +0
    -4
      src/target/trace.c
  32. +3
    -2
      src/target/trace.h
  33. +1
    -18
      src/target/xscale.c
  34. +1
    -4
      src/target/xscale.h

+ 1
- 5
src/target/algorithm.c View File

@@ -22,13 +22,9 @@
#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)
{


+ 1
- 16
src/target/avrt.c View File

@@ -21,26 +21,11 @@
#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);


+ 2
- 0
src/target/avrt.h View File

@@ -20,6 +20,8 @@
#ifndef AVRT_H
#define AVRT_H

#include "jtag.h"

typedef struct mcu_jtag_s
{
jtag_tap_t *tap;


+ 1
- 5
src/target/breakpoints.c View File

@@ -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",


+ 0
- 11
src/target/cortex_a8.c View File

@@ -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);


+ 0
- 11
src/target/cortex_m3.c View File

@@ -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);


+ 0
- 12
src/target/embeddedice.c View File

@@ -29,18 +29,6 @@

#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[] =


+ 0
- 3
src/target/embeddedice.h View File

@@ -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


+ 0
- 11
src/target/etb.c View File

@@ -21,20 +21,9 @@
#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[] =
{


+ 0
- 6
src/target/etb.h View File

@@ -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 */


+ 2
- 16
src/target/etm.c View File

@@ -21,26 +21,12 @@
#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
*


+ 3
- 5
src/target/etm.h View File

@@ -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 @@ typedef struct etm_context_s
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 */


+ 1
- 12
src/target/etm_dummy.c View File

@@ -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)
{


+ 0
- 5
src/target/etm_dummy.h View File

@@ -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;


+ 0
- 4
src/target/feroceon.c View File

@@ -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);


+ 1
- 11
src/target/image.c View File

@@ -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)\


+ 2
- 7
src/target/image.h View File

@@ -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_ihex_s

typedef struct image_memory_s
{
target_t *target;
struct target_s *target;
u8 *cache;
u32 cache_address;
} image_memory_t;


+ 0
- 4
src/target/mips32.c View File

@@ -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[] =
{


+ 2
- 2
src/target/mips32.h View File

@@ -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_common_s
typedef struct mips32_core_reg_s
{
u32 num;
target_t *target;
struct target_s *target;
mips32_common_t *mips32_common;
} mips32_core_reg_t;



+ 1
- 3
src/target/mips32_dmaacc.c View File

@@ -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


+ 0
- 2
src/target/mips32_pracc.c View File

@@ -74,8 +74,6 @@ Nico Coesel
#include "config.h"
#endif

#include <string.h>
#include "log.h"
#include "mips32.h"
#include "mips32_pracc.h"



+ 0
- 5
src/target/mips_ejtag.c View File

@@ -26,11 +26,6 @@
#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)
{


+ 0
- 1
src/target/mips_ejtag.h View File

@@ -23,7 +23,6 @@
#ifndef MIPS_EJTAG
#define MIPS_EJTAG

#include "types.h"
#include "jtag.h"

/* tap instructions */


+ 0
- 4
src/target/mips_m4k.c View File

@@ -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 */



+ 4
- 3
src/target/mips_m4k.h View File

@@ -23,8 +23,9 @@
#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

@@ -34,7 +35,7 @@ typedef struct mips_m4k_common_s
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);


+ 1
- 12
src/target/oocd_trace.c View File

@@ -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);



+ 0
- 3
src/target/oocd_trace.h View File

@@ -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


+ 0
- 4
src/target/register.c View File

@@ -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;



+ 0
- 1
src/target/register.h View File

@@ -24,7 +24,6 @@
#define REGISTER_H

#include "types.h"
#include "target.h"

struct target_s;



+ 1
- 6
src/target/target_request.c View File

@@ -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;


+ 0
- 4
src/target/trace.c View File

@@ -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)


+ 3
- 2
src/target/trace.h View File

@@ -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;


+ 1
- 18
src/target/xscale.c View File

@@ -24,29 +24,12 @@
#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 <stdlib.h>
#include <string.h>

#include <unistd.h>
#include <errno.h>

#include "image.h"

/* cli handling */
int xscale_register_commands(struct command_context_s *cmd_ctx);


+ 1
- 4
src/target/xscale.h View File

@@ -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_data_s
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) */


Loading…
Cancel
Save