Rewert the atapi CDROM driver's name to wcd.

This is to avoid confusion with the new system.
Also provide real entires in MAKEDEV for the new system.

15 files changed, 202 insertions, 166 deletions

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 7d0fa40..d375bf0 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -121,7 +121,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.191 1999/03/02 16:04:27 roger Exp $
+#	$Id: MAKEDEV,v 1.192 1999/03/05 23:08:45 gibbs Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -211,7 +211,7 @@ all)
 	sh MAKEDEV od0					# bdev, optical disk
 	sh MAKEDEV wfd0					# bdev, LS-120 floppy
 	sh MAKEDEV vn0					# bdev, virtual disk
-	sh MAKEDEV cd0 matcd0 mcd0 scd0 acd0		# bdev, cdrom
+	sh MAKEDEV cd0 matcd0 mcd0 scd0 wcd0		# bdev, cdrom
 	sh MAKEDEV ft0 sa0 wt0 wst0			# bdev, tape
 	sh MAKEDEV vty4					# cdev, virtual tty
 	sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3		# cdev, serial tty
@@ -290,9 +290,11 @@ wt*)
 	;;
 
 # Individual slices.
-od*s*|sd*s*|da*s*|vn*s*|wd*s*|wfd*s*|fla*s*)
+ad*s*|od*s*|sd*s*|da*s*|vn*s*|wd*s*|afd*s*|wfd*s*|fla*s*)
 	umask $disk_umask
 	case $i in
+	ad*s*) name=ad; blk=30; chr=116;;
+	afd*s*) name=afd; blk=32; chr=118;;
 	fla*s*) name=fla; blk=28; chr=101;;
 	od*s*) name=od; blk=4;  chr=13;;
 	sd*s*) name=sd; blk=4;  chr=13;;
@@ -302,7 +304,7 @@ od*s*|sd*s*|da*s*|vn*s*|wd*s*|wfd*s*|fla*s*)
 	wfd*s*) name=wfd; blk=1; chr=87;;
 	esac
 	case $i in
-	fla*s*|wfd*s*)
+	afd*s*|fla*s*|wfd*s*)
 		unit=`expr $i : '...\([0-9]*\)s'`
 		slice=`expr $i : '...[0-9]*s\([0-9]*\)'`
 		part=`expr $i : '...[0-9]*s[0-9]*\(.*\)'`
@@ -461,9 +463,11 @@ ft*)
 	umask 77
 	;;
 
-sd*|od*|da*|vn*|wd*|wfd*|fla*)
+ad*|sd*|od*|da*|vn*|wd*|afd*|wfd*|fla*)
 	umask $disk_umask
 	case $i in
+	ad*) name=ad; blk=30; chr=116;;
+	afd*) name=afd; blk=32; chr=118;;
 	fla*) name=fla; blk=28; chr=101;;
 	sd*) name=sd; blk=4; chr=13;;
 	od*) name=od; blk=4; chr=13;;
@@ -473,7 +477,7 @@ sd*|od*|da*|vn*|wd*|wfd*|fla*)
 	wfd*) name=wfd; blk=1; chr=87;;
 	esac
 	case $i in
-	fla*|wfd*)
+	afd*|fla*|wfd*)
 		unit=`expr $i : '...\(.*\)'`
 		;;
 	*)
@@ -659,9 +663,27 @@ ch*)
 	umask 77
 	;;
 
-cd*|mcd*|scd*)
+ast*)
+	umask 2 ;
+	unit=`expr $i : '...\(.*\)'`
+	chr=119
+	case $unit in
+	0|1|2|3)
+		mknod rast${unit} c $chr `expr $unit '*' 8 + 0`
+		chgrp operator rast${unit}
+		chmod 640 rast${unit}
+		;;
+	*)
+		echo bad unit for tape in: $i
+		;;
+	esac
+	umask 77
+	;;
+
+acd*|cd*|mcd*|scd*)
 	umask $disk_umask
 	case $i in
+	acd*) units=`expr $i : '...\(.*\)'`; name=acd; blk=31; chr=117;;
 	cd*) units=`expr $i : '..\(.*\)'`; name=cd; blk=6; chr=15;;
 	mcd*) units=`expr $i : '...\(.*\)'`; name=mcd; blk=7; chr=29;;
 	scd*) units=`expr $i : '...\(.*\)'`; name=scd; blk=16; chr=45;;
@@ -720,23 +742,19 @@ matcd*)
 	umask 77
 	;;
 
-acd?|wcd?)
+wcd?)
 	umask 2 ;
 	unit=`expr $i : '...\(.*\)'`
 	blk=19
 	chr=69
 	case $unit in
 	0|1|2|3|4|5|6|7)
-		mknod acd${unit}a  b $blk `expr $unit '*' 8 + 0`
-		ln -fs acd${unit}a wcd${unit}a 
-		mknod racd${unit}a c $chr `expr $unit '*' 8 + 0`
-		ln -fs racd${unit}a rwcd${unit}a
-		mknod acd${unit}c  b $blk `expr $unit '*' 8 + 2`
-		ln -fs acd${unit}c wcd${unit}c
-		mknod racd${unit}c c $chr `expr $unit '*' 8 + 2`
-		ln -fs racd${unit}c rwcd${unit}c
-		chgrp operator acd${unit}[a-h] racd${unit}[a-h]
-		chmod 640 acd${unit}[a-h] racd${unit}[a-h]
+		mknod wcd${unit}a  b $blk `expr $unit '*' 8 + 0`
+		mknod rwcd${unit}a c $chr `expr $unit '*' 8 + 0`
+		mknod wcd${unit}c  b $blk `expr $unit '*' 8 + 2`
+		mknod rwcd${unit}c c $chr `expr $unit '*' 8 + 2`
+		chgrp operator wcd${unit}[a-h] rwcd${unit}[a-h]
+		chmod 640 wcd${unit}[a-h] rwcd${unit}[a-h]
 		;;
 	*)
 		echo bad unit for disk in: $i
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 7d0fa40..d375bf0 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -121,7 +121,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.191 1999/03/02 16:04:27 roger Exp $
+#	$Id: MAKEDEV,v 1.192 1999/03/05 23:08:45 gibbs Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -211,7 +211,7 @@ all)
 	sh MAKEDEV od0					# bdev, optical disk
 	sh MAKEDEV wfd0					# bdev, LS-120 floppy
 	sh MAKEDEV vn0					# bdev, virtual disk
