openocd-commit — OpenOCD commit maling list - read only

[Openocd-svn] r1731 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:47:21 +0200 (Mon, 11 May 2009)
New Revision: 1731

Modified:
   trunk/src/target/embeddedice.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c	2009-05-11 07:40:42 UTC (rev 1730)
+++ trunk/src/target/embeddedice.c	2009-05-11 07:47:21 UTC (rev 1731)
@@ -240,21 +240,18 @@
 	fields[0].num_bits = 32;
 	fields[0].out_value = reg->value;
 	fields[0].in_value = NULL;
-	
 
 	fields[1].tap = ice_reg->jtag_info->tap;
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
 	fields[1].in_value = NULL;
-	
 
 	fields[2].tap = ice_reg->jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	fields[2].in_value = NULL;
-	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -290,23 +287,19 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	u8 tmp[4];
-	fields[0].in_value = tmp;
-	
+	fields[0].in_value = NULL;
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
 	fields[1].in_value = NULL;
-	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	fields[2].in_value = NULL;
-	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -318,10 +311,10 @@
 		if (size == 1)
 			buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
 
-		jtag_add_dr_scan_now(3, fields, TAP_INVALID);
+		fields[0].in_value = (u8 *)data;
+		jtag_add_dr_scan(3, fields, TAP_INVALID);
+		jtag_add_callback(arm_le_to_h_u32, (u8 *)data);
 
-		*data = le_to_h_u32(tmp);
-
 		data++;
 		size--;
 	}
@@ -396,24 +389,14 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = field0_out;
-
 	fields[0].in_value = NULL;
 
-
-	
-
-
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
-
 	fields[1].in_value = NULL;
 
-
-	
-
-
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
@@ -421,10 +404,6 @@
 
 	fields[2].in_value = NULL;
 
