X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fparport.c;h=b9087d9fec525d5306313a8ced6d3a3339a6da46;hp=21aa5131f1947b6f386b86b231aed62907eed15e;hb=20e4e77cdf366dedac21ff5670c54291feadfc05;hpb=1341eb3b0aea74b939a5d7702f696b175d032647

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index 21aa5131f1..b9087d9fec 100644
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -28,7 +28,7 @@
 
 /* system includes */
 // -ino: 060521-1036
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
 #include <sys/types.h>
 #include <machine/sysarch.h>
@@ -38,9 +38,7 @@
 
 #else
 
-#ifndef _WIN32
-#include <sys/io.h>
-#else
+#ifdef _WIN32
 #include "errno.h"
 #endif /* _WIN32 */
 
@@ -51,10 +49,21 @@
 #include <stdio.h>
 
 #if PARPORT_USE_PPDEV == 1
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <dev/ppbus/ppi.h>
+#include <dev/ppbus/ppbconf.h>
+#define PPRSTATUS	PPIGSTATUS
+#define PPWDATA		PPISDATA
+#else
 #include <linux/parport.h>
 #include <linux/ppdev.h>
+#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
@@ -87,10 +96,13 @@ cable_t cables[] =
 {	
 	/* name					tdo   trst  tms   tck   tdi   srst  o_inv i_inv init */
 	{ "wiggler",			0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x01, 0x80, 0x80 },
+	{ "wiggler_ntrst_inverted",	0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x11, 0x80, 0x80 },
 	{ "old_amt_wiggler",	0x80, 0x01, 0x02, 0x04, 0x08, 0x10, 0x11, 0x80, 0x80 },
 	{ "chameleon",			0x80, 0x00, 0x04, 0x01, 0x02, 0x00, 0x00, 0x80, 0x00 },
 	{ "dlc5",				0x10, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x10 },
 	{ "triton",				0x80, 0x08, 0x04, 0x01, 0x02, 0x00, 0x00, 0x80, 0x00 },
+	{ "lattice",			0x40, 0x10, 0x04, 0x02, 0x01, 0x08, 0x00, 0x00, 0x18 },
+	{ "flashlink",			0x20, 0x10, 0x02, 0x01, 0x04, 0x20, 0x30, 0x20, 0x00 },
 	{ NULL,					0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
@@ -131,7 +143,7 @@ jtag_interface_t parport_interface =
 	
 	.execute_queue = bitbang_execute_queue,
 
-	.support_statemove = 0,
+	.support_pathmove = 1,
 
 	.speed = parport_speed,	
 	.register_commands = parport_register_commands,
@@ -188,7 +200,7 @@ void parport_write(int tck, int tms, int tdi)
 #if PARPORT_USE_PPDEV == 1
 		ioctl(device_handle, PPWDATA, &output);
 #else
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	outb(dataport, output);
 #else
 	outb(output, dataport);
@@ -217,7 +229,7 @@ void parport_reset(int trst, int srst)
 #if PARPORT_USE_PPDEV == 1
 	ioctl(device_handle, PPWDATA, &output);
 #else
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	outb(dataport, output);
 #else
 	outb(output, dataport);
@@ -304,18 +316,25 @@ int parport_init(void)
 	dataport_value = cable->PORT_INIT;
 	
 #if PARPORT_USE_PPDEV == 1
-	if (device_handle>0)
+	if (device_handle > 0)
 	{
 		ERROR("device is already opened");
 		return ERROR_JTAG_INIT_FAILED;
 	}
 
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+	DEBUG("opening /dev/ppi%d...", parport_port);
+
+	snprintf(buffer, 256, "/dev/ppi%d", parport_port);
+	device_handle = open(buffer, O_WRONLY);
+#else /* not __FreeBSD__, __FreeBSD_kernel__ */
 	DEBUG("opening /dev/parport%d...", parport_port);
 
 	snprintf(buffer, 256, "/dev/parport%d", parport_port);
 	device_handle = open(buffer, O_WRONLY);
-	
-	if (device_handle<0)
+#endif /* __FreeBSD__, __FreeBSD_kernel__ */
+
+	if (device_handle < 0)
 	{
 		ERROR("cannot open device. check it exists and that user read and write rights are set");
 		return ERROR_JTAG_INIT_FAILED;
@@ -323,6 +342,7 @@ int parport_init(void)
 
 	DEBUG("...open");
 
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 	i=ioctl(device_handle, PPCLAIM);
 	if (i<0)
 	{
@@ -345,7 +365,9 @@ int parport_init(void)
 		ERROR("cannot set compatible 1284 mode to device");
 		return ERROR_JTAG_INIT_FAILED;
 	}
-#else
+#endif /* not __FreeBSD__, __FreeBSD_kernel__ */
+
+#else /* not PARPORT_USE_PPDEV */
 	if (parport_port == 0)
 	{
 		parport_port = 0x378;
@@ -355,7 +377,7 @@ int parport_init(void)
 	dataport = parport_port;
 	statusport = parport_port + 1;
 	
-	DEBUG("requesting privileges for parallel port 0x%x...", dataport);
+	DEBUG("requesting privileges for parallel port 0x%lx...", dataport);
 #if PARPORT_USE_GIVEIO == 1
 	if (parport_get_giveio_access() != 0)
 #else /* PARPORT_USE_GIVEIO */
@@ -366,6 +388,14 @@ int parport_init(void)
 		return ERROR_JTAG_INIT_FAILED;
 	}
 	DEBUG("...privileges granted");
+	
+	/* make sure parallel port is in right mode (clear tristate and interrupt */
+	#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+		outb(parport_port + 2, 0x0);
+	#else
+		outb(0x0, parport_port + 2);
+	#endif
+	
 #endif /* PARPORT_USE_PPDEV */
 	
 	parport_reset(0, 0);