-	sh MAKEDEV cd0 matcd0 mcd0 scd0 acd0		# bdev, cdrom
+	sh MAKEDEV cd0 matcd0 mcd0 scd0 wcd0		# bdev, cdrom
 	sh MAKEDEV ft0 sa0 wt0 wst0			# bdev, tape
 	sh MAKEDEV vty4					# cdev, virtual tty
 	sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3		# cdev, serial tty
@@ -290,9 +290,11 @@ wt*)
 	;;
 
 # Individual slices.
-od*s*|sd*s*|da*s*|vn*s*|wd*s*|wfd*s*|fla*s*)
+ad*s*|od*s*|sd*s*|da*s*|vn*s*|wd*s*|afd*s*|wfd*s*|fla*s*)
 	umask $disk_umask
 	case $i in
+	ad*s*) name=ad; blk=30; chr=116;;
+	afd*s*) name=afd; blk=32; chr=118;;
 	fla*s*) name=fla; blk=28; chr=101;;
 	od*s*) name=od; blk=4;  chr=13;;
 	sd*s*) name=sd; blk=4;  chr=13;;
@@ -302,7 +304,7 @@ od*s*|sd*s*|da*s*|vn*s*|wd*s*|wfd*s*|fla*s*)
 	wfd*s*) name=wfd; blk=1; chr=87;;
 	esac
 	case $i in
-	fla*s*|wfd*s*)
+	afd*s*|fla*s*|wfd*s*)
 		unit=`expr $i : '...\([0-9]*\)s'`
 		slice=`expr $i : '...[0-9]*s\([0-9]*\)'`
 		part=`expr $i : '...[0-9]*s[0-9]*\(.*\)'`
@@ -461,9 +463,11 @@ ft*)
 	umask 77
 	;;
 
-sd*|od*|da*|vn*|wd*|wfd*|fla*)
+ad*|sd*|od*|da*|vn*|wd*|afd*|wfd*|fla*)
 	umask $disk_umask
 	case $i in
+	ad*) name=ad; blk=30; chr=116;;
+	afd*) name=afd; blk=32; chr=118;;
 	fla*) name=fla; blk=28; chr=101;;
 	sd*) name=sd; blk=4; chr=13;;
 	od*) name=od; blk=4; chr=13;;
@@ -473,7 +477,7 @@ sd*|od*|da*|vn*|wd*|wfd*|fla*)
 	wfd*) name=wfd; blk=1; chr=87;;
 	esac
 	case $i in
-	fla*|wfd*)
+	afd*|fla*|wfd*)
 		unit=`expr $i : '...\(.*\)'`
 		;;
 	*)
@@ -659,9 +663,27 @@ ch*)
 	umask 77
 	;;
 
-cd*|mcd*|scd*)
+ast*)
+	umask 2 ;
+	unit=`expr $i : '...\(.*\)'`
+	chr=119
+	case $unit in
+	0|1|2|3)
+		mknod rast${unit} c $chr `expr $unit '*' 8 + 0`
+		chgrp operator rast${unit}
+		chmod 640 rast${unit}
+		;;
+	*)
+		echo bad unit for tape in: $i
+		;;
+	esac
+	umask 77
+	;;
+
+acd*|cd*|mcd*|scd*)
 	umask $disk_umask
 	case $i in
+	acd*) units=`expr $i : '...\(.*\)'`; name=acd; blk=31; chr=117;;
 	cd*) units=`expr $i : '..\(.*\)'`; name=cd; blk=6; chr=15;;
 	mcd*) units=`expr $i : '...\(.*\)'`; name=mcd; blk=7; chr=29;;
 	scd*) units=`expr $i : '...\(.*\)'`; name=scd; blk=16; chr=45;;
@@ -720,23 +742,19 @@ matcd*)
 	umask 77
 	;;
 
-acd?|wcd?)
+wcd?)
 	umask 2 ;
 	unit=`expr $i : '...\(.*\)'`
 	blk=19
 	chr=69
 	case $unit in
 	0|1|2|3|4|5|6|7)
-		mknod acd${unit}a  b $blk `expr $unit '*' 8 + 0`
-		ln -fs acd${unit}a wcd${unit}a 
-		mknod racd${unit}a c $chr `expr $unit '*' 8 + 0`
-		ln -fs racd${unit}a rwcd${unit}a
-		mknod acd${unit}c  b $blk `expr $unit '*' 8 + 2`
-		ln -fs acd${unit}c wcd${unit}c
-		mknod racd${unit}c c $chr `expr $unit '*' 8 + 2`
-		ln -fs racd${unit}c rwcd${unit}c
-		chgrp operator acd${unit}[a-h] racd${unit}[a-h]
-		chmod 640 acd${unit}[a-h] racd${unit}[a-h]
+		mknod wcd${unit}a  b $blk `expr $unit '*' 8 + 0`
+		mknod rwcd${unit}a c $chr `expr $unit '*' 8 + 0`
+		mknod wcd${unit}c  b $blk `expr $unit '*' 8 + 2`
+		mknod rwcd${unit}c c $chr `expr $unit '*' 8 + 2`
+		chgrp operator wcd${unit}[a-h] rwcd${unit}[a-h]
+		chmod 640 wcd${unit}[a-h] rwcd${unit}[a-h]
 		;;
 	*)
 		echo bad unit for disk in: $i
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index f0de16a..4a1b117 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.153 1999/02/20 23:29:24 n_hibma Exp $
+#	$Id: GENERIC,v 1.154 1999/02/21 16:23:22 n_hibma Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -71,7 +71,7 @@ disk		wd3	at wdc1 drive 1
 
 options		ATAPI		#Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		acd0		#IDE CD-ROM