-
-	
-
-
 	while (size > 0)
 	{
 		buf_set_u32(fields[0].out_value, 0, 32, *data);
@@ -465,35 +444,20 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-
 	fields[0].in_value = field0_in;
 
-
-	
-
-
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
-
 	fields[1].in_value = NULL;
 
-
-	
-
-
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-
 	fields[2].in_value = NULL;
 
-
-	
-
-
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 	gettimeofday(&lap, NULL);
 	do

[Openocd-svn] r1730 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:40:42 +0200 (Mon, 11 May 2009)
New Revision: 1730

Modified:
   trunk/src/target/arm9tdmi.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-05-11 07:39:36 UTC (rev 1729)
+++ trunk/src/target/arm9tdmi.c	2009-05-11 07:40:42 UTC (rev 1730)
@@ -202,11 +202,10 @@
 
 	if (in)
 	{
-		u8 tmp[4];
-		fields[0].in_value=tmp;
-		jtag_add_dr_scan_now(3, fields, TAP_INVALID);
+		fields[0].in_value=(u8 *)in;
+		jtag_add_dr_scan(3, fields, TAP_INVALID);
 
-		*in=le_to_h_u32(tmp);
+		jtag_add_callback(arm_le_to_h_u32, (u8 *)in);
 	}
 	else
 	{
@@ -251,8 +250,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	u8 tmp[4];
-	fields[0].in_value = tmp;
+	fields[0].in_value = (u8 *)in;
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
@@ -264,9 +262,9 @@
 	fields[2].out_value = NULL;
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan_now(3, fields, TAP_INVALID);
+	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
-	*in=le_to_h_u32(tmp);
+	jtag_add_callback(arm_le_to_h_u32, (u8 *)in);
 
 	jtag_add_runtest(0, TAP_INVALID);
 
@@ -293,6 +291,12 @@
 
 extern void arm_endianness(u8 *tmp, void *in, int size, int be, int flip);
 
+static int arm9endianness(u8 *in, jtag_callback_data_t size, jtag_callback_data_t be)
+{
+	arm_endianness(in, in, (int)size, (int)be, 0);
+	return ERROR_OK;
+}
+
 /* clock the target, and read the databus
  * the *in pointer points to a buffer where elements of 'size' bytes
  * are stored in big (be==1) or little (be==0) endianness
@@ -313,8 +317,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	u8 tmp[4];
-	fields[0].in_value = tmp;
+	fields[0].in_value = (u8 *)in;
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
@@ -326,11 +329,10 @@
 	fields[2].out_value = NULL;
 	fields[2].in_value = NULL;
 
-	jtag_add_dr_scan_now(3, fields, TAP_INVALID);
+	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
-	arm_endianness(tmp, in, size, be, 0);
+	jtag_add_callback3(arm9endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be);
 
-
 	jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_

[Openocd-svn] r1729 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:39:36 +0200 (Mon, 11 May 2009)
New Revision: 1729

Modified:
   trunk/src/target/arm966e.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c	2009-05-11 07:38:10 UTC (rev 1728)
+++ trunk/src/target/arm966e.c	2009-05-11 07:39:36 UTC (rev 1729)
@@ -190,12 +190,11 @@
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
-	u8 tmp[4];
-	fields[1].in_value = tmp;
+	fields[1].in_value = (u8 *)value;
 
-	jtag_add_dr_scan_now(3, fields, TAP_INVALID);
+	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
-	*value=le_to_h_u32(tmp);
+	jtag_add_callback(arm_le_to_h_u32, (u8 *)value);
 
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_

[Openocd-svn] r1728 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:38:10 +0200 (Mon, 11 May 2009)
New Revision: 1728

Modified:
   trunk/src/target/arm926ejs.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-05-11 07:36:16 UTC (rev 1727)
+++ trunk/src/target/arm926ejs.c	2009-05-11 07:38:10 UTC (rev 1728)
@@ -138,8 +138,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	u8 tmp[4];
-	fields[0].in_value = tmp;
+	fields[0].in_value = (u8 *)value;
 
 
 	fields[1].tap = jtag_info->tap;
@@ -165,9 +164,9 @@
 		/* rescan with NOP, to wait for the access to complete */
 		access = 0;
 		nr_w_buf = 0;
-		jtag_add_dr_scan_now(4, fields, TAP_INVALID);
+		jtag_add_dr_scan(4, fields, TAP_INVALID);
 
-		*value=le_to_h_u32(tmp);
+		jtag_add_callback(arm_le_to_h_u32, (u8 *)value);
 
 		if ((retval = jtag_execute_queue()) != ERROR_OK)
 		{

[Openocd-svn] r1727 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:36:16 +0200 (Mon, 11 May 2009)
New Revision: 1727

Modified:
   trunk/src/target/arm920t.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-05-11 07:35:05 UTC (rev 1726)
+++ trunk/src/target/arm920t.c	2009-05-11 07:36:16 UTC (rev 1727)
@@ -128,12 +128,11 @@
 
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 
-	u8 tmp[4];
-	fields[1].in_value = tmp;
+	fields[1].in_value = (u8 *)value;
 
-	jtag_add_dr_scan_now(4, fields, TAP_INVALID);
+	jtag_add_dr_scan(4, fields, TAP_INVALID);
 
-	*value=le_to_h_u32(tmp);
+	jtag_add_callback(arm_le_to_h_u32, (u8 *)value);
 
 	#ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	jtag_execute_queue();

[Openocd-svn] r1726 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:35:05 +0200 (Mon, 11 May 2009)
New Revision: 1726

Modified:
   trunk/src/target/arm7tdmi.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-11 07:33:43 UTC (rev 1725)
+++ trunk/src/target/arm7tdmi.c	2009-05-11 07:35:05 UTC (rev 1726)
@@ -184,15 +184,11 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	u8 tmp[4];
-	fields[1].in_value = tmp;
+	fields[1].in_value = (u8 *)in;
 
-	jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
-	if (jtag_error==ERROR_OK)
-	{
-		*in=flip_u32(le_to_h_u32(tmp), 32);
-	}
+	jtag_add_callback(arm7flip32, (u8 *)in);
 
 	jtag_add_runtest(0, TAP_INVALID);
 
@@ -246,7 +242,12 @@
 			*((u8 *)in)= readback & 0xff;
 			break;
 	}
+}
 
+static int arm7endianness(u8 *in, jtag_callback_data_t size, jtag_callback_data_t be)
+{
+	arm_endianness(in, in, (int)size, (int)be, 1);
+	return ERROR_OK;
 }
 
 /* clock the target, and read the databus
@@ -273,12 +274,11 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	u8 tmp[4];
-	fields[1].in_value = tmp;
+	fields[1].in_value = (u8 *)in;
 
-	jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
-	arm_endianness(tmp, in, size, be, 1);
+	jtag_add_callback3(arm7endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be);
 
 	jtag_add_runtest(0, TAP_INVALID);
 

[Openocd-svn] r1725 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:33:43 +0200 (Mon, 11 May 2009)
New Revision: 1725

Modified:
   trunk/src/target/arm720t.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-05-11 07:26:59 UTC (rev 1724)
+++ trunk/src/target/arm720t.c	2009-05-11 07:33:43 UTC (rev 1725)
@@ -117,10 +117,9 @@
 
 	if (in)
 	{
-		u8 tmp[4];
-		fields[1].in_value = tmp;
-		jtag_add_dr_scan_now(2, fields, TAP_INVALID);
-		*in=flip_u32(le_to_h_u32(tmp), 32);
+		fields[1].in_value = (u8 *)in;
+		jtag_add_dr_scan(2, fields, TAP_INVALID);
+		jtag_add_callback(arm7flip32, (u8 *)in);
 	} else
 	{
 		jtag_add_dr_scan(2, fields, TAP_INVALID);

[Openocd-svn] r1724 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:26:59 +0200 (Mon, 11 May 2009)
New Revision: 1724

Modified:
   trunk/src/target/arm_adi_v5.c
Log:
switch to jtag_add_callback() - USB performance fix

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-05-11 07:26:11 UTC (rev 1723)
+++ trunk/src/target/arm_adi_v5.c	2009-05-11 07:26:59 UTC (rev 1724)
@@ -120,11 +120,10 @@
 
 	if (invalue)
 	{
-		u8 tmp[4];
-		fields[1].in_value = tmp;
-		jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+		fields[1].in_value = (u8 *)invalue;
+		jtag_add_dr_scan(2, fields, TAP_INVALID);
 
-		*invalue=le_to_h_u32(tmp);
+		jtag_add_callback(arm_le_to_h_u32, (u8 *)invalue);
 	} else
 	{
 

[Openocd-svn] r1723 - in trunk/src: . helper

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 09:26:11 +0200 (Mon, 11 May 2009)
New Revision: 1723

Modified:
   trunk/src/ecosboard.c
   trunk/src/helper/ioutil.c
Log:
leave eCos include file issues alone for now. 

Modified: trunk/src/ecosboard.c
===================================================================
--- trunk/src/ecosboard.c	2009-05-11 07:04:25 UTC (rev 1722)
+++ trunk/src/ecosboard.c	2009-05-11 07:26:11 UTC (rev 1723)
@@ -21,54 +21,70 @@
 #include "config.h"
 #endif
 
+#include "log.h"
+#include "types.h"
+#include "jtag.h"
 #include "configuration.h"
-#include "time_support.h"
-
-#include "jtag.h"
 #include "xsvf.h"
 #include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
 #include "pld.h"
-#include "rom.h"
 
+#include "command.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
 
+#include <time_support.h>
+#include <sys/time.h>
+#include <strings.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <cyg/io/flash.h>
 #include <pkgconf/fs_jffs2.h>	// Address of JFFS2
 #include <network.h>
 
-#include <arpa/inet.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <cyg/fileio/fileio.h>
 #include <dirent.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <netinet/tcp.h>
-#include <stdarg.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
 #include <cyg/athttpd/http.h>
 #include <cyg/athttpd/socket.h>
 #include <cyg/athttpd/handler.h>
 #include <cyg/athttpd/cgi.h>
 #include <cyg/athttpd/forms.h>
 #include <cyg/discover/discover.h>
-#include <cyg/fileio/fileio.h>
 #include <cyg/hal/hal_diag.h>
-#include <cyg/io/flash.h>
+#include <cyg/kernel/kapi.h>
 #include <cyg/io/serialio.h>
 #include <cyg/io/io.h>
-#include <cyg/kernel/kapi.h>
-
-#ifdef HAVE_IFADDRS_H
+#include <netinet/tcp.h>
+#include "rom.h"
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <stdio.h>
 #include <ifaddrs.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+#include <string.h>
 
+#include <unistd.h>
+#include <stdio.h>
+
+
 #define MAX_IFS 64
 #if defined(CYGPKG_NET_FREEBSD_STACK)
 #include <tftp_support.h>

Modified: trunk/src/helper/ioutil.c
===================================================================
--- trunk/src/helper/ioutil.c	2009-05-11 07:04:25 UTC (rev 1722)
+++ trunk/src/helper/ioutil.c	2009-05-11 07:26:11 UTC (rev 1723)
@@ -51,8 +51,10 @@
 #include <ifaddrs.h>
 #endif
 #ifdef HAVE_MALLOC_H
+#if !BUILD_ECOSBOARD
 #include <malloc.h>
 #endif
+#endif
 //#ifdef HAVE_STRINGS_H
 //#include <strings.h>
 //#endif

[Openocd-svn] r1722 - trunk/src/helper

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 09:04:25 +0200 (Mon, 11 May 2009)
New Revision: 1722

Modified:
   trunk/src/helper/system.h
Log:
Add svn:eol-style property to recently added system.h.


Property changes on: trunk/src/helper/system.h
___________________________________________________________________
Name: svn:eol-style
   + native

[Openocd-svn] r1721 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 08:55:00 +0200 (Mon, 11 May 2009)
New Revision: 1721

Modified:
   trunk/src/target/arm_jtag.h
Log:
used by upcoming commits

Modified: trunk/src/target/arm_jtag.h
===================================================================
--- trunk/src/target/arm_jtag.h	2009-05-11 06:54:00 UTC (rev 1720)
+++ trunk/src/target/arm_jtag.h	2009-05-11 06:55:00 UTC (rev 1721)
@@ -56,5 +56,18 @@
 int arm_jtag_buf_to_be16(u8 *in_buf, void *priv, struct scan_field_s *field);
 int arm_jtag_buf_to_8(u8 *in_buf, void *priv, struct scan_field_s *field);
 
+
+/* use this as a static so we can inline it in -O3 and refer to it via a pointer  */
+static __inline__ void arm7flip32(u8 *in)
+{
+	*((u32 *)in)=flip_u32(le_to_h_u32(in), 32);
+}
+
+static __inline__ void arm_le_to_h_u32(u8 *in)
+{
+	*((u32 *)in)=le_to_h_u32(in);
+}
+
+
 #endif /* ARM_JTAG */
 

[Openocd-svn] r1720 - trunk

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-11 08:54:00 +0200 (Mon, 11 May 2009)
New Revision: 1720

Modified:
   trunk/
Log:
add to svn ignore


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - autom4te.cache
.project
aclocal.m4
config.guess
config.h.in
config.sub
configure
depcomp
install-sh
Makefile.in
missing
compile

   + autom4te.cache
.project
aclocal.m4
config.guess
config.h.in
config.sub
configure
depcomp
install-sh
Makefile.in
missing
compile
ltmain.sh.lnk

[Openocd-svn] r1719 - trunk

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 08:32:59 +0200 (Mon, 11 May 2009)
New Revision: 1719

Modified:
   trunk/Doxyfile
Log:
Update Doxyfile configuration for doxygen 1.5.8:
- Enable doxygen's C language optimizations.
- Use dot command (from graphviz package) to generate visual graphs.


Modified: trunk/Doxyfile
===================================================================
--- trunk/Doxyfile	2009-05-11 05:50:21 UTC (rev 1718)
+++ trunk/Doxyfile	2009-05-11 06:32:59 UTC (rev 1719)
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.5
+# Doxyfile 1.5.8
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -57,8 +57,8 @@
 # Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
 # Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
 # Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# and Ukrainian.
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
@@ -155,13 +155,6 @@
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
 # member inherits the documentation from any documented member that it
 # re-implements.
@@ -193,7 +186,7 @@
 # For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
-OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_FOR_C  = YES
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
 # sources only. Doxygen will then generate output that is more tailored for
@@ -214,6 +207,17 @@
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
+# Doxygen selects the parser to use depending on the extension of the files it parses. 
+# With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+# The format is ext=language, where ext is a file extension, and language is one of 
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# use: inc=Fortran f=C
+
+EXTENSION_MAPPING      = 
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should
 # set this tag to YES in order to let doxygen match functions declarations and
@@ -234,6 +238,15 @@
 
 SIP_SUPPORT            = NO
 
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = NO
+
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
@@ -259,6 +272,22 @@
 
 TYPEDEF_HIDES_STRUCT   = NO
 
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -443,6 +472,19 @@
 
 SHOW_DIRECTORIES       = YES
 
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page. 
+# This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
@@ -453,6 +495,15 @@
 
 FILE_VERSION_FILTER    =
 
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE            = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -513,7 +564,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = src
+INPUT                  = config.h src
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -598,14 +649,17 @@
 # by executing (via popen()) the command <filter> <input-file>, where <filter>
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
 # input file. Doxygen will then use the output that the filter program writes
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be
+# to standard output. 
+# If FILTER_PATTERNS is specified, this tag will be 
 # ignored.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.  Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.  The filters are a list of the form:
+# basis. 
+# Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match. 
+# The filters are a list of the form: 
 # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
 # info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
 # is applied to all files.
@@ -640,13 +694,13 @@
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# If the REFERENCED_BY_RELATION tag is set to YES 
 # then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default)
+# If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities
 # called/used by that function will be listed.
 
@@ -655,7 +709,8 @@
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
 # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.  Otherwise they will link to the documentstion.
+# link to the source code. 
+# Otherwise they will link to the documentation.
 
 REFERENCES_LINK_SOURCE = YES
 
@@ -744,12 +799,13 @@
 
 HTML_ALIGN_MEMBERS     = YES
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
-GENERATE_HTMLHELP      = NO
+HTML_DYNAMIC_SECTIONS  = NO
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
@@ -759,6 +815,7 @@
 # directory and running "make install" will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
 # it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
 
 GENERATE_DOCSET        = NO
 
@@ -776,13 +833,12 @@
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
 
-HTML_DYNAMIC_SECTIONS  = NO
+GENERATE_HTMLHELP      = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
 # be used to specify the file name of the resulting .chm file. You
@@ -804,6 +860,12 @@
 
 GENERATE_CHI           = NO
 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
 # controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
@@ -815,6 +877,55 @@
 
 TOC_EXPAND             = NO
 
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = 
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+# For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at
 # top of each HTML page. The value NO (the default) enables the index and
 # the value YES disables it.
@@ -826,12 +937,20 @@
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to FRAME, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports
 # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
 
 GENERATE_TREEVIEW      = YES
 
@@ -841,6 +960,14 @@
 
 TREEVIEW_WIDTH         = 250
 
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -1053,8 +1180,10 @@
 PERLMOD_LATEX          = NO
 
 # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
+# nicely formatted so it can be parsed by a human reader. 
+# This is useful 
+# if you want to understand what is going on. 
+# On the other hand, if this 
 # tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
@@ -1099,14 +1228,7 @@
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           = src/target \
-                         src/pld \
-                         src/xsvf \
-                         src/jtag \
-                         src/flash \
-                         src/flash/at91sam7x \
-                         src/helper \
-                         src/server
+INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -1123,7 +1245,7 @@
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
-PREDEFINED             =
+PREDEFINED             = HAVE_CONFIG_H
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
@@ -1148,8 +1270,10 @@
 # Optionally an initial location of the external documentation
 # can be added for each tagfile. The format of a tag file without
 # this location is as follows:
+#  
 #   TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
+#  
 #   TAGFILES = file1=loc1 "file2 = loc2" ...
 # where "loc1" and "loc2" can be relative or absolute paths or
 # URLs. If a location is present for each tag, the installdox tool
@@ -1216,8 +1340,31 @@
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect inheritance relations. Setting this tag to YES will force the
@@ -1307,7 +1454,7 @@
 
 DOTFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
 # nodes that will be shown in the graph. If the number of nodes in a graph
 # becomes larger than this value, doxygen will truncate the graph, which is
 # visualized by representing a node as a red box. Note that doxygen if the
@@ -1328,10 +1475,10 @@
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is enabled by default, which results in a transparent
-# background. Warning: Depending on the platform used, enabling this option
-# may lead to badly anti-aliased labels on the edges of a graph (i.e. they
-# become hard to read).
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 
@@ -1355,7 +1502,7 @@
 DOT_CLEANUP            = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Options related to the search engine
 #---------------------------------------------------------------------------
 
 # The SEARCHENGINE tag specifies whether or not a search engine should be

[Openocd-svn] r1718 - trunk/src/helper

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 07:50:21 +0200 (Mon, 11 May 2009)
New Revision: 1718

Modified:
   trunk/src/helper/log.c
   trunk/src/helper/options.c
Log:
Mark API layering violations in the helper module with @todo notes.

Modified: trunk/src/helper/log.c
===================================================================
--- trunk/src/helper/log.c	2009-05-11 05:33:39 UTC (rev 1717)
+++ trunk/src/helper/log.c	2009-05-11 05:50:21 UTC (rev 1718)
@@ -29,6 +29,7 @@
 
 #include "log.h"
 #include "time_support.h"
+// @todo the inclusion of server.h here is a layering violation
 #include "server.h"
 
 #include <stdarg.h>

Modified: trunk/src/helper/options.c
===================================================================
--- trunk/src/helper/options.c	2009-05-11 05:33:39 UTC (rev 1717)
+++ trunk/src/helper/options.c	2009-05-11 05:50:21 UTC (rev 1718)
@@ -26,6 +26,7 @@
 
 #include "configuration.h"
 #include "log.h"
+// @todo the inclusion of server.h here is a layering violation
 #include "server.h"
 
 #include <getopt.h>

[Openocd-svn] r1717 - trunk/src/helper

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 07:33:39 +0200 (Mon, 11 May 2009)
New Revision: 1717

Modified:
   trunk/src/helper/replacements.h
Log:
Remove redundant config.h from replacements.h, obtained from types.h.

Modified: trunk/src/helper/replacements.h
===================================================================
--- trunk/src/helper/replacements.h	2009-05-11 05:00:17 UTC (rev 1716)
+++ trunk/src/helper/replacements.h	2009-05-11 05:33:39 UTC (rev 1717)
@@ -26,10 +26,6 @@
 #ifndef REPLACEMENTS_H
 #define REPLACEMENTS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "types.h"
 #include "system.h"
 

[Openocd-svn] r1716 - trunk/src

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 07:00:17 +0200 (Mon, 11 May 2009)
New Revision: 1716

Modified:
   trunk/src/ecosboard.c
   trunk/src/openocd.c
Log:
Audit and eliminate redundant #include directives in main src/ files.

Modified: trunk/src/ecosboard.c
===================================================================
--- trunk/src/ecosboard.c	2009-05-11 04:56:37 UTC (rev 1715)
+++ trunk/src/ecosboard.c	2009-05-11 05:00:17 UTC (rev 1716)
@@ -21,68 +21,54 @@
 #include "config.h"
 #endif
 
-#include "log.h"
-#include "types.h"
-#include "jtag.h"
 #include "configuration.h"
+#include "time_support.h"
+
+#include "jtag.h"
 #include "xsvf.h"
 #include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
 #include "pld.h"
+#include "rom.h"
 
-#include "command.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
 
-#include <time_support.h>
-#include <sys/time.h>
-#include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <cyg/io/flash.h>
 #include <pkgconf/fs_jffs2.h>	// Address of JFFS2
 #include <network.h>
 
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <cyg/fileio/fileio.h>
+#include <arpa/inet.h>
 #include <dirent.h>
+#include <net/if.h>
+#include <netdb.h>
+#include <netinet/tcp.h>
+#include <stdarg.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+
 #include <cyg/athttpd/http.h>
 #include <cyg/athttpd/socket.h>
 #include <cyg/athttpd/handler.h>
 #include <cyg/athttpd/cgi.h>
 #include <cyg/athttpd/forms.h>
 #include <cyg/discover/discover.h>
+#include <cyg/fileio/fileio.h>
 #include <cyg/hal/hal_diag.h>
-#include <cyg/kernel/kapi.h>
+#include <cyg/io/flash.h>
 #include <cyg/io/serialio.h>
 #include <cyg/io/io.h>
-#include <netinet/tcp.h>
-#include "rom.h"
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
+#include <cyg/kernel/kapi.h>
+
+#ifdef HAVE_IFADDRS_H
 #include <ifaddrs.h>
-#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
-#include <unistd.h>
-#include <stdio.h>
 #define MAX_IFS 64
 #if defined(CYGPKG_NET_FREEBSD_STACK)
 #include <tftp_support.h>
@@ -1096,20 +1082,7 @@
 #include <cyg/kernel/ktypes.h>         // base kernel types
 #include <cyg/infra/cyg_trac.h>        // tracing macros
 #include <cyg/infra/cyg_ass.h>         // assertion macros
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <dirent.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <cyg/fileio/fileio.h>
-
 #include <cyg/kernel/kapi.h>
 #include <cyg/infra/diag.h>
 

Modified: trunk/src/openocd.c
===================================================================
--- trunk/src/openocd.c	2009-05-11 04:56:37 UTC (rev 1715)
+++ trunk/src/openocd.c	2009-05-11 05:00:17 UTC (rev 1716)
@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
@@ -40,19 +38,14 @@
 #include "pld.h"
 #include "mflash.h"
 
-#include "command.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
 #include "tcl_server.h"
 
-#include <sys/time.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
+#endif
 
 
 #define OPENOCD_VERSION \

[Openocd-svn] r1715 - trunk/src/target

[<zw...@ma...>]

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

[Openocd-svn] r1714 - trunk/src/target

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:46:21 +0200 (Mon, 11 May 2009)
New Revision: 1714

Modified:
   trunk/src/target/arm11.c
   trunk/src/target/arm11.h
   trunk/src/target/arm11_dbgtap.c
   trunk/src/target/arm720t.c
   trunk/src/target/arm720t.h
   trunk/src/target/arm7_9_common.c
   trunk/src/target/arm7_9_common.h
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm7tdmi.h
   trunk/src/target/arm920t.c
   trunk/src/target/arm920t.h
   trunk/src/target/arm926ejs.c
   trunk/src/target/arm926ejs.h
   trunk/src/target/arm966e.c
   trunk/src/target/arm966e.h
   trunk/src/target/arm9tdmi.c
   trunk/src/target/arm9tdmi.h
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/arm_disassembler.c
   trunk/src/target/arm_jtag.c
   trunk/src/target/arm_jtag.h
   trunk/src/target/arm_simulator.c
   trunk/src/target/arm_simulator.h
   trunk/src/target/armv4_5.c
   trunk/src/target/armv4_5_cache.c
   trunk/src/target/armv4_5_cache.h
   trunk/src/target/armv4_5_mmu.c
   trunk/src/target/armv4_5_mmu.h
   trunk/src/target/armv7m.c
   trunk/src/target/armv7m.h
Log:
Audit and eliminate redundant #include directives in arm target files.

Modified: trunk/src/target/arm11.c
===================================================================
--- trunk/src/target/arm11.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm11.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,11 +26,7 @@
 #endif
 
 #include "arm11.h"
-#include "jtag.h"
-#include "log.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_

Modified: trunk/src/target/arm11.h
===================================================================
--- trunk/src/target/arm11.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm11.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,11 +22,7 @@
 #ifndef ARM11_H
 #define ARM11_H
 
-#include "target.h"
-#include "register.h"
 #include "embeddedice.h"
-#include "arm_jtag.h"
-#include "types.h"
 
 #define asizeof(x)	(sizeof(x) / sizeof((x)[0]))
 

Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm11_dbgtap.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -24,11 +24,7 @@
 #endif
 
 #include "arm11.h"
-#include "jtag.h"
-#include "log.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define JTAG_DEBUG(expr ...)	DEBUG(expr)

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm720t.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,12 +22,8 @@
 #endif
 
 #include "arm720t.h"
-#include "jtag.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_

Modified: trunk/src/target/arm720t.h
===================================================================
--- trunk/src/target/arm720t.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm720t.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,13 +20,8 @@
 #ifndef ARM720T_H
 #define ARM720T_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm7tdmi.h"
 #include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
 
 #define	ARM720T_COMMON_MAGIC 0xa720a720
 

Modified: trunk/src/target/arm7_9_common.c
===================================================================
--- trunk/src/target/arm7_9_common.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7_9_common.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -30,28 +30,13 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "embeddedice.h"
-#include "target.h"
 #include "target_request.h"
-#include "armv4_5.h"
-#include "arm_jtag.h"
-#include "jtag.h"
-#include "log.h"
 #include "arm7_9_common.h"
-#include "breakpoints.h"
 #include "time_support.h"
 #include "arm_simulator.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <errno.h>
-
 int arm7_9_debug_entry(target_t *target);
 int arm7_9_enable_sw_bkpts(struct target_s *target);
 

Modified: trunk/src/target/arm7_9_common.h
===================================================================
--- trunk/src/target/arm7_9_common.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7_9_common.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -29,11 +29,7 @@
 #ifndef ARM7_9_COMMON_H
 #define ARM7_9_COMMON_H
 
-#include "armv4_5.h"
-#include "arm_jtag.h"
 #include "breakpoints.h"
-#include "target.h"
-
 #include "etm.h"
 
 #define	ARM7_9_COMMON_MAGIC 0x0a790a79

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7tdmi.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -29,19 +29,7 @@
 
 #include "arm7tdmi.h"
 
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "etm.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif

Modified: trunk/src/target/arm7tdmi.h
===================================================================
--- trunk/src/target/arm7tdmi.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7tdmi.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,12 +23,7 @@
 #ifndef ARM7TDMI_H
 #define ARM7TDMI_H
 
-#include "target.h"
-#include "register.h"
-#include "armv4_5.h"
 #include "embeddedice.h"
-#include "arm_jtag.h"
-#include "arm7_9_common.h"
 
 #define	ARM7TDMI_COMMON_MAGIC 0x00a700a7
 

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm920t.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,12 +22,8 @@
 #endif
 
 #include "arm920t.h"
-#include "jtag.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_

Modified: trunk/src/target/arm920t.h
===================================================================
--- trunk/src/target/arm920t.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm920t.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,13 +20,8 @@
 #ifndef ARM920T_H
 #define ARM920T_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
 
 #define	ARM920T_COMMON_MAGIC 0xa920a920
 

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm926ejs.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,12 +22,8 @@
 #endif
 
 #include "arm926ejs.h"
-#include "jtag.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_

Modified: trunk/src/target/arm926ejs.h
===================================================================
--- trunk/src/target/arm926ejs.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm926ejs.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,13 +20,8 @@
 #ifndef ARM926EJS_H
 #define ARM926EJS_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
 
 #define	ARM926EJS_COMMON_MAGIC 0xa926a926
 

Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm966e.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,18 +26,7 @@
 
 #include "arm966e.h"
 
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif

Modified: trunk/src/target/arm966e.h
===================================================================
--- trunk/src/target/arm966e.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm966e.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,10 +23,6 @@
 #ifndef ARM966E_H
 #define ARM966E_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm9tdmi.h"
 
 #define	ARM966E_COMMON_MAGIC 0x20f920f9

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm9tdmi.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -29,20 +29,7 @@
 
 #include "arm9tdmi.h"
 
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "etm.h"
-#include "etb.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif

Modified: trunk/src/target/arm9tdmi.h
===================================================================
--- trunk/src/target/arm9tdmi.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm9tdmi.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,12 +23,7 @@
 #ifndef ARM9TDMI_H
 #define ARM9TDMI_H
 
-#include "target.h"
-#include "register.h"
-#include "armv4_5.h"
 #include "embeddedice.h"
-#include "arm_jtag.h"
-#include "arm7_9_common.h"
 
 #define	ARM9TDMI_COMMON_MAGIC 0x00a900a9
 

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_adi_v5.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -38,14 +38,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "arm_adi_v5.h"
-#include "jtag.h"
-#include "log.h"
 #include "time_support.h"
-#include <stdlib.h>
-#include <string.h>
 
 /*
  * Transaction Mode:

Modified: trunk/src/target/arm_disassembler.c
===================================================================
--- trunk/src/target/arm_disassembler.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_disassembler.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,10 +22,8 @@
 #endif
 
 #include "arm_disassembler.h"
-
 #include "log.h"
 
-#include <string.h>
 
 /* textual represenation of the condition field */
 /* ALways (default) is ommitted (empty string) */

Modified: trunk/src/target/arm_jtag.c
===================================================================
--- trunk/src/target/arm_jtag.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_jtag.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,12 +26,7 @@
 
 #include "arm_jtag.h"
 
-#include "binarybuffer.h"
-#include "log.h"
-#include "jtag.h"
 
-#include <stdlib.h>
-
 #if 0
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif

Modified: trunk/src/target/arm_jtag.h
===================================================================
--- trunk/src/target/arm_jtag.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_jtag.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,7 +23,6 @@
 #ifndef ARM_JTAG
 #define ARM_JTAG
 
-#include "types.h"
 #include "jtag.h"
 
 typedef struct arm_jtag_s

Modified: trunk/src/target/arm_simulator.c
===================================================================
--- trunk/src/target/arm_simulator.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_simulator.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -24,14 +24,12 @@
 #include "config.h"
 #endif
 
-#include "target.h"
 #include "armv4_5.h"
 #include "arm_disassembler.h"
 #include "arm_simulator.h"
 #include "log.h"
 #include "binarybuffer.h"
 
-#include <string.h>
 
 u32 arm_shift(u8 shift, u32 Rm, u32 shift_amount, u8 *carry)
 {

Modified: trunk/src/target/arm_simulator.h
===================================================================
--- trunk/src/target/arm_simulator.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_simulator.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,11 +20,11 @@
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 
-#include "target.h"
 #include "types.h"
 
-extern int arm_simulate_step(target_t *target, u32 *dry_run_pc);
+struct target_s;
 
+extern int arm_simulate_step(struct target_s *target, u32 *dry_run_pc);
 
 #define ERROR_ARM_SIMULATOR_NOT_IMPLEMENTED	(-700)
 

Modified: trunk/src/target/armv4_5.c
===================================================================
--- trunk/src/target/armv4_5.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -27,21 +27,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include "arm_disassembler.h"
-
 #include "armv4_5.h"
-
-#include "target.h"
-#include "register.h"
-#include "log.h"
+#include "arm_disassembler.h"
 #include "binarybuffer.h"
-#include "command.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 bitfield_desc_t armv4_5_psr_bitfield_desc[] =
 {

Modified: trunk/src/target/armv4_5_cache.c
===================================================================
--- trunk/src/target/armv4_5_cache.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_cache.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,9 +22,7 @@
 #endif
 
 #include "armv4_5_cache.h"
-
 #include "log.h"
-#include "command.h"
 
 int armv4_5_identify_cache(u32 cache_type_reg, armv4_5_cache_common_t *cache)
 {

Modified: trunk/src/target/armv4_5_cache.h
===================================================================
--- trunk/src/target/armv4_5_cache.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_cache.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -21,8 +21,9 @@
 #define ARMV4_5_CACHE_H
 
 #include "types.h"
-#include "command.h"
 
+struct command_context_s;
+
 typedef struct armv4_5_cachesize_s
 {
 	int linelen;

Modified: trunk/src/target/armv4_5_mmu.c
===================================================================
--- trunk/src/target/armv4_5_mmu.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_mmu.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -21,13 +21,9 @@
 #include "config.h"
 #endif
 
-#include "arm7_9_common.h"
 #include "log.h"
-#include "command.h"
 #include "armv4_5_mmu.h"
-#include "target.h"
 
-#include <stdlib.h>
 
 u32 armv4mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 va, int *type, u32 *cb, int *domain, u32 *ap);
 

Modified: trunk/src/target/armv4_5_mmu.h
===================================================================
--- trunk/src/target/armv4_5_mmu.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_mmu.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -21,6 +21,7 @@
 #define ARMV4_5_MMU_H
 
 #include "armv4_5_cache.h"
+#include "target.h"
 
 typedef struct armv4_5_mmu_common_s
 {

Modified: trunk/src/target/armv7m.c
===================================================================
--- trunk/src/target/armv7m.c	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv7m.c	2009-05-11 04:46:21 UTC (rev 1714)
@@ -30,17 +30,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "armv7m.h"
-#include "register.h"
-#include "target.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_

Modified: trunk/src/target/armv7m.h
===================================================================
--- trunk/src/target/armv7m.h	2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv7m.h	2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,9 +26,6 @@
 #ifndef ARMV7M_COMMON_H
 #define ARMV7M_COMMON_H
 
-#include "register.h"
-#include "target.h"
-#include "arm_jtag.h"
 #include "arm_adi_v5.h"
 
 /* define for enabling armv7 gdb workarounds */

[Openocd-svn] r1713 - trunk/src/target

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:38:18 +0200 (Mon, 11 May 2009)
New Revision: 1713

Modified:
   trunk/src/target/breakpoints.h
   trunk/src/target/target.c
   trunk/src/target/target.h
Log:
Audit and eliminate redundant #include directives in core target files.

Modified: trunk/src/target/breakpoints.h
===================================================================
--- trunk/src/target/breakpoints.h	2009-05-11 04:30:41 UTC (rev 1712)
+++ trunk/src/target/breakpoints.h	2009-05-11 04:38:18 UTC (rev 1713)
@@ -20,7 +20,7 @@
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 
-#include "target.h"
+#include "types.h"
 
 struct target_s;
 

Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-05-11 04:30:41 UTC (rev 1712)
+++ trunk/src/target/target.c	2009-05-11 04:38:18 UTC (rev 1713)
@@ -33,31 +33,17 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
 #include "target.h"
 #include "target_request.h"
-
-#include "log.h"
-#include "configuration.h"
-#include "binarybuffer.h"
+#include "time_support.h"
+#include "register.h"
+#include "trace.h"
+#include "image.h"
 #include "jtag.h"
 
-#include <string.h>
-#include <stdlib.h>
 #include <inttypes.h>
 
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
 
-#include <sys/time.h>
-#include <time.h>
-
-#include <time_support.h>
-
-#include <fileio.h>
-#include <image.h>
-
 static int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

Modified: trunk/src/target/target.h
===================================================================
--- trunk/src/target/target.h	2009-05-11 04:30:41 UTC (rev 1712)
+++ trunk/src/target/target.h	2009-05-11 04:38:18 UTC (rev 1713)
@@ -26,19 +26,16 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include "register.h"
 #include "breakpoints.h"
 #include "algorithm.h"
-#include "trace.h"
-
 #include "command.h"
-#include "types.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include "replacements.h"
 
 struct reg_s;
+struct trace_s;
 struct command_context_s;
+
 /*
  * TARGET_UNKNOWN = 0: we don't know anything about the target yet
  * TARGET_RUNNING = 1: the target is executing user code

[Openocd-svn] r1712 - trunk/src/flash

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:30:41 +0200 (Mon, 11 May 2009)
New Revision: 1712

Modified:
   trunk/src/flash/aduc702x.c
   trunk/src/flash/at91sam7.c
   trunk/src/flash/avrf.c
   trunk/src/flash/cfi.c
   trunk/src/flash/ecos.c
   trunk/src/flash/flash.c
   trunk/src/flash/lpc2000.c
   trunk/src/flash/lpc288x.c
   trunk/src/flash/lpc3180_nand_controller.c
   trunk/src/flash/mflash.c
   trunk/src/flash/nand.c
   trunk/src/flash/nand_ecc.c
   trunk/src/flash/non_cfi.c
   trunk/src/flash/ocl.c
   trunk/src/flash/orion_nand.c
   trunk/src/flash/pic32mx.c
   trunk/src/flash/s3c2410_nand.c
   trunk/src/flash/s3c2412_nand.c
   trunk/src/flash/s3c2440_nand.c
   trunk/src/flash/s3c2443_nand.c
   trunk/src/flash/s3c24xx_nand.c
   trunk/src/flash/stellaris.c
   trunk/src/flash/stm32x.c
   trunk/src/flash/str7x.c
   trunk/src/flash/str9x.c
   trunk/src/flash/str9xpec.c
   trunk/src/flash/tms470.c
Log:
Audit and eliminate redundant #include directives in src/flash sources.

Modified: trunk/src/flash/aduc702x.c
===================================================================
--- trunk/src/flash/aduc702x.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/aduc702x.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -23,18 +23,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "time_support.h"
 #include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
+#include "time_support.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int aduc702x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int aduc702x_register_commands(struct command_context_s *cmd_ctx);

Modified: trunk/src/flash/at91sam7.c
===================================================================
--- trunk/src/flash/at91sam7.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/at91sam7.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -39,19 +39,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "at91sam7.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int at91sam7_register_commands(struct command_context_s *cmd_ctx);
 static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

Modified: trunk/src/flash/avrf.c
===================================================================
--- trunk/src/flash/avrf.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/avrf.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -21,18 +21,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "avrf.h"
 #include "avrt.h"
 #include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 /* AVR_JTAG_Instructions */
 #define AVR_JTAG_INS_LEN							4

Modified: trunk/src/flash/cfi.c
===================================================================
--- trunk/src/flash/cfi.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/cfi.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -23,22 +23,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "cfi.h"
 #include "non_cfi.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int cfi_register_commands(struct command_context_s *cmd_ctx);
 static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

Modified: trunk/src/flash/ecos.c
===================================================================
--- trunk/src/flash/ecos.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/ecos.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -21,21 +21,11 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
-#include "replacements.h"
-
 #include "flash.h"
+#include "embeddedice.h"
+#include "image.h"
 
-#include "target.h"
 
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "../target/embeddedice.h"
-#include "types.h"
-
 static int ecosflash_register_commands(struct command_context_s *cmd_ctx);
 static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int ecosflash_erase(struct flash_bank_s *bank, int first, int last);

Modified: trunk/src/flash/flash.c
===================================================================
--- trunk/src/flash/flash.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/flash.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -28,22 +28,9 @@
 #endif
 
 #include "flash.h"
-#include "command.h"
-#include "target.h"
-#include "time_support.h"
-#include "fileio.h"
 #include "image.h"
-#include "log.h"
-#include "armv4_5.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
-#include "armv7m.h"
+#include "time_support.h"
 
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <errno.h>
 #include <inttypes.h>
 
 /* command handlers */

Modified: trunk/src/flash/lpc2000.c
===================================================================
--- trunk/src/flash/lpc2000.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/lpc2000.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -23,16 +23,9 @@
 #endif
 
 #include "lpc2000.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 /* flash programming support for Philips LPC2xxx devices
  * currently supported devices:

Modified: trunk/src/flash/lpc288x.c
===================================================================
--- trunk/src/flash/lpc288x.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/lpc288x.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -31,19 +31,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "lpc288x.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #define LOAD_TIMER_ERASE	0
 #define LOAD_TIMER_WRITE	1

Modified: trunk/src/flash/lpc3180_nand_controller.c
===================================================================
--- trunk/src/flash/lpc3180_nand_controller.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/lpc3180_nand_controller.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -22,15 +22,7 @@
 #endif
 
 #include "lpc3180_nand_controller.h"
-
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
 #include "nand.h"
-#include "target.h"
 
 static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int lpc3180_register_commands(struct command_context_s *cmd_ctx);

Modified: trunk/src/flash/mflash.c
===================================================================
--- trunk/src/flash/mflash.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/mflash.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -21,21 +21,12 @@
 #include "config.h"
 #endif
 
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <inttypes.h>
-
-#include "command.h"
-#include "log.h"
-#include "target.h"
+#include "mflash.h"
 #include "time_support.h"
 #include "fileio.h"
-#include "mflash.h"
+#include "log.h"
 
+
 static int s3c2440_set_gpio_to_output (mflash_gpio_num_t gpio);
 static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val);
 static int pxa270_set_gpio_to_output (mflash_gpio_num_t gpio);

Modified: trunk/src/flash/nand.c
===================================================================
--- trunk/src/flash/nand.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/nand.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -24,21 +24,13 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include <errno.h>
-
 #include "nand.h"
-#include "flash.h"
 #include "time_support.h"
 #include "fileio.h"
-#include "image.h"
 
+#include <inttypes.h>
+
+
 static int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

Modified: trunk/src/flash/nand_ecc.c
===================================================================
--- trunk/src/flash/nand_ecc.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/nand_ecc.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -41,10 +41,6 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include <inttypes.h>
-
 #include "nand.h"
 
 /*

Modified: trunk/src/flash/non_cfi.c
===================================================================
--- trunk/src/flash/non_cfi.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/non_cfi.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -23,14 +23,10 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-
-#include "log.h"
-
-#include "flash.h"
-#include "cfi.h"
 #include "non_cfi.h"
+#include "cfi.h"
 
+
 #define KB 1024
 #define MB (1024*1024)
 #define ERASE_REGION(num, size) (((size/256)<<16)|(num-1))

Modified: trunk/src/flash/ocl.c
===================================================================
--- trunk/src/flash/ocl.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/ocl.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -21,21 +21,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "ocl.h"
-
 #include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "types.h"
 #include "embeddedice.h"
-#include "arm7_9_common.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int ocl_register_commands(struct command_context_s *cmd_ctx);
 static int ocl_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

Modified: trunk/src/flash/orion_nand.c
===================================================================
--- trunk/src/flash/orion_nand.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/orion_nand.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -26,17 +26,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
 #include "nand.h"
-#include "target.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
 
+
 typedef struct orion_nand_controller_s
 {
 	struct target_s	*target;

Modified: trunk/src/flash/pic32mx.c
===================================================================
--- trunk/src/flash/pic32mx.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/pic32mx.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -27,18 +27,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "pic32mx.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "mips32.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 static
 struct pic32mx_devs_s {

Modified: trunk/src/flash/s3c2410_nand.c
===================================================================
--- trunk/src/flash/s3c2410_nand.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/s3c2410_nand.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -28,16 +28,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
 
+
 static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2410_init(struct nand_device_s *device);
 static int s3c2410_read_data(struct nand_device_s *device, void *data);

Modified: trunk/src/flash/s3c2412_nand.c
===================================================================
--- trunk/src/flash/s3c2412_nand.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/s3c2412_nand.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -28,16 +28,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
 
+
 static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2412_init(struct nand_device_s *device);
 

Modified: trunk/src/flash/s3c2440_nand.c
===================================================================
--- trunk/src/flash/s3c2440_nand.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/s3c2440_nand.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -28,16 +28,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
 
+
 static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2440_init(struct nand_device_s *device);
 //static int s3c2440_nand_ready(struct nand_device_s *device, int timeout);

Modified: trunk/src/flash/s3c2443_nand.c
===================================================================
--- trunk/src/flash/s3c2443_nand.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/s3c2443_nand.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -28,16 +28,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
 
+
 static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2443_init(struct nand_device_s *device);
 

Modified: trunk/src/flash/s3c24xx_nand.c
===================================================================
--- trunk/src/flash/s3c24xx_nand.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/s3c24xx_nand.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -28,16 +28,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
 
+
 s3c24xx_nand_controller_t *
 s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
 			    char **args, int argc,

Modified: trunk/src/flash/stellaris.c
===================================================================
--- trunk/src/flash/stellaris.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/stellaris.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -28,20 +28,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "stellaris.h"
-#include "cortex_m3.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
+#include "armv7m.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #define DID0_VER(did0) ((did0>>28)&0x07)
 static int stellaris_register_commands(struct command_context_s *cmd_ctx);

Modified: trunk/src/flash/stm32x.c
===================================================================
--- trunk/src/flash/stm32x.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/stm32x.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -24,18 +24,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "stm32x.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv7m.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 static int stm32x_register_commands(struct command_context_s *cmd_ctx);
 static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

Modified: trunk/src/flash/str7x.c
===================================================================
--- trunk/src/flash/str7x.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/str7x.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -24,19 +24,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str7x.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 str7x_mem_layout_t mem_layout_str7bank0[] = {
 	{0x00000000, 0x02000, 0x01},

Modified: trunk/src/flash/str9x.c
===================================================================
--- trunk/src/flash/str9x.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/str9x.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -27,20 +27,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str9x.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "armv4_5.h"
 #include "arm966e.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static u32 bank1start = 0x00080000;
 

Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/str9xpec.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -24,21 +24,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str9xpec.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "armv4_5.h"
 #include "arm7_9_common.h"
-#include "jtag.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
 
 static int str9xpec_register_commands(struct command_context_s *cmd_ctx);
 static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

Modified: trunk/src/flash/tms470.c
===================================================================
--- trunk/src/flash/tms470.c	2009-05-11 04:28:24 UTC (rev 1711)
+++ trunk/src/flash/tms470.c	2009-05-11 04:30:41 UTC (rev 1712)
@@ -21,11 +21,9 @@
 #include "config.h"
 #endif
 
-#include "log.h"
 #include "tms470.h"
-#include <string.h>
-#include <unistd.h>
 
+
 static int tms470_register_commands(struct command_context_s *cmd_ctx);
 static int tms470_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int tms470_erase(struct flash_bank_s *bank, int first, int last);

[Openocd-svn] r1711 - trunk/src/flash

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:28:24 +0200 (Mon, 11 May 2009)
New Revision: 1711

Modified:
   trunk/src/flash/at91sam7.h
   trunk/src/flash/avrf.h
   trunk/src/flash/cfi.h
   trunk/src/flash/flash.h
   trunk/src/flash/lpc2000.h
   trunk/src/flash/lpc288x.h
   trunk/src/flash/mflash.h
   trunk/src/flash/non_cfi.h
   trunk/src/flash/pic32mx.h
   trunk/src/flash/s3c24xx_nand.h
   trunk/src/flash/stellaris.h
   trunk/src/flash/stm32x.h
   trunk/src/flash/str7x.h
   trunk/src/flash/str9x.h
   trunk/src/flash/str9xpec.h
Log:
Audit and eliminate redundant #include directives in src/flash headers.

Modified: trunk/src/flash/at91sam7.h
===================================================================
--- trunk/src/flash/at91sam7.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/at91sam7.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -24,7 +24,6 @@
 #define AT91SAM7_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct at91sam7_flash_bank_s
 {

Modified: trunk/src/flash/avrf.h
===================================================================
--- trunk/src/flash/avrf.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/avrf.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -20,6 +20,8 @@
 #ifndef AVRF_H
 #define AVRF_H
 
+#include "types.h"
+
 typedef struct avrf_type_s
 {
 	char name[15];

Modified: trunk/src/flash/cfi.h
===================================================================
--- trunk/src/flash/cfi.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/cfi.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -21,7 +21,6 @@
 #define CFI_H
 
 #include "flash.h"
-#include "target.h"
 
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */

Modified: trunk/src/flash/flash.h
===================================================================
--- trunk/src/flash/flash.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/flash.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -27,8 +27,10 @@
 #define FLASH_H
 
 #include "target.h"
-#include "image.h"
+#include "log.h"
 
+struct image_s;
+
 #define FLASH_MAX_ERROR_STR	(128)
 
 typedef struct flash_sector_s
@@ -65,7 +67,7 @@
 
 typedef struct flash_bank_s
 {
-	target_t *target;
+	struct target_s *target;
 	flash_driver_t *driver;
 	void *driver_priv;
 	int bank_number;
@@ -81,8 +83,8 @@
 extern int flash_register_commands(struct command_context_s *cmd_ctx);
 extern int flash_init_drivers(struct command_context_s *cmd_ctx);
 
-extern int flash_erase_address_range(target_t *target, u32 addr, u32 length);
-extern int flash_write(target_t *target, image_t *image, u32 *written, int erase);
+extern int flash_erase_address_range(struct target_s *target, u32 addr, u32 length);
+extern int flash_write(struct target_s *target, struct image_s *image, u32 *written, int erase);
 extern void flash_set_dirty(void);
 extern int flash_get_bank_count(void);
 extern int default_flash_blank_check(struct flash_bank_s *bank);
@@ -90,7 +92,7 @@
 
 extern flash_bank_t *get_flash_bank_by_num(int num);
 extern flash_bank_t *get_flash_bank_by_num_noprobe(int num);
-extern flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr);
+extern flash_bank_t *get_flash_bank_by_addr(struct target_s *target, u32 addr);
 
 #define ERROR_FLASH_BANK_INVALID			(-900)
 #define ERROR_FLASH_SECTOR_INVALID			(-901)

Modified: trunk/src/flash/lpc2000.h
===================================================================
--- trunk/src/flash/lpc2000.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/lpc2000.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -21,7 +21,6 @@
 #define LPC2000_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct lpc2000_flash_bank_s
 {

Modified: trunk/src/flash/lpc288x.h
===================================================================
--- trunk/src/flash/lpc288x.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/lpc288x.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -22,7 +22,6 @@
 #define lpc288x_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct lpc288x_flash_bank_s
 {

Modified: trunk/src/flash/mflash.h
===================================================================
--- trunk/src/flash/mflash.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/mflash.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -20,6 +20,8 @@
 #ifndef _MFLASH_H
 #define _MFLASH_H
 
+#include "target.h"
+
 typedef unsigned long mg_io_uint32;
 typedef unsigned short mg_io_uint16;
 typedef unsigned char mg_io_uint8;

Modified: trunk/src/flash/non_cfi.h
===================================================================
--- trunk/src/flash/non_cfi.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/non_cfi.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -20,7 +20,7 @@
 #ifndef NON_CFI_H
 #define NON_CFI_H
 
-#include "types.h"
+#include "flash.h"
 
 typedef struct non_cfi_s
 {

Modified: trunk/src/flash/pic32mx.h
===================================================================
--- trunk/src/flash/pic32mx.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/pic32mx.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -27,7 +27,6 @@
 #define PIC32MX_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct pic32mx_flash_bank_s
 {

Modified: trunk/src/flash/s3c24xx_nand.h
===================================================================
--- trunk/src/flash/s3c24xx_nand.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/s3c24xx_nand.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -24,7 +24,7 @@
  * Many thanks to Simtec Electronics for sponsoring this work.
  */
 
-#include "target.h"
+#include "nand.h"
 #include "s3c24xx_regs_nand.h"
 
 typedef struct s3c24xx_nand_controller_s

Modified: trunk/src/flash/stellaris.h
===================================================================
--- trunk/src/flash/stellaris.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/stellaris.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -21,7 +21,6 @@
 #define STELLARIS_FLASH_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct stellaris_flash_bank_s
 {

Modified: trunk/src/flash/stm32x.h
===================================================================
--- trunk/src/flash/stm32x.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/stm32x.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -24,7 +24,6 @@
 #define STM32X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct stm32x_options_s
 {

Modified: trunk/src/flash/str7x.h
===================================================================
--- trunk/src/flash/str7x.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/str7x.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -24,7 +24,6 @@
 #define STR7X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str7x_flash_bank_s
 {

Modified: trunk/src/flash/str9x.h
===================================================================
--- trunk/src/flash/str9x.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/str9x.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -24,7 +24,6 @@
 #define STR9X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str9x_flash_bank_s
 {

Modified: trunk/src/flash/str9xpec.h
===================================================================
--- trunk/src/flash/str9xpec.h	2009-05-11 04:25:09 UTC (rev 1710)
+++ trunk/src/flash/str9xpec.h	2009-05-11 04:28:24 UTC (rev 1711)
@@ -24,7 +24,6 @@
 #define STR9XPEC_H
 
 #include "flash.h"
-#include "target.h"
 #include "jtag.h"
 
 typedef struct str9xpec_flash_controller_s

[Openocd-svn] r1710 - in trunk/src: pld svf xsvf

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:25:09 +0200 (Mon, 11 May 2009)
New Revision: 1710

Modified:
   trunk/src/pld/pld.c
   trunk/src/pld/virtex2.c
   trunk/src/pld/virtex2.h
   trunk/src/pld/xilinx_bit.c
   trunk/src/svf/svf.c
   trunk/src/xsvf/xsvf.c
Log:
Audit and eliminate redundant #include directives in src/{pld,svf,xsvf}.

Modified: trunk/src/pld/pld.c
===================================================================
--- trunk/src/pld/pld.c	2009-05-11 04:22:15 UTC (rev 1709)
+++ trunk/src/pld/pld.c	2009-05-11 04:25:09 UTC (rev 1710)
@@ -21,24 +21,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "pld.h"
-
-#include "jtag.h"
-#include "command.h"
 #include "log.h"
 #include "time_support.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 /* pld drivers
  */
 extern pld_driver_t virtex2_pld;

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-05-11 04:22:15 UTC (rev 1709)
+++ trunk/src/pld/virtex2.c	2009-05-11 04:25:09 UTC (rev 1710)
@@ -22,14 +22,9 @@
 #endif
 
 #include "virtex2.h"
-
-#include "pld.h"
 #include "xilinx_bit.h"
-#include "command.h"
-#include "log.h"
-#include "jtag.h"
+#include "pld.h"
 
-#include <stdlib.h>
 
 int virtex2_register_commands(struct command_context_s *cmd_ctx);
 int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);

Modified: trunk/src/pld/virtex2.h
===================================================================
--- trunk/src/pld/virtex2.h	2009-05-11 04:22:15 UTC (rev 1709)
+++ trunk/src/pld/virtex2.h	2009-05-11 04:25:09 UTC (rev 1710)
@@ -20,9 +20,7 @@
 #ifndef VIRTEX2_H
 #define VIRTEX2_H
 
-#include "types.h"
-#include "pld.h"
-#include "xilinx_bit.h"
+#include "jtag.h"
 
 typedef struct virtex2_pld_device_s
 {

Modified: trunk/src/pld/xilinx_bit.c
===================================================================
--- trunk/src/pld/xilinx_bit.c	2009-05-11 04:22:15 UTC (rev 1709)
+++ trunk/src/pld/xilinx_bit.c	2009-05-11 04:25:09 UTC (rev 1710)
@@ -22,19 +22,11 @@
 #endif
 
 #include "xilinx_bit.h"
-
 #include "pld.h"
 #include "log.h"
 
-#include <stdlib.h>
-#include <unistd.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
 
-#include <sys/time.h>
-#include <time.h>
 
 int read_section(FILE *input_file, int length_size, char section, u32 *buffer_length, u8 **buffer) 
 {

Modified: trunk/src/svf/svf.c
===================================================================
--- trunk/src/svf/svf.c	2009-05-11 04:22:15 UTC (rev 1709)
+++ trunk/src/svf/svf.c	2009-05-11 04:25:09 UTC (rev 1710)
@@ -33,22 +33,10 @@
 #endif
 
 #include "svf.h"
-
 #include "jtag.h"
-#include "command.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 // SVF command
 typedef enum
 {

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-05-11 04:22:15 UTC (rev 1709)
+++ trunk/src/xsvf/xsvf.c	2009-05-11 04:25:09 UTC (rev 1710)
@@ -42,22 +42,11 @@
 #endif
 
 #include "xsvf.h"
-
 #include "jtag.h"
-#include "command.h"
-#include "log.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
 #include <assert.h>
 
-#include <sys/time.h>
-#include <time.h>
 
-
 /* XSVF commands, from appendix B of xapp503.pdf  */
 #define XCOMPLETE		0x00
 #define XTDOMASK			0x01

[Openocd-svn] r1709 - trunk/src/server

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:22:15 +0200 (Mon, 11 May 2009)
New Revision: 1709

Modified:
   trunk/src/server/gdb_server.c
   trunk/src/server/gdb_server.h
   trunk/src/server/httpd.c
   trunk/src/server/server.c
   trunk/src/server/server.h
   trunk/src/server/tcl_server.c
   trunk/src/server/telnet_server.c
Log:
Audit and eliminate redundant #include directives from src/server.

Modified: trunk/src/server/gdb_server.c
===================================================================
--- trunk/src/server/gdb_server.c	2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/gdb_server.c	2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,24 +27,14 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "gdb_server.h"
-
+#include "target_request.h"
+#include "register.h"
 #include "server.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "jtag.h"
-#include "breakpoints.h"
 #include "flash.h"
-#include "target.h"
-#include "target_request.h"
-#include "configuration.h"
+#include "image.h"
+#include "jtag.h"
 
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 
 #if 0
 #define _DEBUG_GDB_IO_

Modified: trunk/src/server/gdb_server.h
===================================================================
--- trunk/src/server/gdb_server.h	2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/gdb_server.h	2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,9 +27,9 @@
 #define GDB_SERVER_H
 
 #include "target.h"
-#include "server.h"
-#include "image.h"
 
+struct image_s;
+
 #define GDB_BUFFER_SIZE	16384
 
 typedef struct gdb_connection_s
@@ -39,7 +39,7 @@
 	int buf_cnt;
 	int ctrl_c;
 	enum target_state frontend_state;
-	image_t *vflash_image;
+	struct image_s *vflash_image;
 	int closed;
 	int busy;
 	int noack_mode;

Modified: trunk/src/server/httpd.c
===================================================================
--- trunk/src/server/httpd.c	2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/httpd.c	2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,30 +27,13 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include "server.h"
-
-#include "log.h"
 #include "telnet_server.h"
 #include "target.h"
 
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include <microhttpd.h>
 #include <pthread.h>
 #include <signal.h>
 
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <microhttpd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
 #define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
 
 int loadFile(const char *name, void **data, size_t *len);

Modified: trunk/src/server/server.c
===================================================================
--- trunk/src/server/server.c	2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/server.c	2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,25 +27,16 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "server.h"
-
-#include "log.h"
-#include "telnet_server.h"
 #include "target.h"
 
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <signal.h>
+
 #ifndef _WIN32
 #include <netinet/tcp.h>
 #endif
 
+
 service_t *services = NULL;
 
 /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */

Modified: trunk/src/server/server.h
===================================================================
--- trunk/src/server/server.h	2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/server.h	2009-05-11 04:22:15 UTC (rev 1709)
@@ -26,10 +26,12 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "command.h"
-#include "binarybuffer.h"
-#include "replacements.h"
+#include "log.h"
 
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
 enum connection_type
 {
 	CONNECTION_TCP,

Modified: trunk/src/server/tcl_server.c
===================================================================
--- trunk/src/server/tcl_server.c	2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/tcl_server.c	2009-05-11 04:22:15 UTC (rev 1709)
@@ -21,18 +21,9 @@
 #include "config.h"
 #endif
 
-#include <stdarg.h>
 #include "tcl_server.h"
 
-#include "log.h"
-#include "command.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-
 #define TCL_SERVER_VERSION	"TCL Server 0.1"
 #define TCL_MAX_LINE		(4096)
 

Modified: trunk/src/server/telnet_server.c
===================================================================
--- trunk/src/server/telnet_server.c	2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/telnet_server.c	2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,22 +27,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "telnet_server.h"
-
-#include "server.h"
-#include "log.h"
-#include "command.h"
-#include "target.h"
 #include "target_request.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-
 static unsigned short telnet_port = 0;
 
 int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

[Openocd-svn] r1708 - trunk/src/target

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:21:24 +0200 (Mon, 11 May 2009)
New Revision: 1708

Modified:
   trunk/src/target/target_request.h
Log:
Fix compilation of target_request.h when it is included first.

Modified: trunk/src/target/target_request.h
===================================================================
--- trunk/src/target/target_request.h	2009-05-11 04:04:58 UTC (rev 1707)
+++ trunk/src/target/target_request.h	2009-05-11 04:21:24 UTC (rev 1708)
@@ -26,7 +26,7 @@
 #ifndef TARGET_REQUEST_H
 #define TARGET_REQUEST_H
 
-#include "command.h"
+#include "target.h"
 
 typedef enum target_req_cmd
 {

[Openocd-svn] r1707 - in trunk/src/jtag: . rlink

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 06:04:58 +0200 (Mon, 11 May 2009)
New Revision: 1707

Modified:
   trunk/src/jtag/amt_jtagaccel.c
   trunk/src/jtag/arm-jtag-ew.c
   trunk/src/jtag/at91rm9200.c
   trunk/src/jtag/bitbang.c
   trunk/src/jtag/bitq.c
   trunk/src/jtag/dummy.c
   trunk/src/jtag/ep93xx.c
   trunk/src/jtag/ft2232.c
   trunk/src/jtag/gw16012.c
   trunk/src/jtag/jlink.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/parport.c
   trunk/src/jtag/presto.c
   trunk/src/jtag/rlink/rlink.c
   trunk/src/jtag/usbprog.c
   trunk/src/jtag/vsllink.c
   trunk/src/jtag/zy1000.c
Log:
Audit and eliminate redundant #include directives from src/jtag.

Modified: trunk/src/jtag/amt_jtagaccel.c
===================================================================
--- trunk/src/jtag/amt_jtagaccel.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/amt_jtagaccel.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -21,25 +21,13 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 
-/* system includes */
 
-#ifdef _WIN32
-#include "errno.h"
-#endif /* _WIN32 */
-
-#include <string.h>
-#include <stdlib.h>
-
 #if PARPORT_USE_PPDEV == 1
 #include <linux/parport.h>
 #include <linux/ppdev.h>
-#include <fcntl.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
 #else /* not PARPORT_USE_PPDEV */
 #ifndef _WIN32
 #include <sys/io.h>
@@ -49,12 +37,9 @@
 #if PARPORT_USE_GIVEIO == 1
 #if IS_CYGWIN == 1
 #include <windows.h>
-#include <errno.h>
 #endif
 #endif
 
-#include "log.h"
-
 /* configuration */
 static u16 amt_jtagaccel_port;
 

Modified: trunk/src/jtag/arm-jtag-ew.c
===================================================================
--- trunk/src/jtag/arm-jtag-ew.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/arm-jtag-ew.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -24,17 +24,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 #include <usb.h>
-#include <string.h>
-#include <ctype.h>
 
-/* system includes */
 
-#include "log.h"
-
 #define USB_VID						0x15ba
 #define USB_PID						0x001e
 

Modified: trunk/src/jtag/at91rm9200.c
===================================================================
--- trunk/src/jtag/at91rm9200.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/at91rm9200.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -21,18 +21,12 @@
 #include "config.h"
 #endif
 
-#include "log.h"
 #include "jtag.h"
 #include "bitbang.h"
 
-/* system includes */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
 
+
 /* AT91RM9200 */
 #define AT91C_BASE_SYS	(0xfffff000)
 

Modified: trunk/src/jtag/bitbang.c
===================================================================
--- trunk/src/jtag/bitbang.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/bitbang.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -25,19 +25,8 @@
 #endif
 
 #include "bitbang.h"
-
-/* project specific includes */
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
-#include "configuration.h"
 
-/* system includes */
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-
 /**
  * Function bitbang_stableclocks
  * issues a number of clock cycles while staying in a stable state.

Modified: trunk/src/jtag/bitq.c
===================================================================
--- trunk/src/jtag/bitq.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/bitq.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -23,17 +23,7 @@
 
 #include "bitq.h"
 
-/* project specific includes */
-#include "log.h"
-#include "types.h"
-#include "jtag.h"
-#include "configuration.h"
 
-/* system includes */
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
 bitq_interface_t* bitq_interface;       /* low level bit queue interface */
 
 static bitq_state_t      bitq_in_state;        /* state of input queue */

Modified: trunk/src/jtag/dummy.c
===================================================================
--- trunk/src/jtag/dummy.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/dummy.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -21,8 +21,6 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 #include "bitbang.h"
 

Modified: trunk/src/jtag/ep93xx.c
===================================================================
--- trunk/src/jtag/ep93xx.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/ep93xx.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#include "log.h"
 #include "jtag.h"
 #include "bitbang.h"
 
@@ -33,14 +32,7 @@
 #define SRST_BIT	32
 #define VCC_BIT		64
 
-/* system includes */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
 #include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 static u8 output_value = 0x0;
 static int dev_mem_fd;

Modified: trunk/src/jtag/ft2232.c
===================================================================
--- trunk/src/jtag/ft2232.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/ft2232.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -33,23 +33,14 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #if IS_CYGWIN == 1
 #include "windows.h"
 #endif
 
 /* project specific includes */
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
-#include "configuration.h"
 #include "time_support.h"
 
-/* system includes */
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 /* FT2232 access library includes */
 #if BUILD_FT2232_FTD2XX == 1

Modified: trunk/src/jtag/gw16012.c
===================================================================
--- trunk/src/jtag/gw16012.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/gw16012.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -21,10 +21,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 
+
 #if 1
 #define _DEBUG_GW16012_IO_
 #endif
@@ -40,14 +39,8 @@
 
 #else
 
-#ifdef _WIN32
-#include "errno.h"
-#endif /* _WIN32 */
-
 #endif /* __FreeBSD__, __FreeBSD_kernel__ */
 
-#include <string.h>
-#include <stdlib.h>
 
 #if PARPORT_USE_PPDEV == 1
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -67,14 +60,10 @@
 #endif
 #endif
 
-#if PARPORT_USE_GIVEIO == 1
-#if IS_CYGWIN == 1
+#if PARPORT_USE_GIVEIO == 1 && IS_CYGWIN == 1
 #include <windows.h>
-#include <errno.h>
 #endif
-#endif
 
-#include "log.h"
 
 /* configuration */
 u16 gw16012_port;

Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/jlink.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -25,15 +25,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 
 #include <usb.h>
-#include <string.h>
-#include <errno.h>
 
-#include "log.h"
 
 #define VID 0x1366
 #define PID 0x0101

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/jtag.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -28,16 +28,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 
-#include "command.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/jtag.h	2009-05-11 04:04:58 UTC (rev 1707)
@@ -23,13 +23,10 @@
 #ifndef JTAG_H
 #define JTAG_H
 
-#include "types.h"
 #include "binarybuffer.h"
 #include "log.h"
 
-#include "command.h"
 
-
 #ifdef _DEBUG_JTAG_IO_
 #define DEBUG_JTAG_IO(expr ...)		LOG_DEBUG(expr)
 #else

Modified: trunk/src/jtag/parport.c
===================================================================
--- trunk/src/jtag/parport.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/parport.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -24,32 +24,17 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 #include "bitbang.h"
 
-/* system includes */
 /* -ino: 060521-1036 */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-
 #include <machine/sysarch.h>
 #include <machine/cpufunc.h>
 #define ioperm(startport,length,enable)\
   i386_set_ioperm((startport), (length), (enable))
-
-#else
-
-#ifdef _WIN32
-#include "errno.h"
-#endif /* _WIN32 */
-
 #endif /* __FreeBSD__ */
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
 #if PARPORT_USE_PPDEV == 1
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
@@ -60,7 +45,6 @@
 #include <linux/parport.h>
 #include <linux/ppdev.h>
 #endif
-#include <fcntl.h>
 #include <sys/ioctl.h>
 #else /* not PARPORT_USE_PPDEV */
 #ifndef _WIN32
@@ -68,14 +52,10 @@
 #endif
 #endif
 
-#if PARPORT_USE_GIVEIO == 1
-#if IS_CYGWIN == 1
+#if PARPORT_USE_GIVEIO == 1 && IS_CYGWIN == 1
 #include <windows.h>
-#include <errno.h>
 #endif
-#endif
 
-#include "log.h"
 
 /* parallel port cable description
  */

Modified: trunk/src/jtag/presto.c
===================================================================
--- trunk/src/jtag/presto.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/presto.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -25,20 +25,10 @@
 #include "windows.h"
 #endif
 
-#include "replacements.h"
-
-/* project specific includes */
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
-#include "configuration.h"
 #include "time_support.h"
 #include "bitq.h"
 
-/* system includes */
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 /* PRESTO access library includes */
 #if BUILD_PRESTO_FTD2XX == 1

Modified: trunk/src/jtag/rlink/rlink.c
===================================================================
--- trunk/src/jtag/rlink/rlink.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/rlink/rlink.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -27,23 +27,18 @@
 #include "config.h"
 #endif
 
-/* system includes */
-#include <errno.h>
-#include <string.h>
-#include <usb.h>
-#include <stdint.h>
-
 /* project specific includes */
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
-#include "configuration.h"
 #include "rlink.h"
 #include "st7.h"
 #include "ep1_cmd.h"
 #include "dtc_cmd.h"
 
+/* system includes */
+#include <usb.h>
+#include <stdint.h>
 
+
 /* This feature is made useless by running the DTC all the time.  When automatic, the LED is on whenever the DTC is running.  Otherwise, USB messages are sent to turn it on and off. */
 #undef AUTOMATIC_BUSY_LED
 

Modified: trunk/src/jtag/usbprog.c
===================================================================
--- trunk/src/jtag/usbprog.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/usbprog.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -34,15 +34,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
+
 #include <usb.h>
 
-/* system includes */
 
-#include "log.h"
-
 #define VID 0x1781
 #define PID 0x0c63
 

Modified: trunk/src/jtag/vsllink.c
===================================================================
--- trunk/src/jtag/vsllink.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/vsllink.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -26,14 +26,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 
 #include <usb.h>
-#include <string.h>
 
-#include "log.h"
 
 //#define _VSLLINK_IN_DEBUG_MODE_
 

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-05-11 03:59:02 UTC (rev 1706)
+++ trunk/src/jtag/zy1000.c	2009-05-11 04:04:58 UTC (rev 1707)
@@ -20,17 +20,12 @@
 #include "config.h"
 #endif
 
-
-#include "log.h"
-#include "jtag.h"
+#include "embeddedice.h"
 #include "bitbang.h"
-#include "../target/embeddedice.h"
 
-
 #include <cyg/hal/hal_io.h>             // low level i/o
 #include <cyg/hal/hal_diag.h>
 
-#include <stdlib.h>
 
 #define ZYLIN_VERSION "1.51"
 #define ZYLIN_DATE __DATE__