svn commit: r265126 - stable/4/lib/libdisk

[Devin Teske]

Author: dteske
Date: Wed Apr 30 04:24:21 2014
New Revision: 265126
URL: http://svnweb.freebsd.org/changeset/base/265126

Log:
  Teach libdisk about mfid devices. This is a direct commit to stable/4
  since stable/5 and newer have r105681 which made this code obsolete.

Modified:
  stable/4/lib/libdisk/create_chunk.c
  stable/4/lib/libdisk/disk.c

Modified: stable/4/lib/libdisk/create_chunk.c
==============================================================================
--- stable/4/lib/libdisk/create_chunk.c	Wed Apr 30 04:05:47 2014	(r265125)
+++ stable/4/lib/libdisk/create_chunk.c	Wed Apr 30 04:24:21 2014	(r265126)
@@ -304,6 +304,8 @@ MakeDev(struct chunk *c1, const char *pa
 	cmaj = 109, p += 4;
     else if (!strncmp(p, "ipsd", 4))
 	cmaj = 176, p += 4;
+    else if (!strncmp(p, "mfid", 4))
+	cmaj = 201, p += 4;
     else if (!strncmp(p, "mlxd", 4))
 	cmaj = 131, p += 4;
     else if (!strncmp(p, "amrd", 4))

Modified: stable/4/lib/libdisk/disk.c
==============================================================================
--- stable/4/lib/libdisk/disk.c	Wed Apr 30 04:05:47 2014	(r265125)
+++ stable/4/lib/libdisk/disk.c	Wed Apr 30 04:24:21 2014	(r265126)
@@ -486,9 +486,9 @@ Collapse_Disk(struct disk *d)
 #endif
 
 #ifdef PC98
-static char * device_list[] = {"wd", "aacd", "ad", "da", "afd", "fla", "idad", "mlxd", "amrd", "twed", "ar", "fd", 0};
+static char * device_list[] = {"wd", "aacd", "ad", "da", "afd", "fla", "idad", "mfid", "mlxd", "amrd", "twed", "ar", "fd", 0};
 #else
-static char * device_list[] = {"aacd", "ad", "da", "afd", "fla", "idad", "ipsd", "mlxd", "amrd", "twed", "ar", "fd", 0};
+static char * device_list[] = {"aacd", "ad", "da", "afd", "fla", "idad", "ipsd", "mfid", "mlxd", "amrd", "twed", "ar", "fd", 0};
 #endif
 
 int qstrcmp(const void* a, const void* b) {