giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tidy-up handling of O_SYNC and O_DIRECT

Browse Source
This commit is contained in:
George Oikonomou 2018-05-12 16:25:33 +01:00
parent 64ad54d692
commit b2bd5ed662
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/serialdump.c
View File

@ -41,8 +41,12 @@
#define MODE_SLIP 7
#define MODE_SLIP_HIDE 8
/*---------------------------------------------------------------------------*/
#ifndef O_SYNC
#define O_SYNC 0
#endif
#define OPEN_FLAGS (O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC)
/*---------------------------------------------------------------------------*/
static unsigned char rxbuf[2048];
/*---------------------------------------------------------------------------*/
static int
@ -176,22 +180,13 @@ main(int argc, char **argv)
}
}
}
fprintf(stderr, "connecting to %s (%s)", device, speedname);
#ifndef O_SYNC
#define O_SYNC 0
#endif
#ifdef O_DIRECT
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT | O_SYNC);
/* 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);
#endif
fprintf(stderr, "connecting to %s", device);
fd = open(device, OPEN_FLAGS);
if(fd < 0) {
fprintf(stderr, "\n");
perror("open");