+device		wcd0		#IDE CD-ROM
 device		wfd0		#IDE Floppy (e.g. LS-120)
 
 # A single entry for any of these controllers (ncr, ahb, ahc) is
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f09d3fb..f54bb4a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.566 1999/03/13 06:32:06 grog Exp $
+#	$Id: LINT,v 1.567 1999/03/13 13:20:59 joerg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1118,7 +1118,7 @@ options		ATAPI_STATIC	#Don't do it as an LKM
 options		IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller and ATAPI option
-device          acd0
+device          wcd0
 
 # IDE floppy driver - requires wdc controller and ATAPI option
 device          wfd0
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 3fe59ba..000b019 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.227 1999/03/10 10:11:41 julian Exp $
+#	$Id: files.i386,v 1.228 1999/03/10 10:36:29 yokota Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -275,7 +275,7 @@ i386/isa/tw.c			optional	tw	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
 i386/isa/atapi.c		optional	atapi	device-driver
-i386/isa/atapi-cd.c		optional	acd	device-driver
+i386/isa/atapi-cd.c		optional	wcd	device-driver
 i386/isa/wfd.c			optional	wfd	device-driver
 i386/isa/wst.c			optional	wst	device-driver
 i386/isa/wt.c			optional	wt	device-driver
diff --git a/sys/conf/majors b/sys/conf/majors
index 4e6e3d0..8ab723e 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.66 1999/03/08 23:31:04 jkh Exp $
+$Id: majors.i386,v 1.67 1999/03/16 12:50:02 sos Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -32,7 +32,7 @@ blkdev	name		comments
 16	scd		Sony CDROM interface
 17	matcd		Matsushita/Panasonic/Creative(SB) CDROM interface
 18	ata		"device independent" ATA/IDE driver
-19	acdb		ATAPI CDROM client of "wd"
+19	wcdb		ATAPI CDROM client of "wd"
 20	??		ATA disks
 21	ccd		concatenated disk
 22	gd		Geometry disk.
@@ -119,7 +119,7 @@ chrdev	name		comments
 66	labpc		National Instruments LabPC
 67	meteor		Matrox Meteor video capture
 68	si		Specialix SI/XIO (peter@freebsd.org)
-69	acd		ATAPI CDROM client of "wd"
+69	wcd		ATAPI CDROM client of "wd"
 71	asc		AmiScan driver
 72	stl		Stallion (cd1400 based) (gerg@stallion.oz.au)
 73	??		was qcam
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index f0de16a..4a1b117 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.153 1999/02/20 23:29:24 n_hibma Exp $
+#	$Id: GENERIC,v 1.154 1999/02/21 16:23:22 n_hibma Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -71,7 +71,7 @@ disk		wd3	at wdc1 drive 1
 
 options		ATAPI		#Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		acd0		#IDE CD-ROM
+device		wcd0		#IDE CD-ROM
 device		wfd0		#IDE Floppy (e.g. LS-120)
 
 # A single entry for any of these controllers (ncr, ahb, ahc) is
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index f09d3fb..f54bb4a 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.566 1999/03/13 06:32:06 grog Exp $
+#	$Id: LINT,v 1.567 1999/03/13 13:20:59 joerg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1118,7 +1118,7 @@ options		ATAPI_STATIC	#Don't do it as an LKM
 options		IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller and ATAPI option
-device          acd0
+device          wcd0
 
 # IDE floppy driver - requires wdc controller and ATAPI option
 device          wfd0
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f09d3fb..f54bb4a 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.566 1999/03/13 06:32:06 grog Exp $
+#	$Id: LINT,v 1.567 1999/03/13 13:20:59 joerg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1118,7 +1118,7 @@ options		ATAPI_STATIC	#Don't do it as an LKM
 options		IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller and ATAPI option
-device          acd0
+device          wcd0
 
 # IDE floppy driver - requires wdc controller and ATAPI option
 device          wfd0
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 3fe59ba..000b019 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.227 1999/03/10 10:11:41 julian Exp $
+#	$Id: files.i386,v 1.228 1999/03/10 10:36:29 yokota Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -275,7 +275,7 @@ i386/isa/tw.c			optional	tw	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
 i386/isa/atapi.c		optional	atapi	device-driver
-i386/isa/atapi-cd.c		optional	acd	device-driver
+i386/isa/atapi-cd.c		optional	wcd	device-driver
 i386/isa/wfd.c			optional	wfd	device-driver
 i386/isa/wst.c			optional	wst	device-driver
 i386/isa/wt.c			optional	wt	device-driver
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 4e6e3d0..8ab723e 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.66 1999/03/08 23:31:04 jkh Exp $
+$Id: majors.i386,v 1.67 1999/03/16 12:50:02 sos Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -32,7 +32,7 @@ blkdev	name		comments
 16	scd		Sony CDROM interface
 17	matcd		Matsushita/Panasonic/Creative(SB) CDROM interface
 18	ata		"device independent" ATA/IDE driver
-19	acdb		ATAPI CDROM client of "wd"
+19	wcdb		ATAPI CDROM client of "wd"
 20	??		ATA disks
 21	ccd		concatenated disk
 22	gd		Geometry disk.
@@ -119,7 +119,7 @@ chrdev	name		comments
 66	labpc		National Instruments LabPC
 67	meteor		Matrox Meteor video capture
 68	si		Specialix SI/XIO (peter@freebsd.org)
-69	acd		ATAPI CDROM client of "wd"
+69	wcd		ATAPI CDROM client of "wd"
 71	asc		AmiScan driver
 72	stl		Stallion (cd1400 based) (gerg@stallion.oz.au)
 73	??		was qcam
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index b716e69..31033d2 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.c
@@ -25,15 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.10 1999/01/31 23:08:47 sos Exp $
+ *	$Id: atapi-cd.c,v 1.11 1999/02/10 00:03:32 ken Exp $
  */
 
 #include "wdc.h"
-#include "acd.h"
+#include "wcd.h"
 #include "opt_atapi.h"
 #include "opt_devfs.h"
 
