mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity
351 Commits 3 Branches 3 Tags 455 KiB
060d1d8a73
Commit Graph

191 Commits

Author SHA1 Message Date
Uwe Hermann
948f63f0fd add_handle(): Fix a memory leak. 
This fixes the following scan-build warning:

  serialport.c:1170:3: warning: Potential leak of memory pointed to by 'new_handles'
                  RETURN_ERROR(SP_ERR_MEM, "Mask array realloc() failed");
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 2015-04-03 17:51:41 +02:00
Martin Ling
8d12e620f2 Clarify sp_list_ports() code. 
This also fixes the following scan-build warning:

  serialport.c:335:15: warning: Result of 'malloc' is converted to a
  pointer of type 'struct sp_port *', which is incompatible with sizeof
  operand type 'struct sp_port **'
          if (!(list = malloc(sizeof(struct sp_port **))))
                       ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
 2015-04-03 17:46:26 +02:00
Martin Ling
34442106ef windows: Set fAbortOnError=FALSE. 
Since we're not handling and clearing receive errors (framing, parity and
overrun), we should turn them off to avoid crashing out with
ERROR_OPERATION_ABORTED in various calls if they occur. Invalid data
will then simply not end up in the buffer. This is consistent with our
current behaviour on posix/termios systems.

It might be nice to be able to inform calling code about receive errors, but I
can't see a good way to do this in a cross-platform way at the moment.

This fixes (parts of) bug #341.
 2015-03-29 22:18:46 +02:00
Martin Ling
47fcf8ec85 windows: Revise management of WaitCommEvent() operations. 
This fixes (at least parts of) bug #341.
 2015-03-29 22:18:46 +02:00
Uwe Hermann
6c6aebe78c Make std_baudrates[] static (only used in one file). 2015-03-26 23:57:56 +01:00
Uwe Hermann
dc422c04af Various cosmetic and consistency fixes. 2015-03-26 23:57:56 +01:00
Martin Ling
f446cfbf65 windows: Fix restart of RX/error wait operation after reads. 
This fixes bug #421.
 2015-02-15 20:52:45 +01:00
Boris Gjenero
e31f2c6b8b Fix free() of uninitialized pointer. 
Explicitly set port->usb_path to NULL, otherwise a free(port->usb_path)
can happen where port->usb_path is uninitialized.

This closes bug #512.
 2014-12-05 18:42:43 +01:00
Janne Huttunen
ad7498553c Flush only the requested buffers 
Fix the sp_flush() so that it flushes only the requested buffers
also in unix.
 2014-10-12 21:38:03 +02:00
Aurelien Jacobs
276ef1b92f Add SP_MODE_READ_WRITE enum value. 2014-09-20 21:24:31 +02:00
Martin Ling
7890cef6cf Revise debug macros to work in strict C99. 2014-08-24 14:06:21 +01:00
Martin Ling
9caa2e86aa Specialise RETURN_VALUE macro into RETURN_{INT,STRING,POINTER}. 
This avoids the need to pass the required format string on every
call and also eliminates the need for the non-standard typeof() call.
 2014-08-24 13:31:20 +01:00
