From f49e572bbeb65f146b22303c87492d61786b8f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= Date: Wed, 8 Dec 1999 09:51:00 +0000 Subject: [PATCH] Remove sysinstall knowledge of the wd based devices.. --- release/sysinstall/devices.c | 6 ------ usr.sbin/sade/devices.c | 6 ------ usr.sbin/sysinstall/devices.c | 6 ------ 3 files changed, 18 deletions(-) diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index e9f269476f21..d1b2d9d507b4 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -68,20 +68,15 @@ static struct _devname { #ifdef notdef { DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 17, 0, 8, 4, 'b' }, #endif - { DEVICE_TYPE_CDROM, "wcd%dc", "ATAPI IDE CDROM", 19, 2, 8, 4, 'b' }, { DEVICE_TYPE_CDROM, "acd%dc", "ATAPI/IDE CDROM", 31, 2, 8, 4, 'b' }, { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4, 'c' }, { DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4, 'c' }, { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 4, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rda%d", "SCSI disk device", 13, 65538, 8, 16, 'c' }, - { DEVICE_TYPE_DISK, "wd%d", "IDE/ESDI/MFM/ST506 disk device", 0, 65538, 8, 16, 'b' }, - { DEVICE_TYPE_DISK, "rwd%d", "IDE/ESDI/MFM/ST506 disk device", 3, 65538, 8, 16, 'c' }, { DEVICE_TYPE_DISK, "ad%d", "ATA/IDE disk device", 30, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rad%d", "ATA/IDE disk device", 116, 65538, 8, 16, 'c' }, { DEVICE_TYPE_DISK, "fla%d", "M-Systems DiskOnChip Flash device", 28, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rfla%d", "M-Systems DiskOnChip Flash devicee", 102, 65538, 8, 16, 'c' }, - { DEVICE_TYPE_DISK, "wfd%d", "ATAPI floppy device", 1, 65538, 8, 4, 'b' }, - { DEVICE_TYPE_DISK, "rwfd%d", "ATAPI floppy device", 87, 65538, 8, 4, 'c' }, { DEVICE_TYPE_DISK, "afd%d", "ATAPI/IDE floppy device", 32, 65538, 8, 4, 'b' }, { DEVICE_TYPE_DISK, "rafd%d", "ATAPI/IDE floppy device", 118, 65538, 8, 4, 'c' }, { DEVICE_TYPE_DISK, "mlxd%d", "Mylex RAID disk", 27, 65538, 8, 4, 'b' }, @@ -89,7 +84,6 @@ static struct _devname { { DEVICE_TYPE_DISK, "amrd%d", "AMI MegaRAID drive", 35, 65538, 8, 4, 'b' }, { DEVICE_TYPE_DISK, "ramrd%d", "AMI MegaRAID drive", 133, 65538, 8, 4, 'c' }, { DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' }, - { DEVICE_TYPE_FLOPPY, "wfd%d", "ATAPI floppy drive unit A", 1, 0, 8, 4, 'b' }, { DEVICE_TYPE_FLOPPY, "worm%d", "SCSI optical disk / CDR", 23, 0, 1, 4, 'b' }, { DEVICE_TYPE_NETWORK, "fpa", "DEC DEFPA PCI FDDI card" }, { DEVICE_TYPE_NETWORK, "sr", "SDL T1/E1 sync serial PCI card" }, diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index e9f269476f21..d1b2d9d507b4 100644 --- a/usr.sbin/sade/devices.c +++ b/usr.sbin/sade/devices.c @@ -68,20 +68,15 @@ static struct _devname { #ifdef notdef { DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 17, 0, 8, 4, 'b' }, #endif - { DEVICE_TYPE_CDROM, "wcd%dc", "ATAPI IDE CDROM", 19, 2, 8, 4, 'b' }, { DEVICE_TYPE_CDROM, "acd%dc", "ATAPI/IDE CDROM", 31, 2, 8, 4, 'b' }, { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4, 'c' }, { DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4, 'c' }, { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 4, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rda%d", "SCSI disk device", 13, 65538, 8, 16, 'c' }, - { DEVICE_TYPE_DISK, "wd%d", "IDE/ESDI/MFM/ST506 disk device", 0, 65538, 8, 16, 'b' }, - { DEVICE_TYPE_DISK, "rwd%d", "IDE/ESDI/MFM/ST506 disk device", 3, 65538, 8, 16, 'c' }, { DEVICE_TYPE_DISK, "ad%d", "ATA/IDE disk device", 30, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rad%d", "ATA/IDE disk device", 116, 65538, 8, 16, 'c' }, { DEVICE_TYPE_DISK, "fla%d", "M-Systems DiskOnChip Flash device", 28, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rfla%d", "M-Systems DiskOnChip Flash devicee", 102, 65538, 8, 16, 'c' }, - { DEVICE_TYPE_DISK, "wfd%d", "ATAPI floppy device", 1, 65538, 8, 4, 'b' }, - { DEVICE_TYPE_DISK, "rwfd%d", "ATAPI floppy device", 87, 65538, 8, 4, 'c' }, { DEVICE_TYPE_DISK, "afd%d", "ATAPI/IDE floppy device", 32, 65538, 8, 4, 'b' }, { DEVICE_TYPE_DISK, "rafd%d", "ATAPI/IDE floppy device", 118, 65538, 8, 4, 'c' }, { DEVICE_TYPE_DISK, "mlxd%d", "Mylex RAID disk", 27, 65538, 8, 4, 'b' }, @@ -89,7 +84,6 @@ static struct _devname { { DEVICE_TYPE_DISK, "amrd%d", "AMI MegaRAID drive", 35, 65538, 8, 4, 'b' }, { DEVICE_TYPE_DISK, "ramrd%d", "AMI MegaRAID drive", 133, 65538, 8, 4, 'c' }, { DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' }, - { DEVICE_TYPE_FLOPPY, "wfd%d", "ATAPI floppy drive unit A", 1, 0, 8, 4, 'b' }, { DEVICE_TYPE_FLOPPY, "worm%d", "SCSI optical disk / CDR", 23, 0, 1, 4, 'b' }, { DEVICE_TYPE_NETWORK, "fpa", "DEC DEFPA PCI FDDI card" }, { DEVICE_TYPE_NETWORK, "sr", "SDL T1/E1 sync serial PCI card" }, diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index e9f269476f21..d1b2d9d507b4 100644 --- a/usr.sbin/sysinstall/devices.c +++ b/usr.sbin/sysinstall/devices.c @@ -68,20 +68,15 @@ static struct _devname { #ifdef notdef { DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 17, 0, 8, 4, 'b' }, #endif - { DEVICE_TYPE_CDROM, "wcd%dc", "ATAPI IDE CDROM", 19, 2, 8, 4, 'b' }, { DEVICE_TYPE_CDROM, "acd%dc", "ATAPI/IDE CDROM", 31, 2, 8, 4, 'b' }, { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4, 'c' }, { DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4, 'c' }, { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 4, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rda%d", "SCSI disk device", 13, 65538, 8, 16, 'c' }, - { DEVICE_TYPE_DISK, "wd%d", "IDE/ESDI/MFM/ST506 disk device", 0, 65538, 8, 16, 'b' }, - { DEVICE_TYPE_DISK, "rwd%d", "IDE/ESDI/MFM/ST506 disk device", 3, 65538, 8, 16, 'c' }, { DEVICE_TYPE_DISK, "ad%d", "ATA/IDE disk device", 30, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rad%d", "ATA/IDE disk device", 116, 65538, 8, 16, 'c' }, { DEVICE_TYPE_DISK, "fla%d", "M-Systems DiskOnChip Flash device", 28, 65538, 8, 16, 'b' }, { DEVICE_TYPE_DISK, "rfla%d", "M-Systems DiskOnChip Flash devicee", 102, 65538, 8, 16, 'c' }, - { DEVICE_TYPE_DISK, "wfd%d", "ATAPI floppy device", 1, 65538, 8, 4, 'b' }, - { DEVICE_TYPE_DISK, "rwfd%d", "ATAPI floppy device", 87, 65538, 8, 4, 'c' }, { DEVICE_TYPE_DISK, "afd%d", "ATAPI/IDE floppy device", 32, 65538, 8, 4, 'b' }, { DEVICE_TYPE_DISK, "rafd%d", "ATAPI/IDE floppy device", 118, 65538, 8, 4, 'c' }, { DEVICE_TYPE_DISK, "mlxd%d", "Mylex RAID disk", 27, 65538, 8, 4, 'b' }, @@ -89,7 +84,6 @@ static struct _devname { { DEVICE_TYPE_DISK, "amrd%d", "AMI MegaRAID drive", 35, 65538, 8, 4, 'b' }, { DEVICE_TYPE_DISK, "ramrd%d", "AMI MegaRAID drive", 133, 65538, 8, 4, 'c' }, { DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' }, - { DEVICE_TYPE_FLOPPY, "wfd%d", "ATAPI floppy drive unit A", 1, 0, 8, 4, 'b' }, { DEVICE_TYPE_FLOPPY, "worm%d", "SCSI optical disk / CDR", 23, 0, 1, 4, 'b' }, { DEVICE_TYPE_NETWORK, "fpa", "DEC DEFPA PCI FDDI card" }, { DEVICE_TYPE_NETWORK, "sr", "SDL T1/E1 sync serial PCI card" },