-#if NACD > 0 && NWDC > 0 && defined(ATAPI)
+#if NWCD > 0 && NWDC > 0 && defined(ATAPI)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,7 @@ static d_strategy_t	acdstrategy;
 static struct cdevsw acd_cdevsw = {
     acdopen,	acdclose,	acdread,	acdwrite,	
     acdioctl,	nostop,		nullreset,	nodevtotty,
-    seltrue,	nommap,		acdstrategy,	"acd",
+    seltrue,	nommap,		acdstrategy,	"wcd",
     NULL,	-1,		nodump,		nopsize,
     D_DISK,	0,		-1
 };
@@ -141,19 +141,19 @@ acd_init_lun(struct atapi *ata, int unit, struct atapi_params *ap, int lun,
     ptr->ra_devfs_token =
         devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0),
         DV_CHR, UID_ROOT, GID_OPERATOR, 0640,
-        "racd%da", lun);
+        "rwcd%da", lun);
     ptr->rc_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
         DV_CHR, UID_ROOT, GID_OPERATOR, 0640,
-        "racd%dc", lun);
+        "rwcd%dc", lun);
     ptr->a_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, 0),
         DV_BLK, UID_ROOT, GID_OPERATOR, 0640,
-        "acd%da", lun);
+        "wcd%da", lun);
     ptr->c_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
         DV_BLK, UID_ROOT, GID_OPERATOR, 0640,
-        "acd%dc", lun);
+        "wcd%dc", lun);
 #endif
     return ptr;
 }
@@ -170,15 +170,15 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
     int i, count;
 
     if (acdnlun >= NUNIT) {
-        printf("acd: too many units\n");
+        printf("wcd: too many units\n");
         return 0;
     }
     if (!atapi_request_immediate) {
-        printf("acd: configuration error, ATAPI code not present!\n");
+        printf("wcd: configuration error, ATAPI code not present!\n");
         return 0;
     }
     if ((cdp = acd_init_lun(ata, unit, ap, acdnlun, NULL)) == NULL) {
-        printf("acd: out of memory\n");
+        printf("wcd: out of memory\n");
         return 0;
     }
     acdtab[acdnlun] = cdp;
@@ -222,7 +222,7 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
 
         chp = malloc(sizeof(struct changer), M_TEMP, M_NOWAIT);
         if (chp == NULL) {
-            printf("acd: out of memory\n");
+            printf("wcd: out of memory\n");
             return 0;
         }
         bzero(chp, sizeof(struct changer));
@@ -247,22 +247,22 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
                     tmpcdp = acd_init_lun(ata, unit, ap, acdnlun, 
 					  cdp->device_stats);
 		    if (!tmpcdp) {
-                        printf("acd: out of memory\n");
+                        printf("wcd: out of memory\n");
                         return 0;
                     }
                 }
                 tmpcdp->slot = i;
                 tmpcdp->changer_info = chp;
-                printf("acd%d: changer slot %d %s\n", acdnlun, i,
+                printf("wcd%d: changer slot %d %s\n", acdnlun, i,
 		       (chp->slot[i].present ? "disk present" : "no disk"));
                 acdtab[acdnlun++] = tmpcdp;
             }
             if (acdnlun >= NUNIT) {
-                printf("acd: too many units\n");
+                printf("wcd: too many units\n");
                 return 0;
             }
         }
