- fixed regression in gdb_server.c (Thanks to Michael Fischer for finding these bugs)

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

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index 8265ada8ad339efd8038af80c1461de68f5a8b48..c87f98e4ae6a5ed5eeb9b2e10fb6361429e098b7 100644 (file)
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -17,34 +17,63 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "log.h"
+#endif
+
+#include "replacements.h"
+
 #include "jtag.h"
 #include "bitbang.h"
 
 /* system includes */
 // -ino: 060521-1036
 #ifdef __FreeBSD__
+
 #include <sys/types.h>
 #include <machine/sysarch.h>
 #include <machine/cpufunc.h>
 #define ioperm(startport,length,enable)\
   i386_set_ioperm((startport), (length), (enable))
+
 #else
+
+#ifndef _WIN32
 #include <sys/io.h>
-#endif
+#else
+#include "errno.h"
+#endif /* _WIN32 */
+
+#endif /* __FreeBSD__ */
 
 #include <string.h>
 #include <stdlib.h>
 #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
 
+#if PARPORT_USE_GIVEIO == 1
+#if IS_CYGWIN == 1
+#include <windows.h>
+#include <errno.h>
+#undef ERROR
+#endif
+#endif
+
+#include "log.h"
+
 /* parallel port cable description
  */
 typedef struct cable_s
@@ -109,7 +138,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,
@@ -221,6 +250,32 @@ int parport_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
+#if PARPORT_USE_GIVEIO == 1
+int parport_get_giveio_access()
+{
+    HANDLE h;
+    OSVERSIONINFO version;
+
+    version.dwOSVersionInfoSize = sizeof version;
+    if (!GetVersionEx( &version )) {
+        errno = EINVAL;
+        return -1;
+    }
+    if (version.dwPlatformId != VER_PLATFORM_WIN32_NT)
+        return 0;
+
+    h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+    if (h == INVALID_HANDLE_VALUE) {
+        errno = ENODEV;
+        return -1;
+    }
+
+    CloseHandle( h );
+
+    return 0;
+}
+#endif
+
 int parport_init(void)
 {
        cable_t *cur_cable;
@@ -262,15 +317,26 @@ int parport_init(void)
                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
+       DEBUG("opening /dev/parport%d...", parport_port);
+
        snprintf(buffer, 256, "/dev/parport%d", parport_port);
        device_handle = open(buffer, O_WRONLY);
-       
+#endif 
        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)
        {
@@ -293,6 +359,7 @@ int parport_init(void)
                ERROR("cannot set compatible 1284 mode to device");
                return ERROR_JTAG_INIT_FAILED;
        }
+#endif
 #else
        if (parport_port == 0)
        {
@@ -302,12 +369,19 @@ int parport_init(void)
        
        dataport = parport_port;
        statusport = parport_port + 1;
-               
-       if (ioperm(dataport, 3, 1) != 0) {
+       
+       DEBUG("requesting privileges for parallel port 0x%x...", dataport);
+#if PARPORT_USE_GIVEIO == 1
+       if (parport_get_giveio_access() != 0)
+#else /* PARPORT_USE_GIVEIO */
+       if (ioperm(dataport, 3, 1) != 0)
+#endif /* PARPORT_USE_GIVEIO */
+       {
                ERROR("missing privileges for direct i/o");
                return ERROR_JTAG_INIT_FAILED;
        }
-#endif
+       DEBUG("...privileges granted");
+#endif /* PARPORT_USE_PPDEV */
        
        parport_reset(0, 0);
        parport_write(0, 0, 0);