Uwe Hermann
5a8810e2b2 serialport.c: Fix an 'unused variable' compiler warning. 2014-07-31 23:09:24 +02:00
Aurelien Jacobs
970f279ae4 Introduce SP_API/SP_PRIV to mark visibility of functions. 2014-07-02 14:43:32 +02:00
Martin Ling
e4ce975a54 Fix build for platforms without enumeration & port metadata support. 2014-06-14 12:27:54 +01:00
Aurelien Jacobs
48a4076f69 Move list_ports() implementations to OS-specific files. 2014-06-14 01:28:49 +02:00
Aurelien Jacobs
65172beffe Check bus:address and vid:pid validity. 2014-06-11 17:21:51 +02:00
Martin Ling
e33dcf90a0 Tidy up and split most OS-specific code to separate files. 2014-06-11 15:10:29 +01:00
Aurelien Jacobs
a93fb46888 Add new APIs to get some USB descriptor details for USB serial ports. 2014-06-10 23:51:11 +02:00
Aurelien Jacobs
98cac5d63e Remove the udev dependency and parse the /sys hierarchy instead. 2014-06-10 22:17:07 +02:00
Aurelien Jacobs
073c86bd07 Simplify Mac OS implementation of sp_list_ports(). 2014-06-10 22:17:07 +02:00
Aurelien Jacobs
f095f84164 Remove useless declaration. 2014-06-10 22:17:07 +02:00
Aurelien Jacobs
da2ede60e4 Remove duplicated include. 2014-06-10 22:16:46 +02:00
Aurelien Jacobs
8edf649caf Add format string support to RETURN_ERROR() and RETURN_FAIL(). 2014-06-02 12:08:54 +02:00
Martin Ling
6c4b27a8b8 Merge pull request #1 from silverbuddy/master 
Win32 issues
 2014-03-22 07:14:49 +00:00
silverbuddy
e48f0ece0f Fix malloc size (Win32) 2014-03-21 21:49:22 +04:00
silverbuddy
904ac164bf Fix compilation (Win32 UNICODE) 2014-03-21 21:43:19 +04:00
Uwe Hermann
524b0e1454 Add runtime version querying functions. 
This fixes bug #282.
 2014-03-13 12:23:56 +01:00
Martin Ling
5cea279a85 linux: Speed fields may not be present in kernel termios structures. 2014-01-03 13:38:06 +01:00
Martin Ling
bd791fe121 Remove need to include linux_termios.h on non-Linux. 2014-01-03 12:16:41 +01:00
Martin Ling
6f1186aa82 Add API for waiting on port events. 2013-12-20 18:24:42 +00:00
Uwe Hermann
1a2a1544d7 win32: Add missing ClearCommError() error handling/reporting. 2013-12-17 22:39:15 +01:00
Martin Ling
537942c9ed Windows: clear errors after port open. 2013-12-17 17:19:55 +00:00
Martin Ling
950faaa94a Remove obsolete comment. 2013-12-08 14:41:53 +00:00
Martin Ling
9af8cff38f Remove stray periods from debug messages. 2013-12-07 20:18:27 +00:00
Martin Ling
64d996216e Windows nonblocking write: Dont't return if async I/O finishes immediately. 2013-12-07 20:16:38 +00:00
Martin Ling
1622ef60b0 Check return value of GetOverlappedResult(). 2013-12-07 17:09:06 +00:00
Martin Ling
7c1eff54fd Make RETURN_VALUE macro side effect safe. 2013-12-07 16:29:18 +00:00
Martin Ling
33fd8804b8 Fix building for Android. 2013-12-05 20:33:06 +00:00
Martin Ling
397d89de3a Make libudev optional. 2013-12-05 20:21:39 +00:00
Uwe Hermann
6c8716e9da TIOCINQ/TIOCOUTQ is not available everywhere. 
E.g. on NetBSD TIOCINQ is not available, but FIONREAD seems to
do pretty much the same thing.
 2013-12-01 18:04:24 +01:00
Martin Ling
2c827b2188 Handle EINTR from tcdrain() in sp_drain(). 2013-11-27 14:35:36 +00:00
Martin Ling
63a17c64ae Handle EINTR by repeating the call. 2013-11-27 12:43:12 +00:00
Martin Ling
1b34204261 Fix conversion of timeout to struct timeval. 2013-11-27 11:11:55 +00:00
Martin Ling
3353c22f32 Add sp_input_waiting() and sp_output_waiting() functions. 2013-11-27 02:55:18 +00:00
Martin Ling
e3dcf9068e New API and implementation for blocking and non-blocking I/O. 2013-11-27 01:45:48 +00:00
Martin Ling
8fbf876dfd Set VMIN = 1, not zero which forces non-blocking reads. 2013-11-27 01:37:35 +00:00
Martin Ling
afb518f04a Return SP_ERR_SUPP on attempt to set mark/space parity without CMSPAR. 2013-11-26 15:26:18 +00:00
Uwe Hermann
00d8c56d91 Minor cosmetics. 2013-11-26 16:12:20 +01:00
Uwe Hermann
dd7742fb15 Use "sp: " as prefix for debug logs (nicer/shorter). 2013-11-26 16:00:53 +01:00
Uwe Hermann
c3e0509275 Fix the build on NetBSD/OpenBSD/FreeBSD, possibly others. 
Various termios flags used in sp_open() are Linux-specific (or even
specific to certain architectures / drivers) and not available on all
OSes (and/or versions or kernels thereof).

