* devices.h: Renumber internal devices so that FH_PROCESS is part of

the /proc family of virtual devices.
	(FH_PROC_MAX_MINOR): Define.
	* path.h (isproc_dev): Use FH_PROC_MAX_MINOR rather than FH_PROC.
This commit is contained in:
Corinna Vinschen 2011-04-20 07:29:10 +00:00
parent f59c2998a1
commit 12c0f2d909
3 changed files with 22 additions and 13 deletions

View File

@ -1,10 +1,17 @@
2011-04-20 Corinna Vinschen <corinna@vinschen.de>
* devices.h: Renumber internal devices so that FH_PROCESS is part of
the /proc family of virtual devices.
(FH_PROC_MAX_MINOR): Define.
* path.h (isproc_dev): Use FH_PROC_MAX_MINOR rather than FH_PROC.
2011-04-19 Peter Rosin <peda@lysator.liu.se> 2011-04-19 Peter Rosin <peda@lysator.liu.se>
* select.cc (pipe_cleanup): Make sure that device_specific_pipe is * select.cc (pipe_cleanup): Make sure that device_specific_pipe is
always deleted regardless of whether it has a unique thread associated always deleted regardless of whether it has a unique thread associated
with it. with it.
2011-04-02 Jon TURNEY <jon.turney@dronecode.org.uk> 2011-04-19 Jon TURNEY <jon.turney@dronecode.org.uk>
* thread.cc (semaphore::init): We cannot reliably infer anything from * thread.cc (semaphore::init): We cannot reliably infer anything from
the existing contents of sem, so merely warn rather than return EBUSY the existing contents of sem, so merely warn rather than return EBUSY

View File

@ -40,24 +40,26 @@ enum fh_devices
FH_CLIPBOARD=FHDEV (13, 254), FH_CLIPBOARD=FHDEV (13, 254),
/* begin /proc directories */ /* begin /proc directories */
FH_PROC = FHDEV (0, 255), FH_PROC_MAX_MINOR = FHDEV (0, 255),
FH_REGISTRY= FHDEV (0, 254),
FH_PROCNET = FHDEV (0, 253),
FH_PROCESSFD = FHDEV (0, 252),
FH_PROCSYS = FHDEV (0, 251),
FH_PROCSYSVIPC = FHDEV (0,250),
FH_PROC_MIN_MINOR = FHDEV (0,200), FH_PROC = FHDEV (0, 255),
FH_PROCESS = FHDEV (0, 254),
FH_REGISTRY= FHDEV (0, 253),
FH_PROCNET = FHDEV (0, 252),
FH_PROCESSFD = FHDEV (0, 251),
FH_PROCSYS = FHDEV (0, 250),
FH_PROCSYSVIPC = FHDEV (0, 249),
FH_PROC_MIN_MINOR = FHDEV (0, 200),
/* end /proc directories */ /* end /proc directories */
FH_PIPE = FHDEV (0, 199), FH_PIPE = FHDEV (0, 199),
FH_PIPER = FHDEV (0, 198), FH_PIPER = FHDEV (0, 198),
FH_PIPEW = FHDEV (0, 197), FH_PIPEW = FHDEV (0, 197),
FH_FIFO = FHDEV (0, 196), FH_FIFO = FHDEV (0, 196),
FH_PROCESS = FHDEV (0, 195), FH_FS = FHDEV (0, 195), /* filesystem based device */
FH_FS = FHDEV (0, 194), /* filesystem based device */ FH_NETDRIVE= FHDEV (0, 194),
FH_NETDRIVE= FHDEV (0, 193), FH_DEV = FHDEV (0, 193),
FH_DEV = FHDEV (0, 192),
DEV_FLOPPY_MAJOR = 2, DEV_FLOPPY_MAJOR = 2,
FH_FLOPPY = FHDEV (DEV_FLOPPY_MAJOR, 0), FH_FLOPPY = FHDEV (DEV_FLOPPY_MAJOR, 0),

View File

@ -18,7 +18,7 @@ details. */
#include <fcntl.h> #include <fcntl.h>
#define isproc_dev(devn) \ #define isproc_dev(devn) \
(devn >= FH_PROC_MIN_MINOR && devn <= FH_PROC) (devn >= FH_PROC_MIN_MINOR && devn <= FH_PROC_MAX_MINOR)
#define isprocsys_dev(devn) (devn == FH_PROCSYS) #define isprocsys_dev(devn) (devn == FH_PROCSYS)