Rename cygWFMO to cygwait throughout and use the magic of polymorphism to "wait

[pf3gnuchains/pf3gnuchains4x.git] / winsup / cygwin / devices.in

diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in
index 1b59d94..b404e42 100644 (file)
--- a/winsup/cygwin/devices.in
+++ b/winsup/cygwin/devices.in
@@ -56,17 +56,21 @@ const device dev_dgram_storage =
   {"", {FH_DGRAM}, ""};
 
 const device dev_bad_storage =
-  {"", {FH_BAD}, ""};
-#define BRACK(x) {x}
+  {"", {FH_NADA}, ""};
+
+const device dev_error_storage =
+  {"", {FH_ERROR}, ""};
+#define BRACK(x) {devn_int: x}
 
 %storage_here
 }
 %%
 "/dev/tty", BRACK(FH_TTY), "/dev/tty"
-"/dev/tty%(0-63)d", BRACK(FHDEV(DEV_TTYS_MAJOR, {$1})), "/dev/tty{$1}", ttys_dev
+"/dev/pty%(0-63)d", BRACK(FHDEV(DEV_PTYS_MAJOR, {$1})), "/dev/pty{$1}", ptys_dev
+"/dev/ptym%(0-63)d", BRACK(FHDEV(DEV_PTYM_MAJOR, {$1})), "/dev/ptym{$1}", ptym_dev
+"/dev/cons%(0-63)d", BRACK(FHDEV(DEV_CONS_MAJOR, {$1})), "/dev/cons{$1}", cons_dev
 "/dev/console", BRACK(FH_CONSOLE), "/dev/console", console_dev
-"/dev/ttym", BRACK(FH_TTYM), "/dev/ttym", ttym_dev
-"/dev/ptmx", BRACK(FH_PTYM), "/dev/ptmx"
+"/dev/ptmx", BRACK(FH_PTMX), "/dev/ptmx"
 "/dev/windows", BRACK(FH_WINDOWS), "/dev/windows"
 "/dev/dsp", BRACK(FH_OSS_DSP), "/dev/dsp"
 "/dev/conin", BRACK(FH_CONIN), "/dev/conin"
@@ -127,17 +131,17 @@ device::parse (_major_t major, _minor_t minor)
 {
   _dev_t dev = FHDEV (major, minor);
 
-  devn = 0;
+  d.devn = 0;
 
   for (unsigned i = 0; i < (sizeof (dev_storage) / sizeof (dev_storage[0])); i++)
-    if (dev_storage[i].devn == dev)
+    if (dev_storage[i].d.devn == dev)
       {
        *this = dev_storage[i];
        break;
       }
 
   if (!*this)
-    devn = FHDEV (major, minor);
+    d.devn = FHDEV (major, minor);
 }
 
 void