kopia lustrzana https://github.com/Hamlib/Hamlib
Workaround SF#3055689
* make sure the PTT is not set when configured as RTS/DTR at open()/close() time. It appears the Linux kernel force their value as explained here[1] during open. Also obvious when reading the source code[2], esp. in uart_startup() and uart_update_termios() where uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS) is called. [1] http://books.google.fr/books?id=75eeBNcjcuIC&lpg=PA152&ots=Qvgi6VDLvm&pg=PA152#v=onepage&q&f=false [2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=drivers/serial/serial_core.c;hb=HEAD * don't let the OS change modem signals at close() time git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2983 7ae35d74-ebe9-4afe-98af-79ac388436b8Hamlib-1.2.13
Stéphane Fillod, F8CFE
rodzic
1e34d99098
commit
5c24ee2925
13
src/rig.c
13
src/rig.c
|
|
@ -481,6 +481,13 @@ int HAMLIB_API rig_open(RIG *rig)
|
|||
if (rs->pttport.fd < 0)
|
||||
rig_debug(RIG_DEBUG_ERR, "Cannot open PTT device \"%s\"\n",
|
||||
rs->pttport.pathname);
|
||||
else {
|
||||
/* Needed on Linux because the kernel forces RTS/DTR at open */
|
||||
if (rs->pttport.type.ptt == RIG_PTT_SERIAL_DTR)
|
||||
ser_set_dtr(&rs->pttport, RIG_PTT_OFF);
|
||||
else if (rs->pttport.type.ptt == RIG_PTT_SERIAL_RTS)
|
||||
ser_set_rts(&rs->pttport, RIG_PTT_OFF);
|
||||
}
|
||||
break;
|
||||
case RIG_PTT_PARALLEL:
|
||||
rs->pttport.fd = par_open(&rs->pttport);
|
||||
|
|
@ -606,8 +613,12 @@ int HAMLIB_API rig_close(RIG *rig)
|
|||
case RIG_PTT_RIG:
|
||||
break;
|
||||
case RIG_PTT_SERIAL_RTS:
|
||||
ser_set_rts(&rs->pttport, RIG_PTT_OFF);
|
||||
port_close(&rs->pttport, RIG_PORT_SERIAL);
|
||||
break;
|
||||
case RIG_PTT_SERIAL_DTR:
|
||||
port_close(&rs->pttport, RIG_PORT_SERIAL);
|
||||
ser_set_dtr(&rs->pttport, RIG_PTT_OFF);
|
||||
port_close(&rs->pttport, RIG_PORT_SERIAL);
|
||||
break;
|
||||
case RIG_PTT_PARALLEL:
|
||||
par_ptt_set(&rs->pttport, RIG_PTT_OFF);
|
||||
|
|
|
|||
44
src/serial.c
44
src/serial.c
|
|
@ -1,11 +1,10 @@
|
|||
/*
|
||||
* Hamlib Interface - serial communication low-level support
|
||||
* Copyright (c) 2000-2009 by Stephane Fillod
|
||||
* Copyright (c) 2000-2010 by Stephane Fillod
|
||||
* Copyright (c) 2000-2003 by Frank Singleton
|
||||
* Parts of the PTT handling are derived from soundmodem, an excellent
|
||||
* ham packet softmodem written by Thomas Sailer, HB9JNX.
|
||||
*
|
||||
* $Id: serial.c,v 1.45 2006-10-15 00:27:52 aa6e 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
|
||||
|
|
@ -105,8 +104,8 @@ int HAMLIB_API serial_open(hamlib_port_t *rp) {
|
|||
|
||||
/* Could not open the port. */
|
||||
|
||||
rig_debug(RIG_DEBUG_ERR, "serial_open: Unable to open %s - %s\n",
|
||||
rp->pathname, strerror(errno));
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: Unable to open %s - %s\n",
|
||||
__func__, rp->pathname, strerror(errno));
|
||||
return -RIG_EIO;
|
||||
}
|
||||
|
||||
|
|
@ -201,8 +200,8 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
|
|||
speed = B115200; /* awsome! */
|
||||
break;
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR, "open_serial: unsupported rate specified: %d\n",
|
||||
rp->parm.serial.rate);
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: unsupported rate specified: %d\n",
|
||||
__func__, rp->parm.serial.rate);
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF;
|
||||
}
|
||||
|
|
@ -216,6 +215,11 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
|
|||
|
||||
options.c_cflag |= (CLOCAL | CREAD);
|
||||
|
||||
/*
|
||||
* close doesn't change modem signals
|
||||
*/
|
||||
options.c_cflag &= ~HUPCL;
|
||||
|
||||
/*
|
||||
* Set data to requested values.
|
||||
*
|
||||
|
|
@ -231,8 +235,8 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
|
|||
options.c_cflag |= CS8;
|
||||
break;
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR,"open_serial: unsupported serial_data_bits "
|
||||
"specified: %d\n", rp->parm.serial.data_bits);
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: unsupported serial_data_bits "
|
||||
"specified: %d\n", __func__, rp->parm.serial.data_bits);
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF;
|
||||
break;
|
||||
|
|
@ -252,8 +256,8 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
|
|||
break;
|
||||
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR, "open_serial: unsupported serial_stop_bits "
|
||||
"specified: %d\n",
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: unsupported serial_stop_bits "
|
||||
"specified: %d\n", __func__,
|
||||
rp->parm.serial.stop_bits);
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF;
|
||||
|
|
@ -278,8 +282,8 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
|
|||
options.c_cflag |= PARODD;
|
||||
break;
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR, "open_serial: unsupported serial_parity "
|
||||
"specified: %d\n",
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: unsupported serial_parity "
|
||||
"specified: %d\n", __func__,
|
||||
rp->parm.serial.parity);
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF;
|
||||
|
|
@ -306,8 +310,8 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
|
|||
options.c_iflag &= ~IXON;
|
||||
break;
|
||||
default:
|
||||
rig_debug(RIG_DEBUG_ERR, "open_serial: unsupported flow_control "
|
||||
"specified: %d\n",
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: unsupported flow_control "
|
||||
"specified: %d\n", __func__,
|
||||
rp->parm.serial.handshake);
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF;
|
||||
|
|
@ -344,22 +348,22 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
|
|||
|
||||
#if defined(HAVE_TERMIOS_H)
|
||||
if (tcsetattr(fd, TCSANOW, &options) == -1) {
|
||||
rig_debug(RIG_DEBUG_ERR, "open_serial: tcsetattr failed: %s\n",
|
||||
strerror(errno));
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: tcsetattr failed: %s\n",
|
||||
__func__, strerror(errno));
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF; /* arg, so close! */
|
||||
}
|
||||
#elif defined(HAVE_TERMIO_H)
|
||||
if (IOCTL(fd, TCSETA, &options) == -1) {
|
||||
rig_debug(RIG_DEBUG_ERR, "open_serial: ioctl(TCSETA) failed: %s\n",
|
||||
strerror(errno));
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: ioctl(TCSETA) failed: %s\n",
|
||||
__func__, strerror(errno));
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF; /* arg, so close! */
|
||||
}
|
||||
#else /* sgtty */
|
||||
if (IOCTL(fd, TIOCSETP, &sg) == -1) {
|
||||
rig_debug(RIG_DEBUG_ERR, "open_serial: ioctl(TIOCSETP) failed: %s\n",
|
||||
strerror(errno));
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: ioctl(TIOCSETP) failed: %s\n",
|
||||
__func__, strerror(errno));
|
||||
CLOSE(fd);
|
||||
return -RIG_ECONF; /* arg, so close! */
|
||||
}
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue