1
0
mirror of https://github.com/UzixLS/picocom.git synced 2025-07-19 07:21:18 +03:00

Merge branch 'osx-rts-dtr' of https://github.com/Joe-Merten/picocom into Joe-Merten-osx-rts-dtr

This commit is contained in:
Nick Patavalis
2016-12-04 22:07:24 +02:00
2 changed files with 17 additions and 16 deletions

View File

@ -78,7 +78,7 @@ here.
: Toggle the RTS line. If RTS is up, then lower it. If it is down,
then raise it. Not supported if the flow control mode is RTS/CTS.
Only supported in Linux.
Only supported in Linux and OSX.
**C-backslash**
@ -276,12 +276,13 @@ Picocom accepts the following command-line options.
: Lower the RTS control signal after opening the serial port (by
default RTS is raised after open). Only supported when
flow-control mode is not set to RTS/CTS, ignored otherwise. Only
supported in Linux.
supported in Linux and OSX.
**--lower-dtr**
: Lower the DTR control signal after opening the serial port (by
default DTR is raised after open). Only supported in Linux.
default DTR is raised after open). Only supported in Linux and
OSX.
**--help** | **-h**

26
term.c
View File

@ -52,7 +52,7 @@
#define CMSPAR 0
#endif
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
#include <sys/ioctl.h>
#endif
@ -1283,7 +1283,7 @@ term_pulse_dtr (int fd)
break;
}
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
{
int opins = TIOCM_DTR;
@ -1335,7 +1335,7 @@ term_pulse_dtr (int fd)
break;
}
}
#endif /* of __linux__ */
#endif /* of __linux__ or __APPLE__ */
} while (0);
@ -1359,7 +1359,7 @@ term_raise_dtr(int fd)
break;
}
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
{
int opins = TIOCM_DTR;
@ -1378,7 +1378,7 @@ term_raise_dtr(int fd)
rval = -1;
break;
}
#endif /* of __linux__ */
#endif /* of __linux__ or __APPLE__ */
} while (0);
return rval;
@ -1402,7 +1402,7 @@ term_lower_dtr(int fd)
break;
}
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
{
int opins = TIOCM_DTR;
@ -1435,7 +1435,7 @@ term_lower_dtr(int fd)
break;
}
}
#endif /* of __linux__ */
#endif /* of __linux__ or __APPLE__ */
} while (0);
return rval;
@ -1458,7 +1458,7 @@ term_raise_rts(int fd)
break;
}
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
{
int r;
int opins = TIOCM_RTS;
@ -1473,7 +1473,7 @@ term_raise_rts(int fd)
#else
term_errno = TERM_ERTSUP;
rval = -1;
#endif /* of __linux__ */
#endif /* of __linux__ or __APPLE__ */
} while (0);
return rval;
@ -1496,7 +1496,7 @@ term_lower_rts(int fd)
break;
}
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
{
int r;
int opins = TIOCM_RTS;
@ -1511,7 +1511,7 @@ term_lower_rts(int fd)
#else
term_errno = TERM_ERTSDOWN;
rval = -1;
#endif /* of __linux__ */
#endif /* of __linux__ or __APPLE__ */
} while (0);
return rval;
@ -1533,7 +1533,7 @@ term_get_mctl (int fd)
break;
}
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
{
int r, pmctl;
@ -1552,7 +1552,7 @@ term_get_mctl (int fd)
}
#else
mctl = MCTL_UNAVAIL;
#endif
#endif /* of __linux__ or __APPLE__ */
} while(0);
return mctl;