aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/libftdi
diff options
context:
space:
mode:
Diffstat (limited to 'src/platforms/libftdi')
-rw-r--r--src/platforms/libftdi/jtagtap.c1
-rw-r--r--src/platforms/libftdi/platform.c15
-rw-r--r--src/platforms/libftdi/platform.h5
-rw-r--r--src/platforms/libftdi/swdptap.c2
4 files changed, 5 insertions, 18 deletions
diff --git a/src/platforms/libftdi/jtagtap.c b/src/platforms/libftdi/jtagtap.c
index 91f6ae2..c9bc876 100644
--- a/src/platforms/libftdi/jtagtap.c
+++ b/src/platforms/libftdi/jtagtap.c
@@ -69,6 +69,7 @@ void jtagtap_reset(void)
void jtagtap_srst(bool assert)
{
+ (void)assert;
platform_buffer_flush();
//ftdi_write_data(ftdic, "\x80\x88\xAB", 3);
//usleep(1000);
diff --git a/src/platforms/libftdi/platform.c b/src/platforms/libftdi/platform.c
index 723efa3..e53f011 100644
--- a/src/platforms/libftdi/platform.c
+++ b/src/platforms/libftdi/platform.c
@@ -17,14 +17,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "platform.h"
+#include "general.h"
#include "gdb_if.h"
-#include "jtag_scan.h"
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
-#include <unistd.h>
struct ftdi_context *ftdic;
@@ -121,7 +117,7 @@ static struct cable_desc_s {
},
};
-int platform_init(int argc, char **argv)
+void platform_init(int argc, char **argv)
{
int err;
int c;
@@ -149,7 +145,7 @@ int platform_init(int argc, char **argv)
if (index == sizeof(cable_desc)/sizeof(cable_desc[0])){
fprintf(stderr, "No cable matching %s found\n",cablename);
- return -1;
+ exit(-1);
}
if (cable_desc[index].dbus_data)
@@ -212,12 +208,7 @@ int platform_init(int argc, char **argv)
}
assert(ftdi_write_data(ftdic, ftdi_init, 9) == 9);
-
assert(gdb_if_init() == 0);
-
- jtag_scan(NULL);
-
- return 0;
}
void platform_buffer_flush(void)
diff --git a/src/platforms/libftdi/platform.h b/src/platforms/libftdi/platform.h
index a95a3f4..135b2e3 100644
--- a/src/platforms/libftdi/platform.h
+++ b/src/platforms/libftdi/platform.h
@@ -21,7 +21,6 @@
#ifndef __PLATFORM_H
#define __PLATFORM_H
-#include <stdint.h>
#include <ftdi.h>
#ifndef WIN32
@@ -42,10 +41,6 @@
extern struct ftdi_context *ftdic;
-int platform_init(int argc, char **argv);
-const char *platform_target_voltage(void);
-void platform_delay(uint32_t delay);
-
void platform_buffer_flush(void);
int platform_buffer_write(const uint8_t *data, int size);
int platform_buffer_read(uint8_t *data, int size);
diff --git a/src/platforms/libftdi/swdptap.c b/src/platforms/libftdi/swdptap.c
index ef350de..eb6e65e 100644
--- a/src/platforms/libftdi/swdptap.c
+++ b/src/platforms/libftdi/swdptap.c
@@ -26,7 +26,7 @@
#include <assert.h>
#include <ftdi.h>
-#include "platform.h"
+#include "general.h"
#include "swdptap.h"
static void swdptap_turnaround(uint8_t dir);