-	sprintf(string, "acd%d-", cdp->lun);
+	sprintf(string, "wcd%d-", cdp->lun);
         devstat_add_entry(cdp->device_stats, string, tmpcdp->lun, DEV_BSIZE,
                           DEVSTAT_NO_ORDERED_TAGS,
                           DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE,
@@ -270,7 +270,7 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
     }
     else {
         acdnlun++;
-        devstat_add_entry(cdp->device_stats, "acd", cdp->lun, DEV_BSIZE,
+        devstat_add_entry(cdp->device_stats, "wcd", cdp->lun, DEV_BSIZE,
                           DEVSTAT_NO_ORDERED_TAGS,
                           DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE,
 			  DEVSTAT_PRIORITY_WCD);
@@ -284,14 +284,14 @@ acd_describe(struct acd *cdp)
     int comma;
     char *mechanism;
 
-    printf("acd%d: drive speed ", cdp->lun);
+    printf("wcd%d: drive speed ", cdp->lun);
     if (cdp->cap.cur_speed != cdp->cap.max_speed)
         printf("%d - ", cdp->cap.cur_speed * 1000 / 1024);
     printf("%dKB/sec", cdp->cap.max_speed * 1000 / 1024);
     if (cdp->cap.buf_size)
         printf(", %dKB cache\n", cdp->cap.buf_size);
 
-    printf("acd%d: supported read types:", cdp->lun);
+    printf("wcd%d: supported read types:", cdp->lun);
     comma = 0;
     if (cdp->cap.read_cdr) {
         printf(" CD-R"); comma = 1;
@@ -305,7 +305,7 @@ acd_describe(struct acd *cdp)
     if (cdp->cap.method2)
         printf("%s packet track", comma ? "," : "");
     if (cdp->cap.write_cdr || cdp->cap.write_cdrw) {
-    	printf("\nacd%d: supported write types:", cdp->lun);
+    	printf("\nwcd%d: supported write types:", cdp->lun);
         comma = 0;
     	if (cdp->cap.write_cdr) {
             printf(" CD-R" ); comma = 1;
@@ -318,13 +318,13 @@ acd_describe(struct acd *cdp)
 	}
     }
     if (cdp->cap.audio_play) {
-    	printf("\nacd%d: Audio: ", cdp->lun);
+    	printf("\nwcd%d: Audio: ", cdp->lun);
     	if (cdp->cap.audio_play)
             printf("play");
     	if (cdp->cap.max_vol_levels)
             printf(", %d volume levels", cdp->cap.max_vol_levels);
     }
-    printf("\nacd%d: Mechanism: ", cdp->lun);
+    printf("\nwcd%d: Mechanism: ", cdp->lun);
     switch (cdp->cap.mech) {
     case MST_MECH_CADDY:
         mechanism = "caddy"; break;
@@ -345,7 +345,7 @@ acd_describe(struct acd *cdp)
         printf("ejectable");
 
     if (cdp->cap.mech != MST_MECH_CHANGER) {
-        printf("\nacd%d: Medium: ", cdp->lun);
+        printf("\nwcd%d: Medium: ", cdp->lun);
         switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) {
         case MST_CDROM:
             printf("CD-ROM "); break;
@@ -424,13 +424,13 @@ acdopen(dev_t dev, int flags, int fmt, struct proc *p)
         if ((flags & FWRITE) != 0) {
             /* read/write */
             if (acd_rezero_unit(cdp)) {
-                printf("acd%d: rezero failed\n", lun);
+                printf("wcd%d: rezero failed\n", lun);
                 return EIO;
             }
         } else {
             /* read only */
             if (acd_read_toc(cdp) != 0) {
-                printf("acd%d: read_toc failed\n", lun);
+                printf("wcd%d: read_toc failed\n", lun);
                 /* return EIO; */
             }
         }
@@ -535,7 +535,7 @@ acd_start(struct acd *cdp)
     if ((bp->b_flags & B_READ) == B_WRITE) {
         if ((cdp->flags & F_TRACK_PREPED) == 0) {
             if ((cdp->flags & F_TRACK_PREP) == 0) {
-                printf("acd%d: sequence error\n", cdp->lun);
+                printf("wcd%d: sequence error\n", cdp->lun);
                 bp->b_error = EIO;
                 bp->b_flags |= B_ERROR;
                 biodone(bp);
@@ -1064,7 +1064,7 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
                 error = EINVAL;
             else if ((cdp->flags & F_DISK_PREPED) == 0) {
                 error = EINVAL;
-                printf("acd%d: sequence error (PREP_TRACK)\n", cdp->lun);
+                printf("wcd%d: sequence error (PREP_TRACK)\n", cdp->lun);
             } else {
                 cdp->flags |= F_TRACK_PREP;
                 cdp->preptrack = *w;
@@ -1175,7 +1175,7 @@ acd_read_toc(struct acd *cdp)
 
     if (cdp->info.volsize && cdp->toc.hdr.ending_track
         && (cdp->flags & F_DEBUG)) {
-        printf("acd%d: ", cdp->lun);
+        printf("wcd%d: ", cdp->lun);
         if (cdp->toc.tab[0].control & 4)
             printf("%ldMB ", cdp->info.volsize / 512);
         else
@@ -1254,8 +1254,8 @@ acd_eject(struct acd *cdp, int close)
     if (close)
         return 0;
 
-    tsleep((caddr_t) &lbolt, PRIBIO, "acdej1", 0);
-    tsleep((caddr_t) &lbolt, PRIBIO, "acdej2", 0);
+    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej1", 0);
+    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej2", 0);
 
     acd_request_wait(cdp, ATAPI_PREVENT_ALLOW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
     cdp->flags &= ~F_LOCKED;
@@ -1524,7 +1524,7 @@ atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
 	printf ("\n");
 }
 
-#ifdef ACD_MODULE
+#ifdef WCD_MODULE
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
@@ -1596,7 +1596,7 @@ acd_mod(struct lkm_table *lkmtp, int cmd, int ver)
     return lkmdispatch(lkmtp, cmd);
 }
 
-#endif /* ACD_MODULE */
+#endif /* WCD_MODULE */
 
 static acd_devsw_installed = 0;
 
@@ -1610,4 +1610,4 @@ acd_drvinit(void *unused)
 }
 
 SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL)
-#endif /* NACD && NWDC && ATAPI */
+#endif /* NWCD && NWDC && ATAPI */
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index 9b3090d..4de4dee 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -103,7 +103,7 @@
 #include "opt_atapi.h"
 
 #ifndef ATAPI_MODULE
-# include "acd.h"
+# include "wcd.h"
 # include "wfd.h"
 # include "wst.h"
 /* # include "wmd.h" -- add your driver here */
@@ -293,7 +293,7 @@ int atapi_attach (int ctlr, int unit, int port)
 		}
 #endif
 	case AT_TYPE_CDROM:             /* CD-ROM device */
-#if NACD > 0
+#if NWCD > 0
 		/* ATAPI CD-ROM & CD-R/RW drives */
 		if (acdattach (ata, unit, ap, ata->debug) < 0)
 			break;
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index b716e69..31033d2 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.c
@@ -25,15 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.10 1999/01/31 23:08:47 sos Exp $
+ *	$Id: atapi-cd.c,v 1.11 1999/02/10 00:03:32 ken Exp $
  */
 
 #include "wdc.h"
-#include "acd.h"
+#include "wcd.h"
 #include "opt_atapi.h"
 #include "opt_devfs.h"
 
-#if NACD > 0 && NWDC > 0 && defined(ATAPI)
+#if NWCD > 0 && NWDC > 0 && defined(ATAPI)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,7 @@ static d_strategy_t	acdstrategy;
 static struct cdevsw acd_cdevsw = {
     acdopen,	acdclose,	acdread,	acdwrite,	
     acdioctl,	nostop,		nullreset,	nodevtotty,
-    seltrue,	nommap,		acdstrategy,	"acd",
+    seltrue,	nommap,		acdstrategy,	"wcd",
     NULL,	-1,		nodump,		nopsize,
     D_DISK,	0,		-1
 };
@@ -141,19 +141,19 @@ acd_init_lun(struct atapi *ata, int unit, struct atapi_params *ap, int lun,
     ptr->ra_devfs_token =
         devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0),
         DV_CHR, UID_ROOT, GID_OPERATOR, 0640,
-        "racd%da", lun);
+        "rwcd%da", lun);
     ptr->rc_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
         DV_CHR, UID_ROOT, GID_OPERATOR, 0640,
-        "racd%dc", lun);
+        "rwcd%dc", lun);
     ptr->a_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, 0),
         DV_BLK, UID_ROOT, GID_OPERATOR, 0640,
-        "acd%da", lun);
+        "wcd%da", lun);
     ptr->c_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
         DV_BLK, UID_ROOT, GID_OPERATOR, 0640,
-        "acd%dc", lun);
+        "wcd%dc", lun);
 #endif
     return ptr;
 }
