diff --git a/flexradio/sdr1k.c b/flexradio/sdr1k.c
index 5327916d4..52c215d0f 100644
--- a/flexradio/sdr1k.c
+++ b/flexradio/sdr1k.c
@@ -2,7 +2,7 @@
  *  Hamlib Rotator backend - SDR-1000
  *  Copyright (c) 2003-2004 by Stephane Fillod
  *
- *	$Id: sdr1k.c,v 1.6 2004-05-17 21:09:42 fillods Exp $
+ *	$Id: sdr1k.c,v 1.7 2004-10-02 20:37:24 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -30,7 +30,7 @@
 #include <math.h>
 
 #include "hamlib/rig.h"
-#include "serial.h"
+#include "parallel.h"
 #include "misc.h"
 #include "bandplan.h"
 #include "register.h"
diff --git a/fodtrack/fodtrack.c b/fodtrack/fodtrack.c
index 539cfb553..b314e539a 100644
--- a/fodtrack/fodtrack.c
+++ b/fodtrack/fodtrack.c
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Rotator backend - Fodtrack parallel port
- *  Copyright (c) 2001-2003 by Stephane Fillod
+ *  Copyright (c) 2001-2004 by Stephane Fillod
  *
- *	$Id: fodtrack.c,v 1.6 2003-09-28 15:34:44 fillods Exp $
+ *	$Id: fodtrack.c,v 1.7 2004-10-02 20:37:24 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -36,7 +36,7 @@
 #endif
 
 #include "hamlib/rotator.h"
-#include "serial.h"
+#include "parallel.h"
 #include "misc.h"
 #include "register.h"
 
diff --git a/microtune/i2cio_pp.h b/microtune/i2cio_pp.h
index 194582f13..ca6a7c3cb 100644
--- a/microtune/i2cio_pp.h
+++ b/microtune/i2cio_pp.h
@@ -32,7 +32,7 @@
 #define _I2CIO_PP_H_
 
 #include "i2cio.h"
