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

misc update for port_t support 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@533 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.2
Stéphane Fillod, F8CFE 2001-06-05 18:08:30 +00:00
rodzic 33ec1fdd31
commit e968f8e7be
3 zmienionych plików z 7 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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.32 2001-06-04 21:17:52 f4cfe Exp $ $Id: rig.c,v 1.33 2001-06-05 18:08:30 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
@ -372,7 +372,7 @@ int rig_open(RIG *rig)
switch(rig->state.rigport.type.rig) { switch(rig->state.rigport.type.rig) {
case RIG_PORT_SERIAL: case RIG_PORT_SERIAL:
status = serial_open(&rig->state); status = serial_open(&rig->state.rigport);
if (status != 0) if (status != 0)
return status; return status;
break; break;

9
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.11 2001-06-04 17:01:21 f4cfe Exp $ * $Id: serial.c,v 1.12 2001-06-05 18:08:30 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -85,11 +85,10 @@
* *
*/ */
int serial_open(struct rig_state *rs) { int serial_open(port_t *rp) {
int fd; /* File descriptor for the port */ int fd; /* File descriptor for the port */
speed_t speed; /* serial comm speed */ speed_t speed; /* serial comm speed */
port_t *rp;
#ifdef HAVE_TERMIOS_H #ifdef HAVE_TERMIOS_H
struct termios options; struct termios options;
@ -101,11 +100,9 @@ int serial_open(struct rig_state *rs) {
#error "No term control supported!" #error "No term control supported!"
#endif #endif
if (!rs) if (!rp)
return -RIG_EINVAL; return -RIG_EINVAL;
rp = &rs->rigport;
/* /*
* Open in Non-blocking mode. Watch for EAGAIN errors! * Open in Non-blocking mode. Watch for EAGAIN errors!
*/ */

4
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.7 2001-06-04 17:01:21 f4cfe Exp $ * $Id: serial.h,v 1.8 2001-06-05 18:08:30 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
@ -31,7 +31,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
int serial_open(struct rig_state *rs); int serial_open(port_t *rs);
#if 0 #if 0
int read_sleep(int fd, unsigned char *rxbuffer, int num , int read_delay); int read_sleep(int fd, unsigned char *rxbuffer, int num , int read_delay);