@@ -170,15 +170,15 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
     int i, count;
 
     if (acdnlun >= NUNIT) {
-        printf("acd: too many units\n");
+        printf("wcd: too many units\n");
         return 0;
     }
     if (!atapi_request_immediate) {
-        printf("acd: configuration error, ATAPI code not present!\n");
+        printf("wcd: configuration error, ATAPI code not present!\n");
         return 0;
     }
     if ((cdp = acd_init_lun(ata, unit, ap, acdnlun, NULL)) == NULL) {
-        printf("acd: out of memory\n");
+        printf("wcd: out of memory\n");
         return 0;
     }
     acdtab[acdnlun] = cdp;
@@ -222,7 +222,7 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
 
         chp = malloc(sizeof(struct changer), M_TEMP, M_NOWAIT);
         if (chp == NULL) {
-            printf("acd: out of memory\n");
+            printf("wcd: out of memory\n");
             return 0;
         }
         bzero(chp, sizeof(struct changer));
@@ -247,22 +247,22 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
                     tmpcdp = acd_init_lun(ata, unit, ap, acdnlun, 
 					  cdp->device_stats);
 		    if (!tmpcdp) {
-                        printf("acd: out of memory\n");
+                        printf("wcd: out of memory\n");
                         return 0;
                     }
                 }
                 tmpcdp->slot = i;
                 tmpcdp->changer_info = chp;
-                printf("acd%d: changer slot %d %s\n", acdnlun, i,
+                printf("wcd%d: changer slot %d %s\n", acdnlun, i,
 		       (chp->slot[i].present ? "disk present" : "no disk"));
                 acdtab[acdnlun++] = tmpcdp;
             }
             if (acdnlun >= NUNIT) {
-                printf("acd: too many units\n");
+                printf("wcd: too many units\n");
                 return 0;
             }
         }
-	sprintf(string, "acd%d-", cdp->lun);
+	sprintf(string, "wcd%d-", cdp->lun);
         devstat_add_entry(cdp->device_stats, string, tmpcdp->lun, DEV_BSIZE,
                           DEVSTAT_NO_ORDERED_TAGS,
                           DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE,
@@ -270,7 +270,7 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
     }
     else {
         acdnlun++;
-        devstat_add_entry(cdp->device_stats, "acd", cdp->lun, DEV_BSIZE,
+        devstat_add_entry(cdp->device_stats, "wcd", cdp->lun, DEV_BSIZE,
                           DEVSTAT_NO_ORDERED_TAGS,
                           DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE,
 			  DEVSTAT_PRIORITY_WCD);
@@ -284,14 +284,14 @@ acd_describe(struct acd *cdp)
     int comma;
     char *mechanism;
 
-    printf("acd%d: drive speed ", cdp->lun);
+    printf("wcd%d: drive speed ", cdp->lun);
     if (cdp->cap.cur_speed != cdp->cap.max_speed)
         printf("%d - ", cdp->cap.cur_speed * 1000 / 1024);
     printf("%dKB/sec", cdp->cap.max_speed * 1000 / 1024);
     if (cdp->cap.buf_size)
         printf(", %dKB cache\n", cdp->cap.buf_size);
 
-    printf("acd%d: supported read types:", cdp->lun);
+    printf("wcd%d: supported read types:", cdp->lun);
     comma = 0;
     if (cdp->cap.read_cdr) {
         printf(" CD-R"); comma = 1;
@@ -305,7 +305,7 @@ acd_describe(struct acd *cdp)
     if (cdp->cap.method2)
         printf("%s packet track", comma ? "," : "");
     if (cdp->cap.write_cdr || cdp->cap.write_cdrw) {
-    	printf("\nacd%d: supported write types:", cdp->lun);
+    	printf("\nwcd%d: supported write types:", cdp->lun);
         comma = 0;
     	if (cdp->cap.write_cdr) {
             printf(" CD-R" ); comma = 1;
@@ -318,13 +318,13 @@ acd_describe(struct acd *cdp)
 	}
     }
     if (cdp->cap.audio_play) {
-    	printf("\nacd%d: Audio: ", cdp->lun);
+    	printf("\nwcd%d: Audio: ", cdp->lun);
     	if (cdp->cap.audio_play)
             printf("play");
     	if (cdp->cap.max_vol_levels)
             printf(", %d volume levels", cdp->cap.max_vol_levels);
     }
-    printf("\nacd%d: Mechanism: ", cdp->lun);
+    printf("\nwcd%d: Mechanism: ", cdp->lun);
     switch (cdp->cap.mech) {
     case MST_MECH_CADDY:
         mechanism = "caddy"; break;
@@ -345,7 +345,7 @@ acd_describe(struct acd *cdp)
         printf("ejectable");
 
     if (cdp->cap.mech != MST_MECH_CHANGER) {
-        printf("\nacd%d: Medium: ", cdp->lun);
+        printf("\nwcd%d: Medium: ", cdp->lun);
         switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) {
         case MST_CDROM:
             printf("CD-ROM "); break;
@@ -424,13 +424,13 @@ acdopen(dev_t dev, int flags, int fmt, struct proc *p)
         if ((flags & FWRITE) != 0) {
             /* read/write */
             if (acd_rezero_unit(cdp)) {
-                printf("acd%d: rezero failed\n", lun);
+                printf("wcd%d: rezero failed\n", lun);
                 return EIO;
             }
         } else {
             /* read only */
             if (acd_read_toc(cdp) != 0) {
-                printf("acd%d: read_toc failed\n", lun);
+                printf("wcd%d: read_toc failed\n", lun);
                 /* return EIO; */
             }
         }
@@ -535,7 +535,7 @@ acd_start(struct acd *cdp)
     if ((bp->b_flags & B_READ) == B_WRITE) {
         if ((cdp->flags & F_TRACK_PREPED) == 0) {
             if ((cdp->flags & F_TRACK_PREP) == 0) {
-                printf("acd%d: sequence error\n", cdp->lun);
+                printf("wcd%d: sequence error\n", cdp->lun);
                 bp->b_error = EIO;
                 bp->b_flags |= B_ERROR;
                 biodone(bp);
@@ -1064,7 +1064,7 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
                 error = EINVAL;
             else if ((cdp->flags & F_DISK_PREPED) == 0) {
                 error = EINVAL;
-                printf("acd%d: sequence error (PREP_TRACK)\n", cdp->lun);
+                printf("wcd%d: sequence error (PREP_TRACK)\n", cdp->lun);
             } else {
                 cdp->flags |= F_TRACK_PREP;
                 cdp->preptrack = *w;
@@ -1175,7 +1175,7 @@ acd_read_toc(struct acd *cdp)
 
     if (cdp->info.volsize && cdp->toc.hdr.ending_track
         && (cdp->flags & F_DEBUG)) {
-        printf("acd%d: ", cdp->lun);
+        printf("wcd%d: ", cdp->lun);
         if (cdp->toc.tab[0].control & 4)
             printf("%ldMB ", cdp->info.volsize / 512);
         else
@@ -1254,8 +1254,8 @@ acd_eject(struct acd *cdp, int close)
     if (close)
         return 0;
 
-    tsleep((caddr_t) &lbolt, PRIBIO, "acdej1", 0);
-    tsleep((caddr_t) &lbolt, PRIBIO, "acdej2", 0);
+    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej1", 0);
+    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej2", 0);
 
     acd_request_wait(cdp, ATAPI_PREVENT_ALLOW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
     cdp->flags &= ~F_LOCKED;
@@ -1524,7 +1524,7 @@ atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
 	printf ("\n");
 }
 
-#ifdef ACD_MODULE
+#ifdef WCD_MODULE
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
@@ -1596,7 +1596,7 @@ acd_mod(struct lkm_table *lkmtp, int cmd, int ver)
     return lkmdispatch(lkmtp, cmd);
 }
 
-#endif /* ACD_MODULE */
+#endif /* WCD_MODULE */
 
 static acd_devsw_installed = 0;
 
@@ -1610,4 +1610,4 @@ acd_drvinit(void *unused)
 }
 
 SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL)
-#endif /* NACD && NWDC && ATAPI */
+#endif /* NWCD && NWDC && ATAPI */
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index b716e69..31033d2 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -25,15 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.10 1999/01/31 23:08:47 sos Exp $
+ *	$Id: atapi-cd.c,v 1.11 1999/02/10 00:03:32 ken Exp $
  */
 
 #include "wdc.h"
-#include "acd.h"
+#include "wcd.h"
 #include "opt_atapi.h"
 #include "opt_devfs.h"
 
-#if NACD > 0 && NWDC > 0 && defined(ATAPI)
+#if NWCD > 0 && NWDC > 0 && defined(ATAPI)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,7 @@ static d_strategy_t	acdstrategy;
 static struct cdevsw acd_cdevsw = {
     acdopen,	acdclose,	acdread,	acdwrite,	
     acdioctl,	nostop,		nullreset,	nodevtotty,
-    seltrue,	nommap,		acdstrategy,	"acd",
+    seltrue,	nommap,		acdstrategy,	"wcd",
     NULL,	-1,		nodump,		nopsize,
     D_DISK,	0,		-1
 };
@@ -141,19 +141,19 @@ acd_init_lun(struct atapi *ata, int unit, struct atapi_params *ap, int lun,
     ptr->ra_devfs_token =
         devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0),
         DV_CHR, UID_ROOT, GID_OPERATOR, 0640,
-        "racd%da", lun);
+        "rwcd%da", lun);
     ptr->rc_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
         DV_CHR, UID_ROOT, GID_OPERATOR, 0640,
-        "racd%dc", lun);
+        "rwcd%dc", lun);
     ptr->a_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, 0),
         DV_BLK, UID_ROOT, GID_OPERATOR, 0640,
-        "acd%da", lun);
+        "wcd%da", lun);
     ptr->c_devfs_token =
