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

Use a more logical set of SP_MODE_* flags.

Browse Source
This commit is contained in:
Martin Ling 2013-11-20 15:54:10 +00:00 committed by Bert Vermeulen
parent 20e63a77b5
commit a036341bdf
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libserialport.h.in
View File

@ -101,10 +101,10 @@ enum sp_return {
/** Port access modes. */
enum sp_mode {
/** Open port for read/write access. */
SP_MODE_RDWR = 1,
/** Open port for read access only. */
SP_MODE_RDONLY = 2,
/** Open port for read access. */
SP_MODE_READ = 1,
/** Open port for write access. */
SP_MODE_WRITE = 2,
/** Open port in non-blocking mode. */
SP_MODE_NONBLOCK = 4,
};

11
serialport.c
View File

@ -422,9 +422,10 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
sprintf(escaped_port_name, "\\\\.\\%s", port->name);
/* Map 'flags' to the OS-specific settings. */
desired_access |= GENERIC_READ;
flags_and_attributes = FILE_ATTRIBUTE_NORMAL;
if (flags & SP_MODE_RDWR)
if (flags & SP_MODE_READ)
desired_access |= GENERIC_READ;
if (flags & SP_MODE_WRITE)
desired_access |= GENERIC_WRITE;
if (flags & SP_MODE_NONBLOCK)
flags_and_attributes |= FILE_FLAG_OVERLAPPED;
@ -443,10 +444,12 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
int ret;
/* Map 'flags' to the OS-specific settings. */
if (flags & SP_MODE_RDWR)
if (flags & (SP_MODE_READ | SP_MODE_WRITE))
flags_local |= O_RDWR;
if (flags & SP_MODE_RDONLY)
else if (flags & SP_MODE_READ)
flags_local |= O_RDONLY;
else if (flags & SP_MODE_WRITE)
flags_local |= O_WRONLY;
if (flags & SP_MODE_NONBLOCK)
flags_local |= O_NONBLOCK;