- disabled JTAG debug output

[openocd.git] / src / jtag / parport.c

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index e78215e2d85112e7e0cb39d6fe81b9c2a521ebdd..9485f7d9d61f4f24b44edaa64bd7eb3c0eeb2782 100644 (file)
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -51,8 +51,15 @@
 #include <stdio.h>
 
 #if PARPORT_USE_PPDEV == 1
+#ifdef __FreeBSD__
+#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>
 #endif
@@ -91,6 +98,8 @@ cable_t cables[] =
        { "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 +140,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,
@@ -304,21 +313,33 @@ 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;
        }
 
+#ifdef __FreeBSD__
+       DEBUG("opening /dev/ppi%d...", parport_port);
+
+       snprintf(buffer, 256, "/dev/ppi%d", parport_port);
+       device_handle = open(buffer, O_WRONLY);
+#else /* not __Free_BSD */
+       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__ */
+
+       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;
        }
 
+       DEBUG("...open");
+
+#ifndef __FreeBSD__
        i=ioctl(device_handle, PPCLAIM);
        if (i<0)
        {
@@ -341,7 +362,9 @@ int parport_init(void)
                ERROR("cannot set compatible 1284 mode to device");
                return ERROR_JTAG_INIT_FAILED;
        }
-#else
+#endif /* not __Free_BSD__ */
+
+#else /* not PARPORT_USE_PPDEV */
        if (parport_port == 0)
        {
                parport_port = 0x378;
@@ -350,7 +373,8 @@ int parport_init(void)
        
        dataport = parport_port;
        statusport = parport_port + 1;
-               
+       
+       DEBUG("requesting privileges for parallel port 0x%x...", dataport);
 #if PARPORT_USE_GIVEIO == 1
        if (parport_get_giveio_access() != 0)
 #else /* PARPORT_USE_GIVEIO */
@@ -360,6 +384,15 @@ int parport_init(void)
                ERROR("missing privileges for direct i/o");
                return ERROR_JTAG_INIT_FAILED;
        }
+       DEBUG("...privileges granted");
+       
+       /* make sure parallel port is in right mode (clear tristate and interrupt */
+       #ifdef __FreeBSD__
+               outb(parport_port + 2, 0x0);
+       #else
+               outb(0x0, dataport);
+       #endif
+       
 #endif /* PARPORT_USE_PPDEV */
        
        parport_reset(0, 0);