-#include "serial.h"
+#include "parallel.h"
 
 /*!
  * \brief concrete class that implements low level i/o for i2c bus using parallel port
diff --git a/src/Makefile.am b/src/Makefile.am
index 814ad5195..74589662b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = @INCLUDES@ @INCLTDL@
 RIGSRC = rig.c serial.c misc.c register.c event.c cal.c conf.c tones.c \
 		rotator.c locator.c rot_reg.c rot_conf.c iofunc.c ext.c \
-		mem.c settings.c
+		mem.c settings.c parallel.c
 
 lib_LTLIBRARIES = libhamlib.la
 libhamlib_la_SOURCES = $(RIGSRC)
@@ -10,5 +10,6 @@ libhamlib_la_CFLAGS = -DIN_HAMLIB $(AM_CFLAGS) -DHAMLIB_MODULE_DIR=\"$(libdir)\"
 libhamlib_la_LIBADD = @LIBLTDL@ $(top_builddir)/lib/libmisc.la @MATH_LIBS@
 
 noinst_HEADERS = event.h misc.h serial.h iofunc.h cal.h tones.h \
-			rot_conf.h token.h idx_builtin.h register.h par_nt.h
+		rot_conf.h token.h idx_builtin.h register.h par_nt.h \
+		parallel.h
 
diff --git a/src/parallel.c b/src/parallel.c
new file mode 100644
index 000000000..366897ed4
--- /dev/null
+++ b/src/parallel.c
@@ -0,0 +1,352 @@
+/*
+ *  Hamlib Interface - parallel communication low-level support
+ *  Copyright (c) 2000-2004 by Stephane Fillod
+ *
+ *	$Id: parallel.c,v 1.1 2004-10-02 20:37:24 fillods Exp $
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library General Public License as
+ *   published by the Free Software Foundation; either version 2 of
+ *   the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Library General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Library General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>   /* Standard input/output definitions */
+#include <string.h>  /* String function definitions */
+#include <unistd.h>  /* UNIX standard function definitions */
+#include <fcntl.h>   /* File control definitions */
+#include <errno.h>   /* Error number definitions */
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#include "par_nt.h"
+#endif
+#ifdef HAVE_WINIOCTL_H
+#include <winioctl.h>
+#endif
+#ifdef HAVE_WINBASE_H
+#include <winbase.h>
+#endif
+
+#include "hamlib/rig.h"
+#include "parallel.h"
+
+
+
+#ifdef HAVE_LINUX_PPDEV_H
+#include <linux/ppdev.h>
+#include <linux/parport.h>
+
+/* 
+ * These control port bits are active low.
+ * We toggle them so that this weirdness doesn't get get propagated
+ * through our interface.
+ */
+#define CP_ACTIVE_LOW_BITS	0x0B
+
+/*
+ * These status port bits are active low.
+ * We toggle them so that this weirdness doesn't get get propagated
+ * through our interface.
+ */
+#define SP_ACTIVE_LOW_BITS	0x80
+
+#endif
+
+
+
+/*
+ * TODO: to be called before exiting: atexit(parport_cleanup)
+ * void parport_cleanup() { ioctl(fd, PPRELEASE); }
+ */
+
+int par_open(port_t *port)
+{
+	int fd;
+	int mode;
+
+	if (!port->pathname)
+		return -RIG_EINVAL;
+
+#ifdef HAVE_LINUX_PPDEV_H
+	fd = open(port->pathname, O_RDWR);
+	if (fd < 0) {
+		rig_debug(RIG_DEBUG_ERR, "Opening device \"%s\": %s\n", port->pathname, strerror(errno));
+		return -RIG_EIO;
+	}
+	mode = IEEE1284_MODE_COMPAT;
+	if (ioctl (fd, PPSETMODE, &mode) != 0) {
+		rig_debug(RIG_DEBUG_ERR, "PPSETMODE \"%s\": %s\n", port->pathname, strerror(errno));
+		close(fd);
+		return -RIG_EIO;
+	}
+
+#elif defined(WIN32)
+	fd = (int)CreateFile(port->pathname, GENERIC_READ | GENERIC_WRITE,
+		0, NULL, OPEN_EXISTING, 0, NULL);
+	if (fd == (int)INVALID_HANDLE_VALUE) {
+		rig_debug(RIG_DEBUG_ERR, "Opening device \"%s\"\n", port->pathname);
+		CloseHandle((HANDLE)fd);
+		return -RIG_EIO;
+	}
+#else
+	return -RIG_ENIMPL;
+#endif
+	port->fd = fd;
+	return fd;
+}
+
+int par_close(port_t *port)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+#elif defined(WIN32)
+	CloseHandle((HANDLE)(port->fd));
+	return RIG_OK;
+#endif
+	return close(port->fd);
+}
+
+int HAMLIB_API par_write_data(port_t *port, unsigned char data)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+	int status;
+	status = ioctl(port->fd, PPWDATA, &data);
+	return status == 0 ? RIG_OK : -RIG_EIO;
+#elif defined(WIN32)
+	unsigned int dummy;
+
+	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_DATA, &data, sizeof(data), 
+			NULL, 0, (LPDWORD)&dummy, NULL))) {
+		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
+	}
+#endif
+	return -RIG_ENIMPL;
+}
+
+int HAMLIB_API par_read_data(port_t *port, unsigned char *data)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+	int status;
+	status = ioctl(port->fd, PPRDATA, data);
+	return status == 0 ? RIG_OK : -RIG_EIO;
+#elif defined(WIN32)
+	char ret;
+	unsigned int dummy;
+
+	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_STATUS, NULL, 0, &ret, 
+          		sizeof(ret), (LPDWORD)&dummy, NULL))) {
+		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
+	}
+
+  	return ret ^ S1284_INVERTED;
+#endif
+	return -RIG_ENIMPL;
+}
+
+
+int HAMLIB_API par_write_control(port_t *port, unsigned char control)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+	int status;
+	unsigned char ctrl = control ^ CP_ACTIVE_LOW_BITS;
+	status = ioctl(port->fd, PPWCONTROL, &ctrl);
+	return status == 0 ? RIG_OK : -RIG_EIO;
+#elif defined(WIN32)
+  unsigned char ctr = control;
+  unsigned char dummyc;
+  unsigned int dummy;
+  const unsigned char wm = (C1284_NSTROBE |
+			    C1284_NAUTOFD |
+			    C1284_NINIT |
+			    C1284_NSELECTIN);
+
+  if (ctr & 0x20)
+    {
+      rig_debug (RIG_DEBUG_WARN, "use ieee1284_data_dir to change data line direction!\n");
+    }
+
+  /* Deal with inversion issues. */
+  ctr ^= wm & C1284_INVERTED;
+  ctr = (ctr & ~wm) ^ (ctr & wm);
+  if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_CONTROL, &ctr, 
+          sizeof(ctr), &dummyc, sizeof(dummyc), (LPDWORD)&dummy, NULL))) {
+      rig_debug(RIG_DEBUG_ERR,"frob_control: DeviceIoControl failed!\n");
+  }
+  return RIG_OK;
+#endif
+	return -RIG_ENIMPL;
+}
+
+int HAMLIB_API par_read_control(port_t *port, unsigned char *control)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+	int status;
+	unsigned char ctrl;
+	status = ioctl(port->fd, PPRCONTROL, &ctrl);
+	*control = ctrl ^ CP_ACTIVE_LOW_BITS;
+	return status == 0 ? RIG_OK : -RIG_EIO;
+#elif defined(WIN32)
+	char ret;
+	unsigned int dummy;
+
+	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_CONTROL, NULL, 0, &ret, 
+			sizeof(ret), (LPDWORD)&dummy, NULL))) {
+		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
+	}
+
+	*control = ret ^ S1284_INVERTED;
+#endif
+	return -RIG_ENIMPL;
+}
+
+
+int HAMLIB_API par_read_status(port_t *port, unsigned char *status)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+	int ret;
+	unsigned char sta;
+	ret = ioctl(port->fd, PPRSTATUS, &sta);
+	*status = sta ^ SP_ACTIVE_LOW_BITS;
+	return ret == 0 ? RIG_OK : -RIG_EIO;
+#elif defined(WIN32)
+	unsigned char ret;
+	unsigned int dummy;
+
+	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_STATUS, NULL, 0, &ret, 
+			sizeof(ret), (LPDWORD)&dummy, NULL))) {
+		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
+	}
+
+	*status = ret ^ S1284_INVERTED;
+#endif
+	return -RIG_ENIMPL;
+}
+
+
+int HAMLIB_API par_lock(port_t *port)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+	if (ioctl(port->fd, PPCLAIM) < 0) {
+		rig_debug(RIG_DEBUG_ERR, "Claiming device \"%s\": %s\n", port->pathname, strerror(errno));
+		return -RIG_EIO;
+	}
+	return RIG_OK;
+#elif defined(WIN32)
+	return RIG_OK;
+#endif
+	return -RIG_ENIMPL;
+}
+
+int HAMLIB_API par_unlock(port_t *port)
+{
+#ifdef HAVE_LINUX_PPDEV_H
+	if (ioctl(port->fd, PPRELEASE) < 0) {
+		rig_debug(RIG_DEBUG_ERR, "Releasing device \"%s\": %s\n", port->pathname, strerror(errno));
+		return -RIG_EIO;
+	}
+	return RIG_OK;
+#elif defined(WIN32)
+	return RIG_OK;
+#endif
+	return -RIG_ENIMPL;
+}
+
+
+int par_ptt_set(port_t *p, ptt_t pttx)
+{
+		switch(p->type.ptt) {
+		case RIG_PTT_PARALLEL:
+				{
+					unsigned char reg;
+					int status;
+
+					status = par_read_data(p, &reg);
+					if (status != RIG_OK)
+						return status;
+					if (pttx == RIG_PTT_ON)
+						reg |=   1 << p->parm.parallel.pin;
+					else
+						reg &= ~(1 << p->parm.parallel.pin);
+
+					return par_write_data(p, reg);
+				}
+		default:
+				rig_debug(RIG_DEBUG_ERR,"Unsupported PTT type %d\n", 
+								p->type.ptt);
+				return -RIG_EINVAL;
+		}
+		return RIG_OK;
+}
+
+/*
+ * assumes pttx not NULL
+ */
+int par_ptt_get(port_t *p, ptt_t *pttx)
+{
+		switch(p->type.ptt) {
+		case RIG_PTT_PARALLEL:
+				{
+					unsigned char reg;
+					int status;
+
+					status = par_read_data(p, &reg);
+					*pttx = reg & (1<<p->parm.parallel.pin) ? 
+							RIG_PTT_ON:RIG_PTT_OFF;
+					return status;
+				}
+		default:
+				rig_debug(RIG_DEBUG_ERR,"Unsupported PTT type %d\n", 
+								p->type.ptt);
+				return -RIG_ENAVAIL;
+		}
+		return RIG_OK;
+}
+
+/*
+ * assumes dcdx not NULL
+ */
+int par_dcd_get(port_t *p, dcd_t *dcdx)
+{
+		switch(p->type.dcd) {
+		case RIG_DCD_PARALLEL:
+				{
+					unsigned char reg;
+					int status;
+
+					status = par_read_data(p, &reg);
+					*dcdx = reg & (1<<p->parm.parallel.pin) ? 
+							RIG_DCD_ON:RIG_DCD_OFF;
+					return status;
+				}
+		default:
+				rig_debug(RIG_DEBUG_ERR,"Unsupported DCD type %d\n", 
+								p->type.dcd);
+				return -RIG_ENAVAIL;
+		}
+		return RIG_OK;
+}
+
diff --git a/src/parallel.h b/src/parallel.h
new file mode 100644
index 000000000..6bbbd8a8a
--- /dev/null
+++ b/src/parallel.h
@@ -0,0 +1,48 @@
+/*
+ *  Hamlib Interface - parallel communication header
+ *  Copyright (c) 2000-2004 by Stephane Fillod and Frank Singleton
+ *
+ *	$Id: parallel.h,v 1.1 2004-10-02 20:37:24 fillods Exp $
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library General Public License as
+ *   published by the Free Software Foundation; either version 2 of
+ *   the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Library General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Library General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _PARALLEL_H
+#define _PARALLEL_H 1
+
+#include <hamlib/rig.h>
+#include "iofunc.h"
+
+__BEGIN_DECLS
+
+/* Hamlib internal use, see rig.c */
+int par_open(port_t *p);
+int par_close(port_t *p);
+int par_ptt_set(port_t *p, ptt_t pttx);
+int par_ptt_get(port_t *p, ptt_t *pttx);
+int par_dcd_get(port_t *p, dcd_t *dcdx);
+
+extern HAMLIB_EXPORT(int) par_write_data(port_t *p, unsigned char data);
+extern HAMLIB_EXPORT(int) par_write_control(port_t *p, unsigned char control);
+extern HAMLIB_EXPORT(int) par_read_data(port_t *p, unsigned char *data);
+extern HAMLIB_EXPORT(int) par_read_control(port_t *p, unsigned char *control);
+extern HAMLIB_EXPORT(int) par_read_status(port_t *p, unsigned char *status);
+extern HAMLIB_EXPORT(int) par_lock(port_t *p);
+extern HAMLIB_EXPORT(int) par_unlock(port_t *p);
+
+__END_DECLS
+
+#endif /* _PARALLEL_H */
diff --git a/src/rig.c b/src/rig.c
index 805aed908..a9c64a9a9 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -2,7 +2,7 @@
  *  Hamlib Interface - main file
  *  Copyright (c) 2000-2004 by Stephane Fillod and Frank Singleton
  *
