Audit and eliminate redundant #include directives from src/jtag.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1707 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index 2db90935f309232a46f126d1d2c8543357a2d68f..ff9cbdaae9bcf48fa2ae248e7ac8a497a494e8b3 100644 (file)
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -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;
 

diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index 9e06f5e90fdafad7a458ba4408c983977d7d8c19..3b4bfa7eea6ec7e46c88f1a9742225bd4f4a4465 100644 (file)
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -24,16 +24,9 @@
 #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

diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index 45fb089bc92a752b6c4ca7a9678c496811f35927..9f15b1a09f5b065a67687b8ecc659969adc86c39 100644 (file)
--- a/src/jtag/at91rm9200.c
+++ b/src/jtag/at91rm9200.c
@@ -21,17 +21,11 @@
 #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)

diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c
index ea1f016cacc3f4d4cdbf2606839cb7912c3510b6..f407deb18a6a917d8570c760332b62a5bb83f813 100644 (file)
--- a/src/jtag/bitbang.c
+++ b/src/jtag/bitbang.c
@@ -25,18 +25,7 @@
 #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

diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index cbba551108cbbcc032d3632c67c238cb6ebf1e53..af17b63892a0bdb7869229672572288e4854a2ca 100644 (file)
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -23,16 +23,6 @@
 
 #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 */
 

diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c
index 158a8d5f5a2a347b9852fb008ebeb80a6c4e480d..bbed1d4cbe4cc69079a35474bd5280275185bb5c 100644 (file)
--- a/src/jtag/dummy.c
+++ b/src/jtag/dummy.c
@@ -21,8 +21,6 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
 #include "bitbang.h"
 

diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index d79a0d67c1660306d30001ff1bf9581d35e67b9d..1f422314827b59d526b5f1c2c72df147eaaf31da 100644 (file)
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/ep93xx.c
@@ -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;

diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 0c5bfc7ddf42cc6def8c8521b02134b66ca37d37..08edd269babe689ab20d13271a12eff06ef3e2f6 100644 (file)
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -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

diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 720744a0b4565f4a95cbc039b86eb0fbdfdd0acf..7845e778892c7c14e679fdfd01cc63438bd4adf3 100644 (file)
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -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;

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index f95b1cbe13fa224f178ea2ec92a4e697689fb4e7..f984639b27e5d0f040fd37ac3e8efebd455a47d9 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -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

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index bf8e039d8ec87955e3dd33f05fca1691529138da..974d7863b0c1c61cacb22137cb66e75c3cca98ca 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -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

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index d5ed4f5807493b5a597d51bf1292c7bac85dd6f5..2ad2024058c5f0c891e76fa7358d1b4f64f9bebe 100644 (file)
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -23,12 +23,9 @@
 #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)

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index 5f48d3af2de1f3b07967c6a9af2e1c8880e406a1..74c01208ff856bec76e739e53f14f16900e4f663 100644 (file)
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -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
  */

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index ea57a36ec8b925a6ebb9ba23d891f8d9f79f0e62..334db76e907dca6a7084e4bf601af31078e209e1 100644 (file)
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -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

diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c
index af3a0f47cabd94c5769b8ed7f7297df5e29051ac..2993fc0820f81003428770e67cddd5e0147f4dc2 100644 (file)
--- a/src/jtag/rlink/rlink.c
+++ b/src/jtag/rlink/rlink.c
@@ -27,22 +27,17 @@
 #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

diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c
index 7ff38701fe5dda51db572cfd8dcd19c980716f09..50a55aa9e326d8c00ee8ed011e676b7229a6958b 100644 (file)
--- a/src/jtag/usbprog.c
+++ b/src/jtag/usbprog.c
@@ -34,14 +34,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "jtag.h"
-#include <usb.h>
 
-/* system includes */
+#include <usb.h>
 
-#include "log.h"
 
 #define VID 0x1781
 #define PID 0x0c63

diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index 360bebe1f54208c3985bd9d57e991c6067de67fb..9a52af38f5bae124fdc958722456933a23eb93f0 100644 (file)
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -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_
 

diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
index eac80041ac465feee2a66e262bf071db4b09074c..fcadb0096cc337064b9fec0425db8bd467b1aa32 100644 (file)
--- a/src/jtag/zy1000.c
+++ b/src/jtag/zy1000.c
@@ -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__