-        devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
+        devfs_add_devswf(&wcd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
         DV_BLK, UID_ROOT, GID_OPERATOR, 0640,
-        "acd%dc", lun);
+        "wcd%dc", lun);
 #endif
     return ptr;
 }
@@ -170,15 +170,15 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
     int i, count;
 
     if (acdnlun >= NUNIT) {
-        printf("acd: too many units\n");
+        printf("wcd: too many units\n");
         return 0;
     }
     if (!atapi_request_immediate) {
-        printf("acd: configuration error, ATAPI code not present!\n");
+        printf("wcd: configuration error, ATAPI code not present!\n");
         return 0;
     }
     if ((cdp = acd_init_lun(ata, unit, ap, acdnlun, NULL)) == NULL) {
-        printf("acd: out of memory\n");
+        printf("wcd: out of memory\n");
         return 0;
     }
     acdtab[acdnlun] = cdp;
@@ -222,7 +222,7 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
 
         chp = malloc(sizeof(struct changer), M_TEMP, M_NOWAIT);
         if (chp == NULL) {
-            printf("acd: out of memory\n");
+            printf("wcd: out of memory\n");
             return 0;
         }
         bzero(chp, sizeof(struct changer));
@@ -247,22 +247,22 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
                     tmpcdp = acd_init_lun(ata, unit, ap, acdnlun, 
 					  cdp->device_stats);
 		    if (!tmpcdp) {
-                        printf("acd: out of memory\n");
+                        printf("wcd: out of memory\n");
                         return 0;
                     }
                 }
                 tmpcdp->slot = i;
                 tmpcdp->changer_info = chp;
-                printf("acd%d: changer slot %d %s\n", acdnlun, i,
+                printf("wcd%d: changer slot %d %s\n", acdnlun, i,
 		       (chp->slot[i].present ? "disk present" : "no disk"));
                 acdtab[acdnlun++] = tmpcdp;
             }
             if (acdnlun >= NUNIT) {
-                printf("acd: too many units\n");
+                printf("wcd: too many units\n");
                 return 0;
             }
         }
