sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

<sys/fcntl.h>, remove O_REOPEN

Browse source 
Change-Id: Id6493f30bb0fec7460d01f357ada9b2c2a4f5eb7
This commit is contained in:
Ben Gras 2013-12-12 13:50:23 +01:00 committed by Lionel Sambuc
parent 46b89a731b
commit a1e1ae5ade
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/playwave/playwave.c
View file

@ -73,7 +73,7 @@ int open_audio(unsigned int *fragment_size, unsigned int channels,
int audio; int audio;
/* Open DSP */ /* Open DSP */
if ((audio = open("/dev/audio", O_RDWR | O_REOPEN)) < 0) if ((audio = open("/dev/audio", O_RDWR)) < 0)
{ {
printf("Cannot open /dev/audio: %s\n", strerror(errno)); printf("Cannot open /dev/audio: %s\n", strerror(errno));
exit(-1); exit(-1);

2
servers/vfs/misc.c
View file

@ -148,7 +148,7 @@ int do_fcntl(void)
case F_SETFL: case F_SETFL:
/* Set file status flags (O_NONBLOCK and O_APPEND). */ /* Set file status flags (O_NONBLOCK and O_APPEND). */
fl = O_NONBLOCK | O_APPEND | O_REOPEN; fl = O_NONBLOCK | O_APPEND;
f->filp_flags = (f->filp_flags & ~fl) | (fcntl_argx & fl); f->filp_flags = (f->filp_flags & ~fl) | (fcntl_argx & fl);
break; break;

12
sys/sys/fcntl.h
View file

@ -121,10 +121,6 @@
#define O_NOSIGPIPE 0x01000000 /* don't deliver sigpipe */ #define O_NOSIGPIPE 0x01000000 /* don't deliver sigpipe */
#endif #endif
#ifdef __minix
#define O_REOPEN 0x10000000 /* automatically re-open after driver crash */
#endif
#ifdef _KERNEL #ifdef _KERNEL
/* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */ /* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */
#define FFLAGS(oflags) ((oflags) + 1) #define FFLAGS(oflags) ((oflags) + 1)
@ -197,10 +193,6 @@
#define F_SETNOSIGPIPE 14 /* set SIGPIPE disposition */ #define F_SETNOSIGPIPE 14 /* set SIGPIPE disposition */
#endif #endif
#ifdef __minix
#define F_FREESP 100
#endif
/* file descriptor flags (F_GETFD, F_SETFD) */ /* file descriptor flags (F_GETFD, F_SETFD) */
#define FD_CLOEXEC 1 /* close-on-exec flag */ #define FD_CLOEXEC 1 /* close-on-exec flag */
@ -327,4 +319,8 @@ int openat(int, const char *, int oflags, ...);
__END_DECLS __END_DECLS
#endif /* !_KERNEL */ #endif /* !_KERNEL */
#ifdef __minix
#define F_FREESP 100
#endif
#endif /* !_SYS_FCNTL_H_ */ #endif /* !_SYS_FCNTL_H_ */