From ea156d04687f5922bf8a071a0a23183e3e0ef75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?=
 <fillods@users.sourceforge.net>
Date: Sun, 25 Apr 2010 21:15:54 +0000
Subject: [PATCH] define PARPORT_CONTROL* and PARPORT_STATUS* in frontend

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2897 7ae35d74-ebe9-4afe-98af-79ac388436b8
---
 fodtrack/fodtrack.c | 10 +---------
 src/parallel.h      | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/fodtrack/fodtrack.c b/fodtrack/fodtrack.c
index 843008c0f..f8995b43f 100644
--- a/fodtrack/fodtrack.c
+++ b/fodtrack/fodtrack.c
@@ -1,8 +1,7 @@
 /*
  *  Hamlib Rotator backend - Fodtrack parallel port
- *  Copyright (c) 2001-2005 by Stephane Fillod
+ *  Copyright (c) 2001-2010 by Stephane Fillod
  *
- *	$Id: fodtrack.c,v 1.8 2005-04-03 12:27:15 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
@@ -42,13 +41,6 @@
 
 #include "fodtrack.h"
 
-#ifndef PARPORT_CONTROL_AUTOFD
-#define PARPORT_CONTROL_AUTOFD 0x2
-#endif
-#ifndef PARPORT_CONTROL_STROBE
-#define PARPORT_CONTROL_STROBE 0x1
-#endif
-
 #ifndef CP_ACTIVE_LOW_BITS
 #define CP_ACTIVE_LOW_BITS 0x0B
 #endif
diff --git a/src/parallel.h b/src/parallel.h
index 04201ab2c..5fe01bcdf 100644
--- a/src/parallel.h
+++ b/src/parallel.h
@@ -1,8 +1,8 @@
 /*
  *  Hamlib Interface - parallel communication header
- *  Copyright (c) 2000-2005 by Stephane Fillod and Frank Singleton
+ *  Copyright (c) 2000-2003 by Frank Singleton
+ *  Copyright (c) 2000-2010 by Stephane Fillod
  *
- *	$Id: parallel.h,v 1.2 2005-04-03 12:27:16 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
@@ -26,6 +26,39 @@
 #include <hamlib/rig.h>
 #include "iofunc.h"
 
+#ifdef HAVE_LINUX_PARPORT_H
+#include <linux/parport.h>
+#endif
+
+#ifndef PARPORT_CONTROL_STROBE
+#define PARPORT_CONTROL_STROBE    0x1
+#endif
+#ifndef PARPORT_CONTROL_AUTOFD
+#define PARPORT_CONTROL_AUTOFD    0x2
+#endif
+#ifndef PARPORT_CONTROL_INIT
+#define PARPORT_CONTROL_INIT      0x4
+#endif
+#ifndef PARPORT_CONTROL_SELECT
+#define PARPORT_CONTROL_SELECT    0x8
+#endif
+
+#ifndef PARPORT_STATUS_ERROR
+#define PARPORT_STATUS_ERROR      0x8
+#endif
+#ifndef PARPORT_STATUS_SELECT
+#define PARPORT_STATUS_SELECT     0x10
+#endif
+#ifndef PARPORT_STATUS_PAPEROUT
+#define PARPORT_STATUS_PAPEROUT   0x20
+#endif
+#ifndef PARPORT_STATUS_ACK
+#define PARPORT_STATUS_ACK        0x40
+#endif
+#ifndef PARPORT_STATUS_BUSY
+#define PARPORT_STATUS_BUSY       0x80
+#endif
+
 __BEGIN_DECLS
 
 /* Hamlib internal use, see rig.c */