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

further win32 porting 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@556 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.2
Stéphane Fillod, F8CFE 2001-06-15 07:08:37 +00:00
rodzic a992e0901a
commit c74995b05f
25 zmienionych plików z 160 dodań i 83 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
alinco/alinco.h
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to a Alinco radio. * via serial interface to a Alinco radio.
* *
* *
* $Id: alinco.h,v 1.1 2001-06-03 17:39:59 f4cfe Exp $ * $Id: alinco.h,v 1.2 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -28,7 +28,15 @@
#ifndef _ALINCO_H #ifndef _ALINCO_H
#define _ALINCO_H 1 #define _ALINCO_H 1
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
# undef HAMLIB_DLL
# include <hamlib/rig.h>
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
#endif
#include <cal.h> #include <cal.h>
struct alinco_priv_caps { struct alinco_priv_caps {
@ -60,7 +68,7 @@ int alinco_get_mem(RIG *rig, vfo_t vfo, int *ch);
extern const struct rig_caps dx77_caps; extern const struct rig_caps dx77_caps;
extern int init_alinco(void *be_handle); extern HAMLIB_EXPORT(int) init_alinco(void *be_handle);
#endif /* _ALINCO_H */ #endif /* _ALINCO_H */

19
aor/aor.c
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an AOR scanner. * via serial interface to an AOR scanner.
* *
* *
* $Id: aor.c,v 1.9 2001-06-12 07:07:11 f4cfe Exp $ * $Id: aor.c,v 1.10 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* *
@ -36,10 +36,19 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <math.h> #include <math.h>
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
#include <hamlib/riglist.h> # undef HAMLIB_DLL
#include <serial.h> # include <hamlib/rig.h>
#include <misc.h> # include <serial.h>
# include <misc.h>
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
# include <serial.h>
# include <misc.h>
#endif
#include "aor.h" #include "aor.h"

4
aor/aor.h
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an AOR scanner. * via serial interface to an AOR scanner.
* *
* *
* $Id: aor.h,v 1.4 2001-03-02 18:29:48 f4cfe Exp $ * $Id: aor.h,v 1.5 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -41,7 +41,7 @@ int aor_set_powerstat(RIG *rig, powerstat_t status);
extern const struct rig_caps ar8200_caps; extern const struct rig_caps ar8200_caps;
extern int init_aor(void *be_handle); extern HAMLIB_EXPORT(int) init_aor(void *be_handle);
#endif /* _AOR_H */ #endif /* _AOR_H */

4
aor/ar8200.c
Wyświetl plik

@ -7,7 +7,7 @@
* using the serial interface. * using the serial interface.
* *
* *
* $Id: ar8200.c,v 1.10 2001-05-04 22:37:35 f4cfe Exp $ * $Id: ar8200.c,v 1.11 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* *
@ -117,7 +117,9 @@ tuning_steps: {
{AR8200_MODES,kHz(25)}, {AR8200_MODES,kHz(25)},
{AR8200_MODES,kHz(100)}, {AR8200_MODES,kHz(100)},
{AR8200_MODES,MHz(1)}, {AR8200_MODES,MHz(1)},
#if 0
{AR8200_MODES,0}, /* any tuning step */ {AR8200_MODES,0}, /* any tuning step */
#endif
RIG_TS_END, RIG_TS_END,
}, },
/* mode/filter list, remember: order matters! */ /* mode/filter list, remember: order matters! */

19
dummy/dummy.c
Wyświetl plik

@ -7,7 +7,7 @@
* purpose mainly. * purpose mainly.
* *
* *
* $Id: dummy.c,v 1.10 2001-06-04 17:01:21 f4cfe Exp $ * $Id: dummy.c,v 1.11 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -35,10 +35,19 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <math.h> #include <math.h>
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
#include <hamlib/riglist.h> # undef HAMLIB_DLL
#include <serial.h> # include <hamlib/rig.h>
#include <misc.h> # include <serial.h>
# include <misc.h>
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
# include <serial.h>
# include <misc.h>
#endif
#include "dummy.h" #include "dummy.h"

5
dummy/dummy.h
Wyświetl plik

@ -7,7 +7,7 @@
* purpose mainly. * purpose mainly.
* *
* *
* $Id: dummy.h,v 1.1 2001-02-14 00:59:02 f4cfe Exp $ * $Id: dummy.h,v 1.2 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -29,10 +29,9 @@
#ifndef _DUMMY_H #ifndef _DUMMY_H
#define _DUMMY_H 1 #define _DUMMY_H 1
#include <hamlib/rig.h>
extern const struct rig_caps dummy_caps; extern const struct rig_caps dummy_caps;
extern int init_dummy(void *be_handle); extern HAMLIB_EXPORT(int) init_dummy(void *be_handle);
#endif /* _DUMMY_H */ #endif /* _DUMMY_H */

3
icom/frame.h
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an ICOM using the "CI-V" interface. * via serial interface to an ICOM using the "CI-V" interface.
* *
* *
* $Id: frame.h,v 1.6 2001-06-04 21:09:13 f4cfe Exp $ * $Id: frame.h,v 1.7 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -28,7 +28,6 @@
#ifndef _FRAME_H #ifndef _FRAME_H
#define _FRAME_H 1 #define _FRAME_H 1
#include <hamlib/rig.h>
/* /*
* helper functions * helper functions

22
icom/icom.c
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an ICOM using the "CI-V" interface. * via serial interface to an ICOM using the "CI-V" interface.
* *
* *
* $Id: icom.c,v 1.29 2001-06-10 22:29:00 f4cfe Exp $ * $Id: icom.c,v 1.30 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* *
@ -36,11 +36,21 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <math.h> #include <math.h>
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
#include <hamlib/riglist.h> # undef HAMLIB_DLL
#include <serial.h> # include <hamlib/rig.h>
#include <misc.h> # include <serial.h>
#include <cal.h> # include <misc.h>
# include <cal.h>
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
# include <serial.h>
# include <misc.h>
# include <cal.h>
#endif
#include "icom.h" #include "icom.h"
#include "icom_defs.h" #include "icom_defs.h"
#include "frame.h" #include "frame.h"

6
icom/icom.h
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an ICOM using the "CI-V" interface. * via serial interface to an ICOM using the "CI-V" interface.
* *
* *
* $Id: icom.h,v 1.20 2001-06-10 22:29:00 f4cfe Exp $ * $Id: icom.h,v 1.21 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -115,8 +115,8 @@ extern const struct rig_caps ic706mkiig_caps;
extern const struct rig_caps icr8500_caps; extern const struct rig_caps icr8500_caps;
extern const struct rig_caps icall_caps; extern const struct rig_caps icall_caps;
extern rig_model_t probe_icom(port_t *p); extern HAMLIB_EXPORT(rig_model_t) probe_icom(port_t *p);
extern int init_icom(void *be_handle); extern HAMLIB_EXPORT(int) init_icom(void *be_handle);
#endif /* _ICOM_H */ #endif /* _ICOM_H */

19
kenwood/kenwood.c
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to a Kenwood radio. * via serial interface to a Kenwood radio.
* *
* *
* $Id: kenwood.c,v 1.9 2001-06-12 07:07:11 f4cfe Exp $ * $Id: kenwood.c,v 1.10 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* *
@ -36,10 +36,19 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <math.h> #include <math.h>
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
#include <hamlib/riglist.h> # undef HAMLIB_DLL
#include <serial.h> # include <hamlib/rig.h>
#include <misc.h> # include <serial.h>
# include <misc.h>
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
# include <serial.h>
# include <misc.h>
#endif
#include "kenwood.h" #include "kenwood.h"

4
kenwood/kenwood.h
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to a Kenwood radio. * via serial interface to a Kenwood radio.
* *
* *
* $Id: kenwood.h,v 1.4 2001-05-22 21:59:26 f4cfe Exp $ * $Id: kenwood.h,v 1.5 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -51,7 +51,7 @@ int kenwood_get_trn(RIG *rig, vfo_t vfo, int *trn);
extern const struct rig_caps ts870s_caps; extern const struct rig_caps ts870s_caps;
extern int init_kenwood(void *be_handle); extern HAMLIB_EXPORT(int) init_kenwood(void *be_handle);
#endif /* _KENWOOD_H */ #endif /* _KENWOOD_H */

19
pcr/pcr.c
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an Icom PCR-1xxx radio. * via serial interface to an Icom PCR-1xxx radio.
* *
* *
* $Id: pcr.c,v 1.6 2001-06-12 07:07:11 f4cfe Exp $ * $Id: pcr.c,v 1.7 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* *
@ -36,10 +36,19 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <math.h> #include <math.h>
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
#include <hamlib/riglist.h> # undef HAMLIB_DLL
#include <serial.h> # include <hamlib/rig.h>
#include <misc.h> # include <serial.h>
# include <misc.h>
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
# include <serial.h>
# include <misc.h>
#endif
#include "pcr.h" #include "pcr.h"

5
pcr/pcr.h
Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an ICOM using the PCR1000 protocol. * via serial interface to an ICOM using the PCR1000 protocol.
* *
* *
* $Id: pcr.h,v 1.2 2001-06-02 17:52:55 f4cfe Exp $ * $Id: pcr.h,v 1.3 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -28,7 +28,6 @@
#ifndef _PCR_H #ifndef _PCR_H
#define _PCR_H 1 #define _PCR_H 1
#include <hamlib/rig.h>
struct pcr_priv_data { struct pcr_priv_data {
freq_t last_freq; freq_t last_freq;
@ -50,7 +49,7 @@ const char *pcr_get_info(RIG *rig);
extern const struct rig_caps pcr1000_caps; extern const struct rig_caps pcr1000_caps;
extern const struct rig_caps pcr100_caps; extern const struct rig_caps pcr100_caps;
extern int init_pcr(void *be_handle); extern HAMLIB_EXPORT(int) init_pcr(void *be_handle);
#endif /* _PCR_H */ #endif /* _PCR_H */

5
src/cal.h
Wyświetl plik

@ -4,7 +4,7 @@
* cal.h - Copyright (C) 2001 Stephane Fillod * cal.h - Copyright (C) 2001 Stephane Fillod
* *
* *
* $Id: cal.h,v 1.2 2001-06-12 23:59:21 f4cfe Exp $ * $Id: cal.h,v 1.3 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* *
@ -27,7 +27,8 @@
#ifndef _CAL_H #ifndef _CAL_H
#define _CAL_H 1 #define _CAL_H 1
#include <hamlib/rig_dll.h> #include <hamlib/rig.h>
/* add rig_set_cal(cal_table), rig_get_calstat(rawmin,rawmax,cal_table), */ /* add rig_set_cal(cal_table), rig_get_calstat(rawmin,rawmax,cal_table), */

16
src/event.c
Wyświetl plik

@ -2,7 +2,7 @@
Copyright (C) 2000,2001 Stephane Fillod and Frank Singleton Copyright (C) 2000,2001 Stephane Fillod and Frank Singleton
This file is part of the hamlib package. This file is part of the hamlib package.
$Id: event.c,v 1.6 2001-06-11 00:41:28 f4cfe Exp $ $Id: event.c,v 1.7 2001-06-15 07:08:37 f4cfe Exp $
Hamlib is free software; you can redistribute it and/or modify it Hamlib is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by under the terms of the GNU General Public License as published by
@ -36,11 +36,13 @@
#include <errno.h> #include <errno.h>
#define HAMLIB_DLL
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include <hamlib/riglist.h>
#include "event.h" #include "event.h"
#ifdef _WIN32
#if defined(_WIN32) || defined(__CYGWIN__)
static void sa_sigiohandler(int signum); static void sa_sigiohandler(int signum);
#else #else
static void sa_sigioaction(int signum, siginfo_t *si, void *data); static void sa_sigioaction(int signum, siginfo_t *si, void *data);
@ -62,7 +64,7 @@ int add_trn_rig(RIG *rig)
/* /*
* FIXME: multiple open will register several time SIGIO hndlr * FIXME: multiple open will register several time SIGIO hndlr
*/ */
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
act.sa_handler = sa_sigiohandler; act.sa_handler = sa_sigiohandler;
#else #else
act.sa_sigaction = sa_sigioaction; act.sa_sigaction = sa_sigioaction;
@ -70,7 +72,7 @@ int add_trn_rig(RIG *rig)
sigemptyset(&act.sa_mask); sigemptyset(&act.sa_mask);
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
act.sa_flags = 0; act.sa_flags = 0;
#else #else
act.sa_flags = SA_SIGINFO; act.sa_flags = SA_SIGINFO;
@ -86,7 +88,7 @@ int add_trn_rig(RIG *rig)
rig_debug(RIG_DEBUG_ERR,"rig_open fcntl SETOWN failed: %s\n", rig_debug(RIG_DEBUG_ERR,"rig_open fcntl SETOWN failed: %s\n",
strerror(errno)); strerror(errno));
#ifndef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
status = fcntl(rig->state.rigport.fd, F_SETSIG, SIGIO); status = fcntl(rig->state.rigport.fd, F_SETSIG, SIGIO);
if (status < 0) if (status < 0)
rig_debug(RIG_DEBUG_ERR,"rig_open fcntl SETSIG failed: %s\n", rig_debug(RIG_DEBUG_ERR,"rig_open fcntl SETSIG failed: %s\n",
@ -167,7 +169,7 @@ static int search_rig_and_decode(RIG *rig, rig_ptr_t data)
* check the rig is not holding SIGIO, * check the rig is not holding SIGIO,
* then call rig->caps->decode_event() (this is done by search_rig) * then call rig->caps->decode_event() (this is done by search_rig)
*/ */
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
static void sa_sigiohandler(int signum) static void sa_sigiohandler(int signum)
{ {
rig_debug(RIG_DEBUG_VERBOSE, "sa_sigiohandler: activity detected\n"); rig_debug(RIG_DEBUG_VERBOSE, "sa_sigiohandler: activity detected\n");

4
src/misc.c
Wyświetl plik

@ -6,7 +6,7 @@
* Provides useful routines for data handling, used by backend * Provides useful routines for data handling, used by backend
* as well as by the frontend. * as well as by the frontend.
* *
* $Id: misc.c,v 1.7 2001-06-02 17:56:37 f4cfe Exp $ * $Id: misc.c,v 1.8 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -39,7 +39,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#define HAMLIB_DLL
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include "misc.h" #include "misc.h"

3
src/misc.h
Wyświetl plik

@ -6,7 +6,7 @@
* Provides useful routines for data handling, used by backends * Provides useful routines for data handling, used by backends
* as well as by the frontend. * as well as by the frontend.
* *
* $Id: misc.h,v 1.6 2001-06-12 23:59:21 f4cfe Exp $ * $Id: misc.h,v 1.7 2001-06-15 07:08:37 f4cfe Exp $
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -30,6 +30,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
/* /*
* Carefull!! These marcos are NOT reentrant! * Carefull!! These marcos are NOT reentrant!
* ie. they may not be executed atomically, * ie. they may not be executed atomically,

4
src/register.c
Wyświetl plik

@ -2,7 +2,7 @@
register.c - Copyright (C) 2000 Stephane Fillod and Frank Singleton register.c - Copyright (C) 2000 Stephane Fillod and Frank Singleton
Provides registering for dynamically loadable backends. Provides registering for dynamically loadable backends.
$Id: register.c,v 1.6 2001-06-11 00:41:28 f4cfe Exp $ $Id: register.c,v 1.7 2001-06-15 07:08:37 f4cfe Exp $
Hamlib is free software; you can redistribute it and/or modify it Hamlib is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by under the terms of the GNU General Public License as published by
@ -33,8 +33,8 @@
/* This is libtool's dl wrapper */ /* This is libtool's dl wrapper */
#include <ltdl.h> #include <ltdl.h>
#define HAMLIB_DLL
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include <hamlib/riglist.h>
#ifndef PATH_MAX #ifndef PATH_MAX

4
src/rig.c
Wyświetl plik

@ -2,7 +2,7 @@
Copyright (C) 2000,2001 Stephane Fillod and Frank Singleton Copyright (C) 2000,2001 Stephane Fillod and Frank Singleton
This file is part of the hamlib package. This file is part of the hamlib package.
$Id: rig.c,v 1.35 2001-06-11 00:41:28 f4cfe Exp $ $Id: rig.c,v 1.36 2001-06-15 07:08:37 f4cfe Exp $
Hamlib is free software; you can redistribute it and/or modify it Hamlib is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by under the terms of the GNU General Public License as published by
@ -32,8 +32,8 @@
#include <fcntl.h> #include <fcntl.h>
#define HAMLIB_DLL
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include <hamlib/riglist.h>
#include <serial.h> #include <serial.h>
#include "event.h" #include "event.h"

13
src/serial.c
Wyświetl plik

@ -10,7 +10,7 @@
* ham packet softmodem written by Thomas Sailer, HB9JNX. * ham packet softmodem written by Thomas Sailer, HB9JNX.
* *
* *
* $Id: serial.c,v 1.14 2001-06-12 23:59:21 f4cfe Exp $ * $Id: serial.c,v 1.15 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -60,6 +60,7 @@
#include <winbase.h> #include <winbase.h>
#endif #endif
#define HAMLIB_DLL
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include "serial.h" #include "serial.h"
#include "misc.h" #include "misc.h"
@ -615,7 +616,7 @@ int fread_block(port_t *p, char *rxbuffer, size_t count)
* assumes: p is not NULL * assumes: p is not NULL
*/ */
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
int ser_open(port_t *p) int ser_open(port_t *p)
{ {
const char *path = p->path; const char *path = p->path;
@ -646,7 +647,7 @@ int ser_open(port_t *p)
int ser_close(port_t *p) int ser_close(port_t *p)
{ {
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
return CloseHandle(p->handle); return CloseHandle(p->handle);
#else #else
return close(p->fd); return close(p->fd);
@ -659,7 +660,7 @@ int ser_close(port_t *p)
int ser_ptt_set(port_t *p, ptt_t pttx) int ser_ptt_set(port_t *p, ptt_t pttx)
{ {
switch(p->type.ptt) { switch(p->type.ptt) {
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
/* /*
* TODO: log error with 0x%lx GetLastError() * TODO: log error with 0x%lx GetLastError()
*/ */
@ -699,7 +700,7 @@ int ser_ptt_get(port_t *p, ptt_t *pttx)
{ {
switch(p->type.ptt) { switch(p->type.ptt) {
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
/* TODO... */ /* TODO... */
#else #else
case RIG_PTT_SERIAL_RTS: case RIG_PTT_SERIAL_RTS:
@ -738,7 +739,7 @@ int ser_dcd_get(port_t *p, dcd_t *dcdx)
{ {
switch(p->type.dcd) { switch(p->type.dcd) {
#ifdef _WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
/* TODO... */ /* TODO... */
#else #else
case RIG_DCD_SERIAL_CTS: case RIG_DCD_SERIAL_CTS:

5
src/serial.h
Wyświetl plik

@ -6,7 +6,7 @@
* Provides useful routines for read/write serial data for communicating * Provides useful routines for read/write serial data for communicating
* via serial interface . * via serial interface .
* *
* $Id: serial.h,v 1.9 2001-06-12 23:59:21 f4cfe Exp $ * $Id: serial.h,v 1.10 2001-06-15 07:08:37 f4cfe Exp $
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -33,9 +33,6 @@
extern HAMLIB_EXPORT(int) serial_open(port_t *rs); extern HAMLIB_EXPORT(int) serial_open(port_t *rs);
#if 0
int read_sleep(int fd, unsigned char *rxbuffer, int num , int read_delay);
#endif
extern HAMLIB_EXPORT(int) read_block(port_t *p, char *rxbuffer, size_t count); extern HAMLIB_EXPORT(int) read_block(port_t *p, char *rxbuffer, size_t count);
extern HAMLIB_EXPORT(int) write_block(port_t *p, const char *txbuffer, size_t count); extern HAMLIB_EXPORT(int) write_block(port_t *p, const char *txbuffer, size_t count);
extern HAMLIB_EXPORT(int) fread_block(port_t *p, char *rxbuffer, size_t count); extern HAMLIB_EXPORT(int) fread_block(port_t *p, char *rxbuffer, size_t count);

19
winradio/winradio.c
Wyświetl plik

@ -8,7 +8,7 @@
* /dev/winradio API. * /dev/winradio API.
* *
* *
* $Id: winradio.c,v 1.10 2001-06-04 17:01:21 f4cfe Exp $ * $Id: winradio.c,v 1.11 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -36,10 +36,19 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <math.h> #include <math.h>
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
#include <hamlib/riglist.h> # undef HAMLIB_DLL
#include <serial.h> # include <hamlib/rig.h>
#include <misc.h> # include <serial.h>
# include <misc.h>
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
# include <serial.h>
# include <misc.h>
#endif
#include "winradio.h" #include "winradio.h"
#include <linradio/wrapi.h> #include <linradio/wrapi.h>

4
winradio/winradio.h
Wyświetl plik

@ -8,7 +8,7 @@
* /dev/winradio API. * /dev/winradio API.
* *
* *
* $Id: winradio.h,v 1.3 2001-06-02 18:07:45 f4cfe Exp $ * $Id: winradio.h,v 1.4 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -53,6 +53,6 @@ extern const struct rig_caps wr3150_caps;
extern const struct rig_caps wr3500_caps; extern const struct rig_caps wr3500_caps;
extern const struct rig_caps wr3700_caps; extern const struct rig_caps wr3700_caps;
extern int init_winradio(void *be_handle); extern HAMLIB_EXPORT(int) init_winradio(void *be_handle);
#endif /* _WINRADIO_H */ #endif /* _WINRADIO_H */

19
yaesu/yaesu.c
Wyświetl plik

@ -7,7 +7,7 @@
* via serial interface to a Yaesu rig * via serial interface to a Yaesu rig
* *
* *
* $Id: yaesu.c,v 1.1 2001-06-04 21:07:17 f4cfe Exp $ * $Id: yaesu.c,v 1.2 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -36,10 +36,19 @@
#include <termios.h> /* POSIX terminal control definitions */ #include <termios.h> /* POSIX terminal control definitions */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <hamlib/rig.h> #if defined(__CYGWIN__) && defined(HAMLIB_DLL)
#include <hamlib/riglist.h> # undef HAMLIB_DLL
#include "serial.h" # include <hamlib/rig.h>
#include "misc.h" # include "serial.h"
# include "misc.h"
# define HAMLIB_DLL
# include <hamlib/rig_dll.h>
#else
# include <hamlib/rig.h>
# include "serial.h"
# include "misc.h"
#endif
#include "yaesu.h" #include "yaesu.h"
#include "ft747.h" #include "ft747.h"

4
yaesu/yaesu.h
Wyświetl plik

@ -4,7 +4,7 @@
* yaesu.h - (C) Frank Singleton 2000 (vk3fcs@ix.netcom.com) * yaesu.h - (C) Frank Singleton 2000 (vk3fcs@ix.netcom.com)
* Common yaesu declarations for hamlib * Common yaesu declarations for hamlib
* *
* $Id: yaesu.h,v 1.4 2001-06-04 21:07:17 f4cfe Exp $ * $Id: yaesu.h,v 1.5 2001-06-15 07:08:37 f4cfe Exp $
* *
* *
* *
@ -48,4 +48,6 @@ typedef struct yaesu_cmd_set yaesu_cmd_set_t;
const struct rig_caps ft747_caps; const struct rig_caps ft747_caps;
const struct rig_caps ft847_caps; const struct rig_caps ft847_caps;
extern HAMLIB_EXPORT(int) init_yaesu(void *be_handle);
#endif /* _YAESU_H */ #endif /* _YAESU_H */