Merge from -stable; support for the 'ida' driver, move fla to major 102

This commit is contained in:
Mike Smith 1999-07-05 09:43:29 +00:00
parent 6af3ef182b
commit d84c9e2a65
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=48585
2 changed files with 6 additions and 4 deletions

View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: create_chunk.c,v 1.35 1999/05/04 22:44:47 msmith Exp $
* $Id: create_chunk.c,v 1.36 1999/05/12 23:50:50 msmith Exp $
*
*/
@ -267,7 +267,9 @@ MakeDev(struct chunk *c1, const char *path)
else if (!strncmp(p, "wfd", 3))
bmaj = 1, cmaj = 87, p += 3;
else if (!strncmp(p, "fla", 3))
bmaj = 28, cmaj = 101, p += 3;
bmaj = 28, cmaj = 102, p += 3;
else if (!strncmp(p, "ida", 3))
bmaj = 29, cmaj = 109, p += 3;
else if (!strncmp(p, "da", 2)) /* CAM support */
bmaj = 4, cmaj = 13, p += 2;
else {

View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: disk.c,v 1.43 1999/05/08 21:21:50 dfr Exp $
* $Id: disk.c,v 1.44 1999/05/09 11:34:56 dfr Exp $
*
*/
@ -375,7 +375,7 @@ Collapse_Disk(struct disk *d)
}
#endif
static char * device_list[] = {"wd", "ad", "sd", "da", "wfd", "fla", 0};
static char * device_list[] = {"wd", "ad", "sd", "da", "wfd", "fla", "ida", 0};
char **
Disk_Names()