summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/devices.h
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2012-04-02 15:56:43 +0000
committerCorinna Vinschen <corinna@vinschen.de>2012-04-02 15:56:43 +0000
commitf7c8c4540a86561fc4cc100c0d752740231d7960 (patch)
treeea5bde2ea06e3c3874e7ac34287d8090e46e17f0 /winsup/cygwin/devices.h
parent1f312200d30c76f24e6bc56afa7d4786ea86b4d5 (diff)
downloadcygnal-f7c8c4540a86561fc4cc100c0d752740231d7960.tar.gz
cygnal-f7c8c4540a86561fc4cc100c0d752740231d7960.tar.bz2
cygnal-f7c8c4540a86561fc4cc100c0d752740231d7960.zip
* devices.h (FH_CYGDRIVE): Define as DEV_VIRTFS_MAJOR class device.
(DEV_CYGDRIVE_MAJOR): Remove. (iscygdrive_dev): Define. * dtable.cc (fh_alloc): Accommodate above change. * path.cc (path_conv::check): Use iscygdrive_dev to check for cygdrive. * syscalls.cc (fhandler_base::set_ino_and_dev): Drop check for DEV_CYGDRIVE_MAJOR from conditional.
Diffstat (limited to 'winsup/cygwin/devices.h')
-rw-r--r--winsup/cygwin/devices.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h
index d059bec2b..f5607f8c8 100644
--- a/winsup/cygwin/devices.h
+++ b/winsup/cygwin/devices.h
@@ -73,6 +73,7 @@ enum fh_devices
FH_FS = FHDEV (DEV_VIRTFS_MAJOR, 195), /* filesystem based device */
FH_NETDRIVE= FHDEV (DEV_VIRTFS_MAJOR, 194),
FH_DEV = FHDEV (DEV_VIRTFS_MAJOR, 193),
+ FH_CYGDRIVE= FHDEV (DEV_VIRTFS_MAJOR, 192),
DEV_FLOPPY_MAJOR = 2,
FH_FLOPPY = FHDEV (DEV_FLOPPY_MAJOR, 0),
@@ -244,9 +245,6 @@ enum fh_devices
DEV_SOUND_MAJOR = 14,
FH_OSS_DSP = FHDEV (DEV_SOUND_MAJOR, 3),
- DEV_CYGDRIVE_MAJOR = 98,
- FH_CYGDRIVE= FHDEV (DEV_CYGDRIVE_MAJOR, 0),
-
DEV_TCP_MAJOR = 30,
FH_TCP = FHDEV (DEV_TCP_MAJOR, 36),
FH_UDP = FHDEV (DEV_TCP_MAJOR, 39),
@@ -365,6 +363,8 @@ extern const device dev_fs_storage;
#define isproc_dev(devn) \
(devn >= FH_PROC_MIN_MINOR && devn <= FH_PROC_MAX_MINOR)
+#define iscygdrive_dev(devn) (devn == FH_CYGDRIVE)
+
#define isdev_dev(devn) (devn == FH_DEV)
#define isprocsys_dev(devn) (devn == FH_PROCSYS)