Thus, #ifdef out flags that we know might not be available everywhere.
 2013-11-26 16:00:53 +01:00
Martin Ling
bccc7c9fa0 Set some sane defaults in sp_open() on Windows too. 2013-11-25 18:30:34 +00:00
Martin Ling
3f5c06d067 Apply termios setting changes immediately. 2013-11-25 18:21:49 +00:00
Martin Ling
e432ce6006 Support mark/space parity settings. 2013-11-25 18:05:58 +00:00
Martin Ling
b251be4b26 Turn off all the fancy termios features. 2013-11-25 17:55:37 +00:00
Martin Ling
0765af5644 Windows nonblocking write: 1 byte at a time to know when buffer fills. 2013-11-25 15:23:05 +00:00
Martin Ling
a3cb91f5e1 Implement non-blocking I/O on Windows. 2013-11-25 12:01:13 +00:00
Martin Ling
aac4d7f292 Fix SET_FAIL macro. 2013-11-25 11:34:42 +00:00
Martin Ling
33d5ff47b5 Handle -EAGAIN in non-blocking reads on Unix, and return 0 from sp_read(). 2013-11-25 10:23:13 +00:00
Martin Ling
0ba3e49b45 Fix bug in debug message generation in sp_flush(). 2013-11-23 21:21:18 +00:00
Martin Ling
59131d6028 Initialise structure in sp_new_config(). 2013-11-23 20:55:18 +00:00
Martin Ling
9b1502efce Make configuration structure opaque. 2013-11-23 20:43:13 +00:00
Martin Ling
3c126654b3 Add sp_get_port_handle() function. 2013-11-23 17:50:45 +00:00
Martin Ling
1c5aae9dc5 Make port structure opaque. 2013-11-23 17:11:19 +00:00
Martin Ling
70cd37def2 Add back previously deleted sp_get_config function. 2013-11-23 12:04:21 +00:00
Martin Ling
a6cda1e8c7 Fix swapped DCD & RI signals on Windows. 2013-11-23 11:59:42 +00:00
Martin Ling
6b93ede419 Return SP_ERR_SUPP from sp_list_ports() on unsupported platforms. 2013-11-23 11:57:17 +00:00
Martin Ling
64690702cb Generate debug output when returning using TRY() macro. 2013-11-23 11:49:35 +00:00
Martin Ling
dec10e31d0 Additional argument checking. 2013-11-23 11:39:59 +00:00
Martin Ling
ea667be751 Add additional debug messages. 2013-11-23 01:08:57 +00:00
Martin Ling
c33efc482e Add debug output for all entry and exit points. 2013-11-23 00:26:44 +00:00
Martin Ling
92f756f8c1 Add debug macros. 2013-11-23 00:19:38 +00:00
Martin Ling
863b35e69c Add API for and default handler for debug messages. 2013-11-22 22:41:03 +00:00
Uwe Hermann
71c8a9b906 serialport.c: Add missing linux_termios.h #include. 
This is safe to include (at the moment) on all non-win32 OSes, since it
doesn't contain anything OS-specific.
 2013-11-22 22:41:23 +01:00
