deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1076 from cmorty/pull/serialdump

Browse source 
Make EINVAL handling more robust and revert binary
This commit is contained in:
Simon Duquennoy 2015-08-28 23:54:43 +02:00
parent 7d8940f380 e38bc3bdcd
commit cc3bcbefd4
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tools/sky/serialdump-linux
View file

Binary file not shown.

16
tools/sky/serialdump.c
View file

@ -164,13 +164,21 @@ main(int argc, char **argv)
}
fprintf(stderr, "connecting to %s (%s)", device, speedname);
#ifdef O_SYNC
#ifndef O_SYNC
#define O_SYNC 0
#endif
#ifdef O_DIRECT
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT | O_SYNC);
if(fd < 0 && errno == EINVAL){ // O_SYNC not supported (e.g. raspberian)
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT);
/* Some systems do not support certain parameters (e.g. raspbian)
* Just do some random testing. Not sure whether there is a better way
* of doing this. */
if(fd < 0 && errno == EINVAL){
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC);
}
#else
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC );
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC);
#endif
if(fd < 0) {
fprintf(stderr, "\n");