- *	$Id: rig.c,v 1.82 2004-10-02 20:18:16 fillods Exp $
+ *	$Id: rig.c,v 1.83 2004-10-02 20:37:24 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -56,8 +56,9 @@
 #include <fcntl.h>
 
 
-#include <hamlib/rig.h>
-#include <serial.h>
+#include "hamlib/rig.h"
+#include "serial.h"
+#include "parallel.h"
 #include "event.h"
 
 /**
diff --git a/src/rotator.c b/src/rotator.c
index 49de2d769..3e0420cdf 100644
--- a/src/rotator.c
+++ b/src/rotator.c
@@ -2,7 +2,7 @@
  *  Hamlib Interface - main file
  *  Copyright (c) 2000-2004 by Stephane Fillod and Frank Singleton
  *
- *	$Id: rotator.c,v 1.15 2004-10-02 10:32:08 fillods Exp $
+ *	$Id: rotator.c,v 1.16 2004-10-02 20:37:24 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -50,8 +50,9 @@
 #include <fcntl.h>
 
 
-#include <hamlib/rotator.h>
-#include <serial.h>
+#include "hamlib/rotator.h"
+#include "serial.h"
+#include "parallel.h"
 #include "rot_conf.h"
 #include "token.h"
 
diff --git a/src/serial.c b/src/serial.c
index 7ce01bfeb..b4a68c062 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -4,7 +4,7 @@
  *  Parts of the PTT handling are derived from soundmodem, an excellent
  *  ham packet softmodem written by Thomas Sailer, HB9JNX.
  *
- *	$Id: serial.c,v 1.42 2004-10-02 20:18:16 fillods Exp $
+ *	$Id: serial.c,v 1.43 2004-10-02 20:37:24 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -55,20 +55,9 @@
 #endif
 #endif
 
-/* for CTS/RTS and DTR/DSR control under Win32 --SF */
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#include "par_nt.h"
-#endif
-#ifdef HAVE_WINIOCTL_H
-#include <winioctl.h>
-#endif
-#ifdef HAVE_WINBASE_H
-#include <winbase.h>
-#endif
-
 #if defined(WIN32) && !defined(HAVE_TERMIOS_H)
 #include "win32termios.h"
