summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-12-02 06:58:46 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-12-02 06:58:46 +0000
commit23aa223ec417646e4389e990c3168e113e90f3d0 (patch)
treea11f7374a5c4ce9c7e336a681511db9499274c4b /src
parentb1cf5423efc88b2a78788db22df41df1b6edc59a (diff)
downloadopenocd_libswd-23aa223ec417646e4389e990c3168e113e90f3d0.tar.gz
openocd_libswd-23aa223ec417646e4389e990c3168e113e90f3d0.tar.bz2
openocd_libswd-23aa223ec417646e4389e990c3168e113e90f3d0.tar.xz
openocd_libswd-23aa223ec417646e4389e990c3168e113e90f3d0.zip
Hiroshi Ito <ito@mlb.co.jp> fixes to ep93xx.c
git-svn-id: svn://svn.berlios.de/openocd/trunk@1200 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/ep93xx.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index 5643e3f7..55550b36 100644
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/ep93xx.c
@@ -37,6 +37,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <time.h>
#include <sys/mman.h>
#include <unistd.h>
#include <fcntl.h>
@@ -90,20 +91,20 @@ void ep93xx_write(int tck, int tms, int tdi)
if (tck)
output_value |= TCK_BIT;
else
- output_value &= TCK_BIT;
+ output_value &= ~TCK_BIT;
if (tms)
output_value |= TMS_BIT;
else
- output_value &= TMS_BIT;
+ output_value &= ~TMS_BIT;
if (tdi)
output_value |= TDI_BIT;
else
- output_value &= TDI_BIT;
+ output_value &= ~TDI_BIT;
*gpio_data_register = output_value;
- nanosleep(ep93xx_zzzz);
+ nanosleep(&ep93xx_zzzz, NULL);
}
/* (1) assert or (0) deassert reset lines */
@@ -112,15 +113,15 @@ void ep93xx_reset(int trst, int srst)
if (trst == 0)
output_value |= TRST_BIT;
else if (trst == 1)
- output_value &= TRST_BIT;
+ output_value &= ~TRST_BIT;
if (srst == 0)
output_value |= SRST_BIT;
else if (srst == 1)
- output_value &= SRST_BIT;
+ output_value &= ~SRST_BIT;
*gpio_data_register = output_value;
- nanosleep(ep93xx_zzzz);
+ nanosleep(&ep93xx_zzzz, NULL);
}
int ep93xx_speed(int speed)
@@ -218,7 +219,7 @@ int ep93xx_init(void)
*/
output_value = TMS_BIT | TRST_BIT | SRST_BIT | VCC_BIT;
*gpio_data_register = output_value;
- nanosleep(ep93xx_zzzz);
+ nanosleep(&ep93xx_zzzz, NULL);
/*
* Configure the direction register. 1 = output, 0 = input.
@@ -226,7 +227,7 @@ int ep93xx_init(void)
*gpio_data_direction_register =
TDI_BIT | TCK_BIT | TMS_BIT | TRST_BIT | SRST_BIT | VCC_BIT;
- nanosleep(ep93xx_zzzz);
+ nanosleep(&ep93xx_zzzz, NULL);
return ERROR_OK;
}