diff options
| author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-07-26 09:36:17 +0000 |
|---|---|---|
| committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-07-26 09:36:17 +0000 |
| commit | 712be40f8df23e5d4688728b5b73dd36236ca850 (patch) | |
| tree | 46160e1c3876a15da7969e1978b53e1524b6e0d6 /src | |
| parent | df4b030df770e905aae573b4825d62b3efc96515 (diff) | |
| download | openocd_libswd-712be40f8df23e5d4688728b5b73dd36236ca850.tar.gz openocd_libswd-712be40f8df23e5d4688728b5b73dd36236ca850.tar.bz2 openocd_libswd-712be40f8df23e5d4688728b5b73dd36236ca850.tar.xz openocd_libswd-712be40f8df23e5d4688728b5b73dd36236ca850.zip | |
- restrict direct parallel port access to x86 platforms (thanks to Vincent Palatin)
git-svn-id: svn://svn.berlios.de/openocd/trunk@183 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/amt_jtagaccel.c | 8 | ||||
| -rw-r--r-- | src/jtag/gw16012.c | 8 | ||||
| -rw-r--r-- | src/jtag/parport.c | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index 0eed9460..f005be65 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -27,9 +27,7 @@ /* system includes */ -#ifndef _WIN32 -#include <sys/io.h> -#else +#ifdef _WIN32 #include "errno.h" #endif /* _WIN32 */ @@ -45,6 +43,10 @@ #include <fcntl.h> #include <sys/ioctl.h> #include <unistd.h> +#else /* not PARPORT_USE_PPDEV */ +#ifndef _WIN32 +#include <sys/io.h> +#endif #endif #if PARPORT_USE_GIVEIO == 1 diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c index 8c73590b..8060d7d6 100644 --- a/src/jtag/gw16012.c +++ b/src/jtag/gw16012.c @@ -43,9 +43,7 @@ #else -#ifndef _WIN32 -#include <sys/io.h> -#else +#ifdef _WIN32 #include "errno.h" #endif /* _WIN32 */ @@ -69,6 +67,10 @@ #endif #include <fcntl.h> #include <sys/ioctl.h> +#else /* not PARPORT_USE_PPDEV */ +#ifndef _WIN32 +#include <sys/io.h> +#endif #endif #if PARPORT_USE_GIVEIO == 1 diff --git a/src/jtag/parport.c b/src/jtag/parport.c index a46d611f..bc95c3d0 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -38,9 +38,7 @@ #else -#ifndef _WIN32 -#include <sys/io.h> -#else +#ifdef _WIN32 #include "errno.h" #endif /* _WIN32 */ @@ -62,6 +60,10 @@ #endif #include <fcntl.h> #include <sys/ioctl.h> +#else /* not PARPORT_USE_PPDEV */ +#ifndef _WIN32 +#include <sys/io.h> +#endif #endif #if PARPORT_USE_GIVEIO == 1 |