+#define HAVE_TERMIOS_H	1	/* we have replacement */
 #else
 #define OPEN open
 #define CLOSE close
@@ -83,27 +72,6 @@
 #include <sys/ioccom.h>
 #endif
 
-#ifdef HAVE_LINUX_PPDEV_H
-#include <linux/ppdev.h>
-#include <linux/parport.h>
-
-/* 
- * These control port bits are active low.
- * We toggle them so that this weirdness doesn't get get propagated
- * through our interface.
- */
-#define CP_ACTIVE_LOW_BITS	0x0B
-
-/*
- * These status port bits are active low.
- * We toggle them so that this weirdness doesn't get get propagated
- * through our interface.
- */
-#define SP_ACTIVE_LOW_BITS	0x80
-
-#endif
-
-
 /*
  * Open serial port using rig.state data
  *
@@ -155,7 +123,7 @@ int HAMLIB_API serial_setup(port_t *rp)
 {
   int fd;
   /* There's a lib replacement for termios under Mingw */
-#if defined(HAVE_TERMIOS_H) || defined(WIN32)
+#if defined(HAVE_TERMIOS_H)
   speed_t speed;			/* serial comm speed */
   struct termios options;
 #elif defined(HAVE_TERMIO_H)
@@ -175,7 +143,7 @@ int HAMLIB_API serial_setup(port_t *rp)
    * Get the current options for the port...
    */
   
