From a1dcf5d848c38877dad8c76bc295811d25dbf1d8 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 21 Jan 2004 19:14:19 +0000 Subject: [PATCH] * devices.in: Change raw com device to more correct form. --- winsup/cygwin/ChangeLog | 4 +++ winsup/cygwin/devices.cc | 66 ++++++++++++++++++++-------------------- winsup/cygwin/devices.in | 4 +-- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6a6f0458e..cf8c38ece 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2004-01-21 Christopher Faylor + + * devices.in: Change raw com device to more correct form. + 2004-01-21 Christopher Faylor * fhandler.cc (fhandler_base::open): Use major numbers rather than diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc index b0193d09a..750334fbb 100644 --- a/winsup/cygwin/devices.cc +++ b/winsup/cygwin/devices.cc @@ -52,23 +52,23 @@ const device dev_bad_storage = static const device dev_storage[] = { {"/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard"}, - {"/dev/com0", FHDEV(DEV_SERIAL_MAJOR, 0), "\\.\\com0"}, - {"/dev/com1", FHDEV(DEV_SERIAL_MAJOR, 1), "\\.\\com1"}, - {"/dev/com2", FHDEV(DEV_SERIAL_MAJOR, 2), "\\.\\com2"}, - {"/dev/com3", FHDEV(DEV_SERIAL_MAJOR, 3), "\\.\\com3"}, - {"/dev/com4", FHDEV(DEV_SERIAL_MAJOR, 4), "\\.\\com4"}, - {"/dev/com5", FHDEV(DEV_SERIAL_MAJOR, 5), "\\.\\com5"}, - {"/dev/com6", FHDEV(DEV_SERIAL_MAJOR, 6), "\\.\\com6"}, - {"/dev/com7", FHDEV(DEV_SERIAL_MAJOR, 7), "\\.\\com7"}, - {"/dev/com8", FHDEV(DEV_SERIAL_MAJOR, 8), "\\.\\com8"}, - {"/dev/com9", FHDEV(DEV_SERIAL_MAJOR, 9), "\\.\\com9"}, - {"/dev/com10", FHDEV(DEV_SERIAL_MAJOR, 10), "\\.\\com10"}, - {"/dev/com11", FHDEV(DEV_SERIAL_MAJOR, 11), "\\.\\com11"}, - {"/dev/com12", FHDEV(DEV_SERIAL_MAJOR, 12), "\\.\\com12"}, - {"/dev/com13", FHDEV(DEV_SERIAL_MAJOR, 13), "\\.\\com13"}, - {"/dev/com14", FHDEV(DEV_SERIAL_MAJOR, 14), "\\.\\com14"}, - {"/dev/com15", FHDEV(DEV_SERIAL_MAJOR, 15), "\\.\\com15"}, - {"/dev/com16", FHDEV(DEV_SERIAL_MAJOR, 16), "\\.\\com16"}, + {"/dev/com0", FHDEV(DEV_SERIAL_MAJOR, 0), "\\\\.\\com0"}, + {"/dev/com1", FHDEV(DEV_SERIAL_MAJOR, 1), "\\\\.\\com1"}, + {"/dev/com2", FHDEV(DEV_SERIAL_MAJOR, 2), "\\\\.\\com2"}, + {"/dev/com3", FHDEV(DEV_SERIAL_MAJOR, 3), "\\\\.\\com3"}, + {"/dev/com4", FHDEV(DEV_SERIAL_MAJOR, 4), "\\\\.\\com4"}, + {"/dev/com5", FHDEV(DEV_SERIAL_MAJOR, 5), "\\\\.\\com5"}, + {"/dev/com6", FHDEV(DEV_SERIAL_MAJOR, 6), "\\\\.\\com6"}, + {"/dev/com7", FHDEV(DEV_SERIAL_MAJOR, 7), "\\\\.\\com7"}, + {"/dev/com8", FHDEV(DEV_SERIAL_MAJOR, 8), "\\\\.\\com8"}, + {"/dev/com9", FHDEV(DEV_SERIAL_MAJOR, 9), "\\\\.\\com9"}, + {"/dev/com10", FHDEV(DEV_SERIAL_MAJOR, 10), "\\\\.\\com10"}, + {"/dev/com11", FHDEV(DEV_SERIAL_MAJOR, 11), "\\\\.\\com11"}, + {"/dev/com12", FHDEV(DEV_SERIAL_MAJOR, 12), "\\\\.\\com12"}, + {"/dev/com13", FHDEV(DEV_SERIAL_MAJOR, 13), "\\\\.\\com13"}, + {"/dev/com14", FHDEV(DEV_SERIAL_MAJOR, 14), "\\\\.\\com14"}, + {"/dev/com15", FHDEV(DEV_SERIAL_MAJOR, 15), "\\\\.\\com15"}, + {"/dev/com16", FHDEV(DEV_SERIAL_MAJOR, 16), "\\\\.\\com16"}, {"/dev/conin", FH_CONIN, "conin"}, {"/dev/conout", FH_CONOUT, "conout"}, {"/dev/console", FH_CONSOLE, "\\dev\\console"}, @@ -866,22 +866,22 @@ static const device dev_storage[] = {"/dev/tty61", FHDEV(DEV_TTYS_MAJOR, 61), "\\dev\\tty61"}, {"/dev/tty62", FHDEV(DEV_TTYS_MAJOR, 62), "\\dev\\tty62"}, {"/dev/tty63", FHDEV(DEV_TTYS_MAJOR, 63), "\\dev\\tty63"}, - {"/dev/ttyS0", FHDEV(DEV_SERIAL_MAJOR, 1), "\\.\\com1"}, - {"/dev/ttyS1", FHDEV(DEV_SERIAL_MAJOR, 2), "\\.\\com2"}, - {"/dev/ttyS2", FHDEV(DEV_SERIAL_MAJOR, 3), "\\.\\com3"}, - {"/dev/ttyS3", FHDEV(DEV_SERIAL_MAJOR, 4), "\\.\\com4"}, - {"/dev/ttyS4", FHDEV(DEV_SERIAL_MAJOR, 5), "\\.\\com5"}, - {"/dev/ttyS5", FHDEV(DEV_SERIAL_MAJOR, 6), "\\.\\com6"}, - {"/dev/ttyS6", FHDEV(DEV_SERIAL_MAJOR, 7), "\\.\\com7"}, - {"/dev/ttyS7", FHDEV(DEV_SERIAL_MAJOR, 8), "\\.\\com8"}, - {"/dev/ttyS8", FHDEV(DEV_SERIAL_MAJOR, 9), "\\.\\com9"}, - {"/dev/ttyS9", FHDEV(DEV_SERIAL_MAJOR, 10), "\\.\\com10"}, - {"/dev/ttyS10", FHDEV(DEV_SERIAL_MAJOR, 11), "\\.\\com11"}, - {"/dev/ttyS11", FHDEV(DEV_SERIAL_MAJOR, 12), "\\.\\com12"}, - {"/dev/ttyS12", FHDEV(DEV_SERIAL_MAJOR, 13), "\\.\\com13"}, - {"/dev/ttyS13", FHDEV(DEV_SERIAL_MAJOR, 14), "\\.\\com14"}, - {"/dev/ttyS14", FHDEV(DEV_SERIAL_MAJOR, 15), "\\.\\com15"}, - {"/dev/ttyS15", FHDEV(DEV_SERIAL_MAJOR, 16), "\\.\\com16"}, + {"/dev/ttyS0", FHDEV(DEV_SERIAL_MAJOR, 1), "\\\\.\\com1"}, + {"/dev/ttyS1", FHDEV(DEV_SERIAL_MAJOR, 2), "\\\\.\\com2"}, + {"/dev/ttyS2", FHDEV(DEV_SERIAL_MAJOR, 3), "\\\\.\\com3"}, + {"/dev/ttyS3", FHDEV(DEV_SERIAL_MAJOR, 4), "\\\\.\\com4"}, + {"/dev/ttyS4", FHDEV(DEV_SERIAL_MAJOR, 5), "\\\\.\\com5"}, + {"/dev/ttyS5", FHDEV(DEV_SERIAL_MAJOR, 6), "\\\\.\\com6"}, + {"/dev/ttyS6", FHDEV(DEV_SERIAL_MAJOR, 7), "\\\\.\\com7"}, + {"/dev/ttyS7", FHDEV(DEV_SERIAL_MAJOR, 8), "\\\\.\\com8"}, + {"/dev/ttyS8", FHDEV(DEV_SERIAL_MAJOR, 9), "\\\\.\\com9"}, + {"/dev/ttyS9", FHDEV(DEV_SERIAL_MAJOR, 10), "\\\\.\\com10"}, + {"/dev/ttyS10", FHDEV(DEV_SERIAL_MAJOR, 11), "\\\\.\\com11"}, + {"/dev/ttyS11", FHDEV(DEV_SERIAL_MAJOR, 12), "\\\\.\\com12"}, + {"/dev/ttyS12", FHDEV(DEV_SERIAL_MAJOR, 13), "\\\\.\\com13"}, + {"/dev/ttyS13", FHDEV(DEV_SERIAL_MAJOR, 14), "\\\\.\\com14"}, + {"/dev/ttyS14", FHDEV(DEV_SERIAL_MAJOR, 15), "\\\\.\\com15"}, + {"/dev/ttyS15", FHDEV(DEV_SERIAL_MAJOR, 16), "\\\\.\\com16"}, {"/dev/ttym", FH_TTYM, "\\dev\\ttym"}, {"/dev/urandom", FH_URANDOM, "\\dev\\urandom"}, {"/dev/windows", FH_WINDOWS, "\\dev\\windows"}, diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in index b55418f97..1bcb73bc7 100644 --- a/winsup/cygwin/devices.in +++ b/winsup/cygwin/devices.in @@ -65,8 +65,8 @@ const device dev_bad_storage = "/dev/kmem", FH_KMEM, "\\dev\\mem" "/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard" "/dev/port", FH_PORT, "\\dev\\port" -"/dev/com%(0-16)d", FHDEV(DEV_SERIAL_MAJOR, {$1}), "\\.\\com{$1}" -"/dev/ttyS%(0-15)d", FHDEV(DEV_SERIAL_MAJOR, {$1 + 1}), "\\.\\com{$1 + 1}" +"/dev/com%(0-16)d", FHDEV(DEV_SERIAL_MAJOR, {$1}), "\\\\.\\com{$1}" +"/dev/ttyS%(0-15)d", FHDEV(DEV_SERIAL_MAJOR, {$1 + 1}), "\\\\.\\com{$1 + 1}" "/dev/pipe", FH_PIPE, "\\dev\\pipe" "/dev/fifo", FH_FIFO, "\\dev\\fifo" "/dev/st%(0-127)d", FHDEV(DEV_TAPE_MAJOR, {$1}), "\\Device\\Tape{$1}"