X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fjtag%2Fgw16012.c;h=0d5c3f66bb876fccd796a401ded6e2c44d23b11d;hb=20e4e77cdf366dedac21ff5670c54291feadfc05;hp=8060d7d615ac6bec6bee12dcc30da210e4d09347;hpb=835e6440b8d1d26b4e041be7edab200ab2c572ee;p=openocd

diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 8060d7d6..0d5c3f66 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -29,11 +29,9 @@
 #define _DEBUG_GW16012_IO_
 #endif
 
-/* system includes */
-
 /* system includes */
 // -ino: 060521-1036
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
 #include <sys/types.h>
 #include <machine/sysarch.h>
@@ -47,7 +45,7 @@
 #include "errno.h"
 #endif /* _WIN32 */
 
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__, __FreeBSD_kernel__ */
 
 #include <string.h>
 #include <stdlib.h>
@@ -56,7 +54,7 @@
 #include <time.h>
 
 #if PARPORT_USE_PPDEV == 1
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
 #include <dev/ppbus/ppbconf.h>
 #define PPRSTATUS	PPIGSTATUS
@@ -137,7 +135,7 @@ void gw16012_data(u8 value)
 	#if PARPORT_USE_PPDEV == 1
 		ioctl(device_handle, PPWDATA, &value);
 	#else
-		#ifdef __FreeBSD__
+		#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 			outb(gw16012_port, value);
 		#else
 			outb(value, gw16012_port);
@@ -158,7 +156,7 @@ void gw16012_control(u8 value)
 		#if PARPORT_USE_PPDEV == 1
 			ioctl(device_handle, PPWCONTROL, &gw16012_control_value);
 		#else
-			#ifdef __FreeBSD__
+			#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 				outb(gw16012_port + 2, gw16012_control_value);
 			#else
 				outb(gw16012_control_value, gw16012_port + 2);
@@ -485,7 +483,7 @@ int gw16012_init(void)
 		return ERROR_JTAG_INIT_FAILED;
 	}
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	DEBUG("opening /dev/ppi%d...", gw16012_port);
 
 	snprintf(buffer, 256, "/dev/ppi%d", gw16012_port);
@@ -504,7 +502,7 @@ int gw16012_init(void)
 
 	DEBUG("...open");
 
-#ifndef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	i=ioctl(device_handle, PPCLAIM);
 	if (i<0)
 	{
@@ -548,7 +546,7 @@ int gw16012_init(void)
 	DEBUG("...privileges granted");
 
 	/* make sure parallel port is in right mode (clear tristate and interrupt */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	outb(gw16012_port + 2, 0x0);
 #else
 	outb(0x0, gw16012_port + 2);