-	sprintf(string, "acd%d-", cdp->lun);
+	sprintf(string, "wcd%d-", cdp->lun);
         devstat_add_entry(cdp->device_stats, string, tmpcdp->lun, DEV_BSIZE,
                           DEVSTAT_NO_ORDERED_TAGS,
                           DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE,
@@ -270,7 +270,7 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
     }
     else {
         acdnlun++;
-        devstat_add_entry(cdp->device_stats, "acd", cdp->lun, DEV_BSIZE,
+        devstat_add_entry(cdp->device_stats, "wcd", cdp->lun, DEV_BSIZE,
                           DEVSTAT_NO_ORDERED_TAGS,
                           DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE,
 			  DEVSTAT_PRIORITY_WCD);
@@ -284,14 +284,14 @@ acd_describe(struct acd *cdp)
     int comma;
     char *mechanism;
 
-    printf("acd%d: drive speed ", cdp->lun);
+    printf("wcd%d: drive speed ", cdp->lun);
     if (cdp->cap.cur_speed != cdp->cap.max_speed)
         printf("%d - ", cdp->cap.cur_speed * 1000 / 1024);
     printf("%dKB/sec", cdp->cap.max_speed * 1000 / 1024);
     if (cdp->cap.buf_size)
         printf(", %dKB cache\n", cdp->cap.buf_size);
 
-    printf("acd%d: supported read types:", cdp->lun);
+    printf("wcd%d: supported read types:", cdp->lun);
     comma = 0;
     if (cdp->cap.read_cdr) {
         printf(" CD-R"); comma = 1;
@@ -305,7 +305,7 @@ acd_describe(struct acd *cdp)
     if (cdp->cap.method2)
         printf("%s packet track", comma ? "," : "");
     if (cdp->cap.write_cdr || cdp->cap.write_cdrw) {
-    	printf("\nacd%d: supported write types:", cdp->lun);
+    	printf("\nwcd%d: supported write types:", cdp->lun);
         comma = 0;
     	if (cdp->cap.write_cdr) {
             printf(" CD-R" ); comma = 1;
@@ -318,13 +318,13 @@ acd_describe(struct acd *cdp)
 	}
     }
     if (cdp->cap.audio_play) {
-    	printf("\nacd%d: Audio: ", cdp->lun);
+    	printf("\nwcd%d: Audio: ", cdp->lun);
     	if (cdp->cap.audio_play)
             printf("play");
     	if (cdp->cap.max_vol_levels)
             printf(", %d volume levels", cdp->cap.max_vol_levels);
     }
-    printf("\nacd%d: Mechanism: ", cdp->lun);
+    printf("\nwcd%d: Mechanism: ", cdp->lun);
     switch (cdp->cap.mech) {
     case MST_MECH_CADDY:
         mechanism = "caddy"; break;
@@ -345,7 +345,7 @@ acd_describe(struct acd *cdp)
         printf("ejectable");
 
     if (cdp->cap.mech != MST_MECH_CHANGER) {
-        printf("\nacd%d: Medium: ", cdp->lun);
+        printf("\nwcd%d: Medium: ", cdp->lun);
         switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) {
         case MST_CDROM:
             printf("CD-ROM "); break;
@@ -424,13 +424,13 @@ acdopen(dev_t dev, int flags, int fmt, struct proc *p)
         if ((flags & FWRITE) != 0) {
             /* read/write */
             if (acd_rezero_unit(cdp)) {
-                printf("acd%d: rezero failed\n", lun);
+                printf("wcd%d: rezero failed\n", lun);
                 return EIO;
             }
         } else {
             /* read only */
             if (acd_read_toc(cdp) != 0) {
-                printf("acd%d: read_toc failed\n", lun);
+                printf("wcd%d: read_toc failed\n", lun);
                 /* return EIO; */
             }
         }
@@ -535,7 +535,7 @@ acd_start(struct acd *cdp)
     if ((bp->b_flags & B_READ) == B_WRITE) {
         if ((cdp->flags & F_TRACK_PREPED) == 0) {
             if ((cdp->flags & F_TRACK_PREP) == 0) {
-                printf("acd%d: sequence error\n", cdp->lun);
+                printf("wcd%d: sequence error\n", cdp->lun);
                 bp->b_error = EIO;
                 bp->b_flags |= B_ERROR;
                 biodone(bp);
@@ -1064,7 +1064,7 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
                 error = EINVAL;
             else if ((cdp->flags & F_DISK_PREPED) == 0) {
                 error = EINVAL;
-                printf("acd%d: sequence error (PREP_TRACK)\n", cdp->lun);
+                printf("wcd%d: sequence error (PREP_TRACK)\n", cdp->lun);
             } else {
                 cdp->flags |= F_TRACK_PREP;
                 cdp->preptrack = *w;
@@ -1175,7 +1175,7 @@ acd_read_toc(struct acd *cdp)
 
     if (cdp->info.volsize && cdp->toc.hdr.ending_track
         && (cdp->flags & F_DEBUG)) {
-        printf("acd%d: ", cdp->lun);
+        printf("wcd%d: ", cdp->lun);
         if (cdp->toc.tab[0].control & 4)
             printf("%ldMB ", cdp->info.volsize / 512);
         else
@@ -1254,8 +1254,8 @@ acd_eject(struct acd *cdp, int close)
     if (close)
         return 0;
 
-    tsleep((caddr_t) &lbolt, PRIBIO, "acdej1", 0);
-    tsleep((caddr_t) &lbolt, PRIBIO, "acdej2", 0);
+    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej1", 0);
+    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej2", 0);
 
     acd_request_wait(cdp, ATAPI_PREVENT_ALLOW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
     cdp->flags &= ~F_LOCKED;
@@ -1524,7 +1524,7 @@ atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
 	printf ("\n");
 }
 
-#ifdef ACD_MODULE
+#ifdef WCD_MODULE
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
@@ -1596,7 +1596,7 @@ acd_mod(struct lkm_table *lkmtp, int cmd, int ver)
     return lkmdispatch(lkmtp, cmd);
 }
 
-#endif /* ACD_MODULE */
+#endif /* WCD_MODULE */
 
 static acd_devsw_installed = 0;
 
@@ -1610,4 +1610,4 @@ acd_drvinit(void *unused)
 }
 
 SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL)
-#endif /* NACD && NWDC && ATAPI */
+#endif /* NWCD && NWDC && ATAPI */