Martin Ling
6aabf62a90 Use new SP_ERR_SUPP error to indicate unsupported operations. 2013-11-22 21:46:26 +01:00
Martin Ling
68ec29db5e Check for termiox support at runtime. 2013-11-22 20:28:20 +01:00
Martin Ling
8d43110ad7 Fix memory leaks. 2013-11-22 20:28:20 +01:00
Uwe Hermann
1d5d2a166f Temporarily disable USE_TERMIOX code (breaks the lib). 
On some systems the use of the code enabled by USE_TERMIOX leads to a
non-working sp_open() which breaks all functionality provided by the lib.

Thus, temporarily disable that code until the details are investigated.

This has been tested with a serial port DMM and the OLS logic analyzer
on an x86 64bit Linux system with kernel version 3.11. The code compiles
fine but doesn't work at runtime. The configure output included:

checking for struct termios2... yes
checking for struct termiox... yes

The root cause for the problem is that the ioctl(fd, TCGETX, data) call in
get_flow() returns -1 ("Invalid argument"), which in turn lets sp_open()
return SP_ERR_FAIL.
 2013-11-22 16:44:19 +01:00
Uwe Hermann
24abdb680f Minor cosmetics. 2013-11-22 16:10:55 +01:00
Martin Ling
82f424e6cd Fix to sp_flush() on Unix. 2013-11-22 02:19:12 +01:00
Martin Ling
8cf7c6978f Add sp_get_signals() function. 2013-11-22 02:11:40 +01:00
Martin Ling
90cc3ee62b Add sp_start_break() and sp_end_break() functions. 2013-11-22 02:11:34 +01:00
Martin Ling
69a3739ca0 Add sp_drain() function. 2013-11-22 02:11:34 +01:00
Martin Ling
fd8fd11a4e Make sp_flush take an option for what to flush. 2013-11-22 01:53:22 +01:00
Martin Ling
a036341bdf Use a more logical set of SP_MODE_* flags. 2013-11-22 01:48:02 +01:00
Martin Ling
40978c2b41 Support non-standard flow control modes on Linux. 2013-11-21 11:52:41 +00:00
Martin Ling
7a6d2196e0 Support custom baudrates on Linux. 2013-11-21 11:51:08 +00:00
Matthias Heidbrink
31b3a8f5b5 Added support for non-standard baud rates for Apple. 2013-11-20 19:18:36 +00:00
Martin Ling
e29b93a572 Retrieve XON/XOFF setting on Unix. 2013-11-19 20:46:52 +00:00
Uwe Hermann
eac329d26b Cosmetics, whitespace, consistency fixes. 2013-11-19 19:32:01 +01:00
Uwe Hermann
705bdc6947 get_config(): Add a quickfix for xon_xoff. 
The config->xon_xoff variable is not filled correctly with data read
from the current serial port config. Without this, the value of the
variable will be bogus and some code that depends on the variable will fail.

Note: This is just a temporary quickfix, not a proper final solution.
 2013-11-19 19:32:01 +01:00
Uwe Hermann
23922313b3 set_config(): Add missing CS5 handling. 2013-11-19 12:32:01 +01:00
Martin Ling
eb6ed20f51 Use named enums instead of ints for clearer documentation. 2013-11-19 02:36:22 +00:00
Martin Ling
bf2cbd652f Mark config argument to sp_set_config as const. 2013-11-19 01:13:09 +00:00
Martin Ling
823690ae3e Additional argument checking for config functions. 2013-11-18 20:08:25 +00:00
Martin Ling
8f189c4c0f Remove sp_ prefix from private port data structure. 2013-11-18 20:04:54 +00:00
Martin Ling
348e23ccbb Tidy up static functions. 2013-11-18 20:02:30 +00:00
Martin Ling
8f471c669f Make sure OS handles are set correctly for unopened / closed ports. 2013-11-18 20:00:15 +00:00
Martin Ling
c6754b4517 Get Xon/Xoff status on Windows. 2013-11-18 19:55:43 +00:00
Martin Ling
e33ab9aaf2 Refactor port configuration code. 2013-11-18 19:52:37 +00:00