From b4ca85fe8a6bd53e4e7325fdca6980b4a841344c Mon Sep 17 00:00:00 2001
From: corinna <corinna>
Date: Tue, 30 Sep 2003 21:03:57 +0000
Subject: [PATCH] 	* devices.h (enum fh_devices): Remove
 DEV_RAWDRIVE_MAJOR and 	FH_RAWDRIVE. 	* devices.shilka
 (dev_rawdrive_storage): Remove. 	(unit_devices): Remove pointer to
 dev_rawdrive_storage. 	(uniq_devices): Remove rawdrive entry. 	* dtable.cc
 (build_fh_pc): Remove DEV_RAWDRIVE_MAJOR case. 	* path.cc
 (win32_device_name): ditto.

---
 winsup/cygwin/devices.cc     | 19 -------------------
 winsup/cygwin/devices.h      |  3 ---
 winsup/cygwin/devices.shilka |  5 -----
 winsup/cygwin/dtable.cc      |  1 -
 winsup/cygwin/path.cc        |  3 ---
 5 files changed, 31 deletions(-)

diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc
index ce2176ec7f..feaf8f0bfb 100644
--- a/winsup/cygwin/devices.cc
+++ b/winsup/cygwin/devices.cc
@@ -210,9 +210,6 @@ const device dev_sdy_storage =
 const device dev_sdz_storage =
 {"/dev/sdz", FH_SDZ, "\\Device\\Harddisk%d\\Partition%d", 1, 15, 400};
 
-const device dev_rawdrive_storage =
-{"/dev/rawdrive", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0};
-
 const device dev_bad_storage =
 {":bad:", FH_BAD, ":bad:", 0, 0, 0, 0};
 #define bad_dev (&dev_bad_storage)
@@ -225,7 +222,6 @@ const device *unit_devices[] =
   &dev_ttys_storage,
   &dev_floppy_storage,
   &dev_tcp_storage,
-  &dev_rawdrive_storage,
   &dev_tape_storage
 };
 
@@ -1137,21 +1133,6 @@ return	NULL;
 
 }
         }
-    case 13:
-          if (strncmp (KR_keyword, "/dev/rawdrive", 13) == 0)
-            {
-{
-return &dev_rawdrive_storage;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
     case 14:
           if (strncmp (KR_keyword, "/dev/clipboard", 14) == 0)
             {
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h
index d133c8fa5d..1dd6346e14 100644
--- a/winsup/cygwin/devices.h
+++ b/winsup/cygwin/devices.h
@@ -105,9 +105,6 @@ enum fh_devices
   FH_CYGDRIVE_A= FHDEV (DEV_CYGDRIVE_MAJOR, 'a'),
   FH_CYGDRIVE_Z= FHDEV (DEV_CYGDRIVE_MAJOR, 'z'),
 
-  DEV_RAWDRIVE_MAJOR = 66,
-  FH_RAWDRIVE= FHDEV (DEV_RAWDRIVE_MAJOR, 0),
-
   DEV_TCP_MAJOR = 30,
   FH_TCP = FHDEV (DEV_TCP_MAJOR, 36),
   FH_UDP = FHDEV (DEV_TCP_MAJOR, 39),
diff --git a/winsup/cygwin/devices.shilka b/winsup/cygwin/devices.shilka
index b7f1dfdf58..7ce4db81f5 100644
--- a/winsup/cygwin/devices.shilka
+++ b/winsup/cygwin/devices.shilka
@@ -207,9 +207,6 @@ const device dev_sdy_storage =
 const device dev_sdz_storage =
 {"/dev/sdz", FH_SDZ, "\\Device\\Harddisk%d\\Partition%d", 1, 15, 400};
 
-const device dev_rawdrive_storage =
-{"/dev/rawdrive", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0};
-
 const device dev_bad_storage =
 {":bad:", FH_BAD, ":bad:", 0, 0, 0, 0};
 #define bad_dev (&dev_bad_storage)
@@ -222,7 +219,6 @@ const device *unit_devices[] =
   &dev_ttys_storage,
   &dev_floppy_storage,
   &dev_tcp_storage,
-  &dev_rawdrive_storage,
   &dev_tape_storage
 };
 
@@ -308,7 +304,6 @@ const device *uniq_devices[] =
 "/dev/sdx" = sdx	{return &dev_sdx_storage;}
 "/dev/sdy" = sdy	{return &dev_sdy_storage;}
 "/dev/sdz" = sdz	{return &dev_sdz_storage;}
-"/dev/rawdrive" = rawdrive	{return &dev_rawdrive_storage;}
 %other	{return	NULL;}
 %%
 void
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 48b3d3001a..bf6cb237b4 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -346,7 +346,6 @@ build_fh_pc (path_conv& pc)
       case DEV_FLOPPY_MAJOR:
       case DEV_CDROM_MAJOR:
       case DEV_SD_MAJOR:
-      case DEV_RAWDRIVE_MAJOR:
 	fh = cnew (fhandler_dev_floppy) ();
 	break;
       case DEV_TAPE_MAJOR:
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 92fb00d9f2..8850823dbe 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -908,9 +908,6 @@ win32_device_name (const char *src_path, char *win32_path, device& dev)
       case DEV_TAPE_MAJOR:
 	__small_sprintf (win32_path, dev.fmt, dev.minor % 128);
 	break;
-      case DEV_RAWDRIVE_MAJOR:
-	__small_sprintf (win32_path, dev.fmt, dev.minor + 'A');
-	break;
       case DEV_SD_MAJOR:
 	__small_sprintf (win32_path, dev.fmt, dev.minor / 16, dev.minor % 16);
 	break;
-- 
2.11.0