-#if defined(HAVE_TERMIOS_H) || defined(WIN32)
+#if defined(HAVE_TERMIOS_H)
   tcgetattr(fd, &options);
 #elif defined(HAVE_TERMIO_H)
   IOCTL (fd, TCGETA, &options);
@@ -337,7 +305,7 @@ int HAMLIB_API serial_setup(port_t *rp)
    * Choose raw input, no preprocessing please ..
    */
 
-#if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) || defined(WIN32)
+#if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
   options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
 
   /*
@@ -361,7 +329,7 @@ int HAMLIB_API serial_setup(port_t *rp)
    * Finally, set the new options for the port...
    */
   
-#if defined(HAVE_TERMIOS_H) || defined(WIN32)
+#if defined(HAVE_TERMIOS_H)
   if (tcsetattr(fd, TCSANOW, &options) == -1) {
 		rig_debug(RIG_DEBUG_ERR, "open_serial: tcsetattr failed: %s\n", 
 					strerror(errno));
@@ -520,276 +488,3 @@ int HAMLIB_API ser_get_dsr(port_t *p, int *state)
   return retcode < 0 ? -RIG_EIO : RIG_OK;
 }
 
-
-
-/*
- * TODO: to be called before exiting: atexit(parport_cleanup)
- * void parport_cleanup() { ioctl(fd, PPRELEASE); }
- */
-
-int par_open(port_t *port)
-{
-	int fd;
-	int mode;
-
-	if (!port->pathname)
-		return -RIG_EINVAL;
-
-#ifdef HAVE_LINUX_PPDEV_H
-	fd = open(port->pathname, O_RDWR);
-	if (fd < 0) {
-		rig_debug(RIG_DEBUG_ERR, "Opening device \"%s\": %s\n", port->pathname, strerror(errno));
-		return -RIG_EIO;
-	}
-	mode = IEEE1284_MODE_COMPAT;
-	if (ioctl (fd, PPSETMODE, &mode) != 0) {
-		rig_debug(RIG_DEBUG_ERR, "PPSETMODE \"%s\": %s\n", port->pathname, strerror(errno));
-		close(fd);
-		return -RIG_EIO;
-	}
-
-#elif defined(WIN32)
-	fd = (int)CreateFile(port->pathname, GENERIC_READ | GENERIC_WRITE,
-		0, NULL, OPEN_EXISTING, 0, NULL);
-	if (fd == (int)INVALID_HANDLE_VALUE) {
-		rig_debug(RIG_DEBUG_ERR, "Opening device \"%s\"\n", port->pathname);
-		CloseHandle((HANDLE)fd);
-		return -RIG_EIO;
-	}
-#else
-	return -RIG_ENIMPL;
-#endif
-	port->fd = fd;
-	return fd;
-}
-
-int par_close(port_t *port)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-#elif defined(WIN32)
-	CloseHandle((HANDLE)(port->fd));
-	return RIG_OK;
-#endif
-	return close(port->fd);
-}
-
-int HAMLIB_API par_write_data(port_t *port, unsigned char data)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-	int status;
-	status = ioctl(port->fd, PPWDATA, &data);
-	return status == 0 ? RIG_OK : -RIG_EIO;
-#elif defined(WIN32)
-	unsigned int dummy;
-
-	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_DATA, &data, sizeof(data), 
-			NULL, 0, (LPDWORD)&dummy, NULL))) {
-		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
-	}
-#endif
-	return -RIG_ENIMPL;
-}
-
-int HAMLIB_API par_read_data(port_t *port, unsigned char *data)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-	int status;
-	status = ioctl(port->fd, PPRDATA, data);
-	return status == 0 ? RIG_OK : -RIG_EIO;
-#elif defined(WIN32)
-	char ret;
-	unsigned int dummy;
-
-	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_STATUS, NULL, 0, &ret, 
-          		sizeof(ret), (LPDWORD)&dummy, NULL))) {
-		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
-	}
-
-  	return ret ^ S1284_INVERTED;
-#endif
-	return -RIG_ENIMPL;
-}
-
-
-int HAMLIB_API par_write_control(port_t *port, unsigned char control)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-	int status;
-	unsigned char ctrl = control ^ CP_ACTIVE_LOW_BITS;
-	status = ioctl(port->fd, PPWCONTROL, &ctrl);
-	return status == 0 ? RIG_OK : -RIG_EIO;
-#elif defined(WIN32)
-  unsigned char ctr = control;
-  unsigned char dummyc;
-  unsigned int dummy;
-  const unsigned char wm = (C1284_NSTROBE |
-			    C1284_NAUTOFD |
-			    C1284_NINIT |
-			    C1284_NSELECTIN);
-
-  if (ctr & 0x20)
-    {
-      rig_debug (RIG_DEBUG_WARN, "use ieee1284_data_dir to change data line direction!\n");
-    }
-
-  /* Deal with inversion issues. */
-  ctr ^= wm & C1284_INVERTED;
-  ctr = (ctr & ~wm) ^ (ctr & wm);
-  if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_CONTROL, &ctr, 
-          sizeof(ctr), &dummyc, sizeof(dummyc), (LPDWORD)&dummy, NULL))) {
-      rig_debug(RIG_DEBUG_ERR,"frob_control: DeviceIoControl failed!\n");
-  }
-  return RIG_OK;
-#endif
-	return -RIG_ENIMPL;
-}
-
-int HAMLIB_API par_read_control(port_t *port, unsigned char *control)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-	int status;
-	unsigned char ctrl;
-	status = ioctl(port->fd, PPRCONTROL, &ctrl);
-	*control = ctrl ^ CP_ACTIVE_LOW_BITS;
-	return status == 0 ? RIG_OK : -RIG_EIO;
-#elif defined(WIN32)
-	char ret;
-	unsigned int dummy;
-
-	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_CONTROL, NULL, 0, &ret, 
-			sizeof(ret), (LPDWORD)&dummy, NULL))) {
-		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
-	}
-
-	*control = ret ^ S1284_INVERTED;
-#endif
-	return -RIG_ENIMPL;
-}
-
-
-int HAMLIB_API par_read_status(port_t *port, unsigned char *status)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-	int ret;
-	unsigned char sta;
-	ret = ioctl(port->fd, PPRSTATUS, &sta);
-	*status = sta ^ SP_ACTIVE_LOW_BITS;
-	return ret == 0 ? RIG_OK : -RIG_EIO;
-#elif defined(WIN32)
-	unsigned char ret;
-	unsigned int dummy;
-
-	if (!(DeviceIoControl((HANDLE)(port->fd), NT_IOCTL_STATUS, NULL, 0, &ret, 
-			sizeof(ret), (LPDWORD)&dummy, NULL))) {
-		rig_debug(RIG_DEBUG_ERR, "%s: DeviceIoControl failed!\n", __FUNCTION__);
-	}
-
-	*status = ret ^ S1284_INVERTED;
-#endif
-	return -RIG_ENIMPL;
-}
-
-
-int HAMLIB_API par_lock(port_t *port)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-	if (ioctl(port->fd, PPCLAIM) < 0) {
-		rig_debug(RIG_DEBUG_ERR, "Claiming device \"%s\": %s\n", port->pathname, strerror(errno));
-		return -RIG_EIO;
-	}
-	return RIG_OK;
-#elif defined(WIN32)
-	return RIG_OK;
-#endif
-	return -RIG_ENIMPL;
-}
-
-int HAMLIB_API par_unlock(port_t *port)
-{
-#ifdef HAVE_LINUX_PPDEV_H
-	if (ioctl(port->fd, PPRELEASE) < 0) {
-		rig_debug(RIG_DEBUG_ERR, "Releasing device \"%s\": %s\n", port->pathname, strerror(errno));
-		return -RIG_EIO;
-	}
-	return RIG_OK;
-#elif defined(WIN32)
-	return RIG_OK;
-#endif
-	return -RIG_ENIMPL;
-}
-
-
-int par_ptt_set(port_t *p, ptt_t pttx)
-{
-		switch(p->type.ptt) {
-		case RIG_PTT_PARALLEL:
-				{
-					unsigned char reg;
-					int status;
-
-					status = par_read_data(p, &reg);
-					if (status != RIG_OK)
-						return status;
-					if (pttx == RIG_PTT_ON)
-						reg |=   1 << p->parm.parallel.pin;
-					else
-						reg &= ~(1 << p->parm.parallel.pin);
-
-					return par_write_data(p, reg);
-				}
-		default:
-				rig_debug(RIG_DEBUG_ERR,"Unsupported PTT type %d\n", 
-								p->type.ptt);
-				return -RIG_EINVAL;
-		}
-		return RIG_OK;
-}
-
-/*
- * assumes pttx not NULL
- */
-int par_ptt_get(port_t *p, ptt_t *pttx)
-{
-		switch(p->type.ptt) {
-		case RIG_PTT_PARALLEL:
-				{
-					unsigned char reg;
-					int status;
-
-					status = par_read_data(p, &reg);
-					*pttx = reg & (1<<p->parm.parallel.pin) ? 
-							RIG_PTT_ON:RIG_PTT_OFF;
-					return status;
-				}
-		default:
-				rig_debug(RIG_DEBUG_ERR,"Unsupported PTT type %d\n", 
-								p->type.ptt);
-				return -RIG_ENAVAIL;
-		}
-		return RIG_OK;
-}
-
-/*
- * assumes dcdx not NULL
- */
-int par_dcd_get(port_t *p, dcd_t *dcdx)
-{
-		switch(p->type.dcd) {
-		case RIG_DCD_PARALLEL:
-				{
-					unsigned char reg;
-					int status;
-
-					status = par_read_data(p, &reg);
-					*dcdx = reg & (1<<p->parm.parallel.pin) ? 
-							RIG_DCD_ON:RIG_DCD_OFF;
-					return status;
-				}
-		default:
-				rig_debug(RIG_DEBUG_ERR,"Unsupported DCD type %d\n", 
-								p->type.dcd);
-				return -RIG_ENAVAIL;
-		}
-		return RIG_OK;
-}
-
diff --git a/src/serial.h b/src/serial.h
index 3026b9d95..74ccbe7ad 100644
--- a/src/serial.h
+++ b/src/serial.h
@@ -2,7 +2,7 @@
  *  Hamlib Interface - serial communication header
  *  Copyright (c) 2000-2004 by Stephane Fillod and Frank Singleton
  *
