mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Patch is courtesy Petr Salinger, fixing compilation on the GNU/kFreeBSD 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2043 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.5
Stéphane Fillod, F8CFE 2005-10-27 20:34:16 +00:00
rodzic 7015dec13c
commit 9a2e5d1eb3
1 zmienionych plików z 11 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
src/parallel.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - parallel communication low-level support * Hamlib Interface - parallel communication low-level support
* Copyright (c) 2000-2005 by Stephane Fillod * Copyright (c) 2000-2005 by Stephane Fillod
* *
* $Id: parallel.c,v 1.4 2005-04-04 18:30:55 fillods Exp $ * $Id: parallel.c,v 1.5 2005-10-27 20:34:16 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -55,11 +55,15 @@
#include "hamlib/rig.h" #include "hamlib/rig.h"
#include "parallel.h" #include "parallel.h"
#ifdef HAVE_LINUX_PPDEV_H #ifdef HAVE_LINUX_PPDEV_H
#include <linux/ppdev.h> #include <linux/ppdev.h>
#include <linux/parport.h> #include <linux/parport.h>
#endif
#ifdef HAVE_DEV_PPBUS_PPI_H
#include <dev/ppbus/ppi.h>
#include <dev/ppbus/ppbconf.h>
#endif
/* /*
* These control port bits are active low. * These control port bits are active low.
@ -75,14 +79,6 @@
*/ */
#define SP_ACTIVE_LOW_BITS 0x80 #define SP_ACTIVE_LOW_BITS 0x80
#endif
#ifdef HAVE_DEV_PPBUS_PPI_H
#include <dev/ppbus/ppi.h>
#include <dev/ppbus/ppbconf.h>
#endif
/* /*
* TODO: to be called before exiting: atexit(parport_cleanup) * TODO: to be called before exiting: atexit(parport_cleanup)
@ -266,11 +262,11 @@ int HAMLIB_API par_read_status(hamlib_port_t *port, unsigned char *status)
*status = sta ^ SP_ACTIVE_LOW_BITS; *status = sta ^ SP_ACTIVE_LOW_BITS;
return ret == 0 ? RIG_OK : -RIG_EIO; return ret == 0 ? RIG_OK : -RIG_EIO;
#elif defined(HAVE_DEV_PPBUS_PPI_H) #elif defined(HAVE_DEV_PPBUS_PPI_H)
int status; int ret;
unsigned char sta; unsigned char sta;
status = ioctl(port->fd, PPIGSTATUS, &sta); ret = ioctl(port->fd, PPIGSTATUS, &sta);
*control = sta ^ SP_ACTIVE_LOW_BITS; *status = sta ^ SP_ACTIVE_LOW_BITS;
return status == 0 ? RIG_OK : -RIG_EIO; return ret == 0 ? RIG_OK : -RIG_EIO;
#elif defined(WIN32) #elif defined(WIN32)
unsigned char ret; unsigned char ret;
unsigned int dummy; unsigned int dummy;