- *		$Id: serial.h,v 1.25 2004-10-02 20:18:16 fillods Exp $
+ *	$Id: serial.h,v 1.26 2004-10-02 20:37:24 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -43,19 +43,6 @@ extern HAMLIB_EXPORT(int) ser_get_dtr(port_t *p, int *state);
 extern HAMLIB_EXPORT(int) ser_get_cts(port_t *p, int *state);
 extern HAMLIB_EXPORT(int) ser_get_dsr(port_t *p, int *state);
 extern HAMLIB_EXPORT(int) ser_get_car(port_t *p, int *state);
-int par_open(port_t *p);
-int par_close(port_t *p);
-int par_ptt_set(port_t *p, ptt_t pttx);
-int par_ptt_get(port_t *p, ptt_t *pttx);
-int par_dcd_get(port_t *p, dcd_t *dcdx);
-
-extern HAMLIB_EXPORT(int) par_write_data(port_t *p, unsigned char data);
-extern HAMLIB_EXPORT(int) par_write_control(port_t *p, unsigned char control);
-extern HAMLIB_EXPORT(int) par_read_data(port_t *p, unsigned char *data);
-extern HAMLIB_EXPORT(int) par_read_control(port_t *p, unsigned char *control);
-extern HAMLIB_EXPORT(int) par_read_status(port_t *p, unsigned char *status);
-extern HAMLIB_EXPORT(int) par_lock(port_t *p);
-extern HAMLIB_EXPORT(int) par_unlock(port_t *p);
 
 __END_DECLS