Copy i386/isa/atapi-cd.[ch] to a new name so that it doesn't have the

same object file (atapi-cd.o) as the ata drivers. I'd have called it
wcd.[ch], but there's already one of those in the Attic that we can't
clobber - the good names are taken.
Fix building so that it can be compiled into LINT alongside ata.

Requested by:	bde

6 files changed, 24 insertions, 1855 deletions

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 68048a7..9500a45 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1168,12 +1168,12 @@ options 	ATA_ENABLE_ATAPI_DMA
 # This driver must be commented out because it is mutually exclusive with
 # the ata(4) driver.
 #
-#device		wdc0	at isa? port IO_WD1 irq 14
-#device		wd0	at wdc0 drive 0
-#device		wd1	at wdc0 drive 1
-#device		wdc1	at isa? port IO_WD2 irq 15
-#device		wd2	at wdc1 drive 0
-#device		wd3	at wdc1 drive 1
+device		wdc0	at isa? port IO_WD1 irq 14
+device		wd0	at wdc0 drive 0
+device		wd1	at wdc0 drive 1
+device		wdc1	at isa? port IO_WD2 irq 15
+device		wd2	at wdc1 drive 0
+device		wd3	at wdc1 drive 1
 
 #
 # This option allow you to override the default probe time for IDE
@@ -1181,16 +1181,16 @@ options 	ATA_ENABLE_ATAPI_DMA
 # the IDE specs, but may still work for you (it will work for most
 # people).
 #
-#options 	IDE_DELAY=8000	# Be optimistic about Joe IDE device
+options 	IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller
-#device		wcd
+device		wcd
 
 # IDE floppy driver - requires wdc controller
-#device		wfd
+device		wfd
 
 # IDE tape driver - requires wdc controller
-#device		wst
+device		wst
 
 
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 68048a7..9500a45 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1168,12 +1168,12 @@ options 	ATA_ENABLE_ATAPI_DMA
 # This driver must be commented out because it is mutually exclusive with
 # the ata(4) driver.
 #
-#device		wdc0	at isa? port IO_WD1 irq 14
-#device		wd0	at wdc0 drive 0
-#device		wd1	at wdc0 drive 1
-#device		wdc1	at isa? port IO_WD2 irq 15
-#device		wd2	at wdc1 drive 0
-#device		wd3	at wdc1 drive 1
+device		wdc0	at isa? port IO_WD1 irq 14
+device		wd0	at wdc0 drive 0
+device		wd1	at wdc0 drive 1
+device		wdc1	at isa? port IO_WD2 irq 15
+device		wd2	at wdc1 drive 0
+device		wd3	at wdc1 drive 1
 
 #
 # This option allow you to override the default probe time for IDE
@@ -1181,16 +1181,16 @@ options 	ATA_ENABLE_ATAPI_DMA
 # the IDE specs, but may still work for you (it will work for most
 # people).
 #
-#options 	IDE_DELAY=8000	# Be optimistic about Joe IDE device
+options 	IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller
-#device		wcd
+device		wcd
 
 # IDE floppy driver - requires wdc controller
-#device		wfd
+device		wfd
 
 # IDE tape driver - requires wdc controller
-#device		wst
+device		wst
 
 
 #
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
deleted file mode 100644
index 898af01..0000000
--- a/sys/i386/isa/atapi-cd.c
+++ /dev/null
@@ -1,1485 +0,0 @@
-/*-
- * Copyright (c) 1998, 1999 Søren Schmidt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include "wdc.h"
-#include "wcd.h"
-
-#if NWCD > 0 && NWDC > 0
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/buf.h>
-#include <sys/disklabel.h>
-#include <sys/devicestat.h>
-#include <sys/cdio.h>
-#include <sys/wormio.h>
-#include <sys/fcntl.h>
-#include <sys/conf.h>
-#include <sys/stat.h>
-#include <i386/isa/atapi.h>
-#include <i386/isa/atapi-cd.h>
-
-static d_open_t		acdopen;
-static d_close_t	acdclose;
-static d_ioctl_t	acdioctl;
-static d_strategy_t	acdstrategy;
-
-#define CDEV_MAJOR 69
-#define BDEV_MAJOR 19
-static struct cdevsw acd_cdevsw = {
-	/* open */	acdopen,
-	/* close */	acdclose,
-	/* read */	physread,
-	/* write */	physwrite,
-	/* ioctl */	acdioctl,
-	/* poll */	nopoll,
-	/* mmap */	nommap,
-	/* strategy */	acdstrategy,
-	/* name */	"wcd",
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
-};
-
-#define NUNIT	16		/* Max # of devices */
-
-#define F_BOPEN         0x0001  /* The block device is opened */
-#define F_MEDIA_CHANGED 0x0002  /* The media have changed since open */
-#define F_DEBUG         0x0004  /* Print debug info */
-#define F_LOCKED        0x0008  /* This unit is locked (or should be) */
-#define F_TRACK_PREP    0x0010  /* Track should be prep'ed */
-#define F_TRACK_PREPED  0x0020  /* Track has been prep'ed */
-#define F_DISK_PREPED   0x0040  /* Disk has been prep'ed */
-#define F_WRITTEN   	0x0080  /* The medium has been written to */
-
-static struct acd *acdtab[NUNIT];
-static int acdnlun = 0;     	/* Number of configured drives */
-
-int acdattach(struct atapi *, int, struct atapi_params *, int);
-static struct acd *acd_init_lun(struct atapi *, int, struct atapi_params *, int,
-struct devstat *);
-static void acd_start(struct acd *);
-static void acd_done(struct acd *, struct buf *, int, struct atapires);
-static int acd_read_toc(struct acd *);
-static int acd_request_wait(struct acd *, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, u_char, char *, int);
-static void acd_describe(struct acd *);
-static int acd_setchan(struct acd *, u_char, u_char, u_char, u_char);
-static int acd_eject(struct acd *, int);
-static void acd_select_slot(struct acd *);
-static int acd_open_disk(struct acd *, int);
-static int acd_open_track(struct acd *, struct wormio_prepare_track *);
-static int acd_close_track(struct acd *);
-static int acd_close_disk(struct acd *);
-static int acd_read_track_info(struct acd *cdp, int lba, struct acd_track_info *info);
-static int acd_blank_disk(struct acd *);
-static void atapi_dump(int ctrlr, int lun, char *label, void *data, int len);
-static void atapi_error(struct atapi *ata, int unit, struct atapires result);
-
-struct acd *
-acd_init_lun(struct atapi *ata, int unit, struct atapi_params *ap, int lun,
-	     struct devstat *device_stats)
-{
-    struct acd *ptr;
-
-    if (!(ptr = malloc(sizeof(struct acd), M_TEMP, M_NOWAIT)))
-        return NULL;
-    bzero(ptr, sizeof(struct acd));
-    bufq_init(&ptr->buf_queue);
-    ptr->ata = ata;
-    ptr->unit = unit;
-    ptr->lun = lun;
-    ptr->param = ap;
-    ptr->flags = F_MEDIA_CHANGED;
-    ptr->flags &= ~(F_WRITTEN|F_TRACK_PREP|F_TRACK_PREPED);
-    ptr->block_size = 2048;
-    ptr->refcnt = 0;
-    ptr->slot = -1;
-    ptr->changer_info = NULL;
-    if (device_stats == NULL) {
-        if (!(ptr->device_stats = malloc(sizeof(struct devstat), 
-					 M_TEMP, M_NOWAIT)))
-            return NULL;
-	bzero(ptr->device_stats, sizeof(struct devstat));
-    }
-    else
-	ptr->device_stats = device_stats;
-    make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0),
-        UID_ROOT, GID_OPERATOR, 0640, "rwcd%da", lun);
-    make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
-        UID_ROOT, GID_OPERATOR, 0640, "rwcd%dc", lun);
-    make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0),
-        UID_ROOT, GID_OPERATOR, 0640, "wcd%da", lun);
-    make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART),
-        UID_ROOT, GID_OPERATOR, 0640, "wcd%dc", lun);
-    return ptr;
-}
-
-int
-acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
-{
-    struct acd *cdp;
-    struct atapires result;
-    struct changer *chp;
-    int i, count;
-
-    if (acdnlun >= NUNIT) {
-        printf("wcd: too many units\n");
-        return 0;
-    }
-    if (!atapi_request_immediate) {
-        printf("wcd: configuration error, ATAPI code not present!\n");
-        return 0;
-    }
-    if ((cdp = acd_init_lun(ata, unit, ap, acdnlun, NULL)) == NULL) {
-        printf("wcd: out of memory\n");
-        return 0;
-    }
-    acdtab[acdnlun] = cdp;
-
-    if (debug) {
-        cdp->flags |= F_DEBUG;
-        atapi_dump(cdp->ata->ctrlr, cdp->lun, "info", ap, sizeof(*ap));
-    }
-
-    /* Get drive capabilities, some drives needs this repeated */
-    for (count = 0 ; count < 5 ; count++) {
-        result = atapi_request_immediate(ata, unit,
-        				 ATAPI_MODE_SENSE,
-        				 0, ATAPI_CDROM_CAP_PAGE,
-        				 0, 0, 0, 0, 
-					 sizeof(cdp->cap)>>8, sizeof(cdp->cap),
-        				 0, 0, 0, 0, 0, 0, 0, 
-					 (char *)&cdp->cap, sizeof(cdp->cap));
-        if (result.code == 0 || result.code == RES_UNDERRUN)
-            break;
-    }
-
-    /* Some drives have shorter capabilities page. */
-    if (result.code == RES_UNDERRUN)
-        result.code = 0;
-
-    if (result.code == 0) {
-    	cdp->cap.max_speed = ntohs(cdp->cap.max_speed);
-    	cdp->cap.max_vol_levels = ntohs(cdp->cap.max_vol_levels);
-    	cdp->cap.buf_size = ntohs(cdp->cap.buf_size);
-    	cdp->cap.cur_speed = ntohs(cdp->cap.cur_speed);
-        acd_describe(cdp);
-        if (cdp->flags & F_DEBUG)
-            atapi_dump(cdp->ata->ctrlr, cdp->lun, "cap", &cdp->cap,
-		       sizeof(cdp->cap));
-    }
-    /* If this is a changer device, allocate the neeeded lun's */
-    if (cdp->cap.mech == MST_MECH_CHANGER) {
-	char string[16];
-    	struct acd *tmpcdp = cdp;
-
-        chp = malloc(sizeof(struct changer), M_TEMP, M_NOWAIT);
-        if (chp == NULL) {
-            printf("wcd: out of memory\n");
-            return 0;
-        }
-        bzero(chp, sizeof(struct changer));
-        result = atapi_request_immediate(ata, unit, ATAPI_MECH_STATUS,
-            				 0, 0, 0, 0, 0, 0, 0,
-            				 sizeof(struct changer)>>8,
-					 sizeof(struct changer),
-            				 0, 0, 0, 0, 0, 0,
-            				 (char *)chp, sizeof(struct changer));
-        if (cdp->flags & F_DEBUG) {
-            printf("result.code=%d curr=%02x slots=%d len=%d\n",
-                result.code, chp->current_slot, chp->slots,
-                htons(chp->table_length));
-        }
-        if (result.code == RES_UNDERRUN)
-            result.code = 0;
-
-        if (result.code == 0) {
-            chp->table_length = htons(chp->table_length);
-            for (i = 0; i < chp->slots && acdnlun < NUNIT; i++) {
-                if (i > 0) {
-                    tmpcdp = acd_init_lun(ata, unit, ap, acdnlun, 
-					  cdp->device_stats);
-		    if (!tmpcdp) {
-                        printf("wcd: out of memory\n");
-                        return 0;
-                    }
-                }
-                tmpcdp->slot = i;
-                tmpcdp->changer_info = chp;
-                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("wcd: too many units\n");
-                return 0;
-            }
-        }
-	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,
-			  DEVSTAT_PRIORITY_CD);
-    }
-    else {
-        acdnlun++;
-        devstat_add_entry(cdp->device_stats, "wcd", cdp->lun, DEV_BSIZE,
-                          DEVSTAT_NO_ORDERED_TAGS,
-                          DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE,
-			  DEVSTAT_PRIORITY_CD);
-    }
-    return 1;
-}
-
-void 
-acd_describe(struct acd *cdp)
-{
-    int comma;
-    char *mechanism;
-
-    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("wcd%d: supported read types:", cdp->lun);
-    comma = 0;
-    if (cdp->cap.read_cdr) {
-        printf(" CD-R"); comma = 1;
-    }
-    if (cdp->cap.read_cdrw) {
-        printf("%s CD-RW", comma ? "," : ""); comma = 1;
-    }
-    if (cdp->cap.cd_da) {
-        printf("%s CD-DA", comma ? "," : ""); comma = 1;
-    }
-    if (cdp->cap.method2)
-        printf("%s packet track", comma ? "," : "");
-    if (cdp->cap.write_cdr || cdp->cap.write_cdrw) {
-    	printf("\nwcd%d: supported write types:", cdp->lun);
-        comma = 0;
-    	if (cdp->cap.write_cdr) {
-            printf(" CD-R" ); comma = 1;
-	}
-    	if (cdp->cap.write_cdrw) {
-            printf("%s CD-RW", comma ? "," : ""); comma = 1;
-	}
-    	if (cdp->cap.test_write) {
-            printf("%s test write", comma ? "," : ""); comma = 1;
-	}
-    }
-    if (cdp->cap.audio_play) {
-    	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("\nwcd%d: Mechanism: ", cdp->lun);
-    switch (cdp->cap.mech) {
-    case MST_MECH_CADDY:
-        mechanism = "caddy"; break;
-    case MST_MECH_TRAY:
-        mechanism = "tray"; break;
-    case MST_MECH_POPUP:
-        mechanism = "popup"; break;
-    case MST_MECH_CHANGER:
-        mechanism = "changer"; break;
-    case MST_MECH_CARTRIDGE:
-        mechanism = "cartridge"; break;
-    default:
-        mechanism = 0; break;
-    }
-    if (mechanism)
-        printf("%s%s", cdp->cap.eject ? "ejectable " : "", mechanism);
-    else if (cdp->cap.eject)
-        printf("ejectable");
-
-    if (cdp->cap.mech != MST_MECH_CHANGER) {
-        printf("\nwcd%d: Medium: ", cdp->lun);
-        switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) {
-        case MST_CDROM:
-            printf("CD-ROM "); break;
-        case MST_CDR:
-            printf("CD-R "); break;
-        case MST_CDRW:
-            printf("CD-RW "); break;
-        case MST_DOOR_OPEN:
-            printf("door open"); break;
-        case MST_NO_DISC:
-            printf("no/blank disc inside"); break;
-        case MST_FMT_ERROR:
-            printf("medium format error"); break;
-	}
-        if ((cdp->cap.medium_type & MST_TYPE_MASK_HIGH) < MST_TYPE_MASK_HIGH) {
-            switch (cdp->cap.medium_type & MST_TYPE_MASK_LOW) {
-            case MST_DATA_120:
-                printf("120mm data disc loaded"); break;
-            case MST_AUDIO_120:
-                printf("120mm audio disc loaded"); break;
-            case MST_COMB_120:
-                printf("120mm data/audio disc loaded"); break;
-            case MST_PHOTO_120:
-                printf("120mm photo disc loaded"); break;
-            case MST_DATA_80:
-                printf("80mm data disc loaded"); break;
-            case MST_AUDIO_80:
-                printf("80mm audio disc loaded"); break;
-            case MST_COMB_80:
-                printf("80mm data/audio disc loaded"); break;
-            case MST_PHOTO_80:
-                printf("80mm photo disc loaded"); break;
-            case MST_FMT_NONE:
-                switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) {
-	        case MST_CDROM:
-		    printf("unknown medium"); break;
-                case MST_CDR:
-                case MST_CDRW:
-                    printf("blank medium"); break;
-	        }
-                break;
-            default:
-                printf("unknown type=0x%x", cdp->cap.medium_type); break;
-            }
-	}
-    }
-    if (cdp->cap.lock)
-        printf(cdp->cap.locked ? ", locked" : ", unlocked");
-    if (cdp->cap.prevent)
-        printf(", lock protected");
-    printf("\n");
-}
-
-static int
-acdopen(dev_t dev, int flags, int fmt, struct proc *p)
-{
-    int lun = dkunit(dev);
-    struct acd *cdp;
-
-    if (lun >= acdnlun || !atapi_request_immediate)
-        return ENXIO;
-    cdp = acdtab[lun];
-
-    if (!(cdp->flags & F_BOPEN) && !cdp->refcnt) {
-        /* Prevent user eject */
-        acd_request_wait(cdp, ATAPI_PREVENT_ALLOW,
-            0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0);
-        cdp->flags |= F_LOCKED;
-    }
-    if (fmt == S_IFBLK)
-        cdp->flags |= F_BOPEN;
-    else
-        ++cdp->refcnt;
-    dev->si_bsize_phys = cdp->block_size;
-    if (!(flags & O_NONBLOCK) && acd_read_toc(cdp) && !(flags & FWRITE))
-        printf("acd%d: read_toc failed\n", lun);
-    return 0;
-}
-
-int 
-acdclose(dev_t dev, int flags, int fmt, struct proc *p)
-{
-    struct acd *cdp = acdtab[dkunit(dev)];
-
-    if (fmt == S_IFBLK)
-    	cdp->flags &= ~F_BOPEN;
-    else
-    	--cdp->refcnt;
-
-    /* Are we the last open ?? */
-    if (!(cdp->flags & F_BOPEN) && !cdp->refcnt) {
-	/* Yup, do we need to close any written tracks */
-        if ((flags & FWRITE) != 0) {
-            if ((cdp->flags & F_TRACK_PREPED) != 0) {
-                acd_close_track(cdp);
-                cdp->flags &= ~(F_TRACK_PREPED | F_TRACK_PREP);
-            }
-        }
-	/* Allow the user eject */
-        acd_request_wait(cdp, ATAPI_PREVENT_ALLOW,
-        		 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    }
-    cdp->flags &= ~F_LOCKED;
-    return 0;
-}
-
-void 
-acdstrategy(struct buf *bp)
-{
-    int lun = dkunit(bp->b_dev);
-    struct acd *cdp = acdtab[lun];
-    int x;
-
-#ifdef NOTYET
-    /* allow write only on CD-R/RW media */   /* all for now SOS */
-    if (!(bp->b_flags & B_READ) && !(writeable_media)) {
-        bp->b_error = EROFS;
-        bp->b_flags |= B_ERROR;
-        biodone(bp);
-        return;
-    }
-#endif
-
-    if (bp->b_bcount == 0) {
-        bp->b_resid = 0;
-        biodone(bp);
-        return;
-    }
-    
-    bp->b_pblkno = bp->b_blkno;
-    bp->b_resid = bp->b_bcount;
-
-    x = splbio();
-    bufqdisksort(&cdp->buf_queue, bp);
-    acd_start(cdp);
-    splx(x);
-}
-
-static void 
-acd_start(struct acd *cdp)
-{
-    struct buf *bp = bufq_first(&cdp->buf_queue);
-    u_long lba, blocks;
-    int cmd;
-    int count;
-
-    if (!bp)
-        return;
-
-    bufq_remove(&cdp->buf_queue, bp);
-
-    /* Should reject all queued entries if media have changed. */
-    if (cdp->flags & F_MEDIA_CHANGED) {
-        bp->b_error = EIO;
-        bp->b_flags |= B_ERROR;
-        biodone(bp);
-        return;
-    }
-
-    acd_select_slot(cdp);
-
-    if ((bp->b_flags & B_READ) == B_WRITE) {
-        if ((cdp->flags & F_TRACK_PREPED) == 0) {
-            if ((cdp->flags & F_TRACK_PREP) == 0) {
-                printf("wcd%d: sequence error\n", cdp->lun);
-                bp->b_error = EIO;
-                bp->b_flags |= B_ERROR;
-                biodone(bp);
-                return;
-            } else {
-                if (acd_open_track(cdp, &cdp->preptrack) != 0) {
-                    biodone(bp);
-                    return;
-                }
-                cdp->flags |= F_TRACK_PREPED;
-            }
-        }
-    }
-
-    if (bp->b_flags & B_READ)
-#ifdef NOTYET
-    	lba = bp->b_offset / cdp->block_size;
-#else
-    	lba = bp->b_blkno / (cdp->block_size / DEV_BSIZE);
-#endif
-    else 
-	lba = cdp->next_writeable_lba + (bp->b_offset / cdp->block_size);
-    blocks = (bp->b_bcount + (cdp->block_size - 1)) / cdp->block_size;
-
-    if ((bp->b_flags & B_READ) == B_WRITE) {
-        cmd = ATAPI_WRITE_BIG;
-        count = -bp->b_bcount;
-    } else {
-        cmd = ATAPI_READ_BIG;
-        count = bp->b_bcount;
-    }
-
-    devstat_start_transaction(cdp->device_stats);
-
-    atapi_request_callback(cdp->ata, cdp->unit, cmd, 0,
-        		   lba>>24, lba>>16, lba>>8, lba, 0, 
-			   blocks>>8, blocks, 0, 0, 0, 0, 0, 0, 0, 
-			   (u_char *)bp->b_data, count, 
-			   (atapi_callback_t *)acd_done, cdp, bp);
-}
-
-static void 
-acd_done(struct acd *cdp, struct buf *bp, int resid, struct atapires result)
-{
-
-    if (result.code) {
-        atapi_error(cdp->ata, cdp->unit, result);
-        bp->b_error = EIO;
-        bp->b_flags |= B_ERROR;
-    } else {
-        bp->b_resid = resid;
-        if ((bp->b_flags & B_READ) == B_WRITE)
-            cdp->flags |= F_WRITTEN;
-    }
-    devstat_end_transaction_buf(cdp->device_stats, bp);
-    biodone(bp);
-    acd_start(cdp);
-}
-
-static int 
-acd_request_wait(struct acd *cdp, u_char cmd, u_char a1, u_char a2,
-    u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8,
-    u_char a9, char *addr, int count)
-{
-    struct atapires result;
-
-    result = atapi_request_wait(cdp->ata, cdp->unit, cmd, a1, a2, a3, a4, a5,
-			        a6, a7, a8, a9, 0, 0, 0, 0, 0, 0, addr, count);
-    if (result.code) {
-        atapi_error(cdp->ata, cdp->unit, result);
-        return EIO;
-    }
-    return 0;
-}
-
-static __inline void 
-lba2msf(int lba, u_char *m, u_char *s, u_char *f)
-{
-    lba += 150;
-    lba &= 0xffffff;
-    *m = lba / (60 * 75);
-    lba %= (60 * 75);
-    *s = lba / 75;
-    *f = lba % 75;
-}
-
-static __inline int 
-msf2lba(u_char m, u_char s, u_char f)
-{
-    return (m * 60 + s) * 75 + f - 150;
-}
-
-int 
-acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
-{
-    int lun = dkunit(dev);
-    struct acd *cdp = acdtab[lun];
-    int error = 0;
-
-    if (cdp->flags & F_MEDIA_CHANGED)
-        switch (cmd) {
-        case CDIOCRESET:
-            break;
-        default:
-            acd_read_toc(cdp);
-            acd_request_wait(cdp, ATAPI_PREVENT_ALLOW,
-            		     0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0);
-            cdp->flags |= F_LOCKED;
-            break;
-        }
-    switch (cmd) {
-/*
-    case CDIOCRESUME:
-        bzero(cdb);
-        cdb->cmd = ATAPI_PAUSE;
-        cdb->b8 = 0x01;
-        return atapi_cmd_wait(cdp->ata, cdp->unit, cdb, 0, 0, timout, 0);
-*/
-    case CDIOCRESUME:
-        return acd_request_wait(cdp, ATAPI_PAUSE, 
-				0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0);
-
-    case CDIOCPAUSE:
-        return acd_request_wait(cdp, ATAPI_PAUSE, 
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    case CDIOCSTART:
-        return acd_request_wait(cdp, ATAPI_START_STOP,
-				1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0);
-
-    case CDIOCSTOP:
-        return acd_request_wait(cdp, ATAPI_START_STOP,
-				1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    case CDIOCALLOW:
-        acd_select_slot(cdp);
-        cdp->flags &= ~F_LOCKED;
-        return acd_request_wait(cdp, ATAPI_PREVENT_ALLOW,
-            			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    case CDIOCPREVENT:
-        acd_select_slot(cdp);
-        cdp->flags |= F_LOCKED;
-        return acd_request_wait(cdp, ATAPI_PREVENT_ALLOW,
-            			0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0);
-
-    case CDIOCRESET:
-        error = suser(p);
-        if (error)
-            return (error);
-        return acd_request_wait(cdp, ATAPI_TEST_UNIT_READY,
-            			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    case CDIOCEJECT:
-        if ((cdp->flags & F_BOPEN) && cdp->refcnt)
-            return EBUSY;
-        return acd_eject(cdp, 0);
-
-    case CDIOCCLOSE:
-        if ((cdp->flags & F_BOPEN) && cdp->refcnt)
-            return 0;
-        return acd_eject(cdp, 1);
-
-    case CDIOREADTOCHEADER:
-        if (!cdp->toc.hdr.ending_track)
-            return EIO;
-        bcopy(&cdp->toc.hdr, addr, sizeof(cdp->toc.hdr));
-        break;
-
-    case CDIOREADTOCENTRYS:
-	{
-            struct ioc_read_toc_entry *te = (struct ioc_read_toc_entry *)addr;
-            struct toc *toc = &cdp->toc;
-            struct toc buf;
-            u_long len;
-            u_char starting_track = te->starting_track;
-
-            if (!cdp->toc.hdr.ending_track)
-                return EIO;
-
-            if (te->data_len < sizeof(toc->tab[0]) || 
-		(te->data_len % sizeof(toc->tab[0])) != 0 || 
-		(te->address_format != CD_MSF_FORMAT &&
-		te->address_format != CD_LBA_FORMAT))
-                return EINVAL;
-
-            if (!starting_track)
-                starting_track = toc->hdr.starting_track;
-            else if (starting_track == 170) 
-                starting_track = toc->hdr.ending_track + 1;
-            else if (starting_track < toc->hdr.starting_track ||
-                     starting_track > toc->hdr.ending_track + 1)
-                return EINVAL;
-
-            len = ((toc->hdr.ending_track + 1 - starting_track) + 1) *
-		  sizeof(toc->tab[0]);
-            if (te->data_len < len)
-                len = te->data_len;
-            if (len > sizeof(toc->tab))
-                return EINVAL;
-
-            if (te->address_format == CD_MSF_FORMAT) {
-                struct cd_toc_entry *entry;
-
-                buf = cdp->toc;
-                toc = &buf;
-                entry = toc->tab + (toc->hdr.ending_track + 1 -
-                    	toc->hdr.starting_track) + 1;
-                while (--entry >= toc->tab)
-                    lba2msf(ntohl(entry->addr.lba), &entry->addr.msf.minute,
-                            &entry->addr.msf.second, &entry->addr.msf.frame);
-            }
-            return copyout(toc->tab + starting_track - toc->hdr.starting_track,
-			   te->data, len);
-        }
-
-    case CDIOREADTOCENTRY:
-	{
-            struct ioc_read_toc_single_entry *te =
-            	(struct ioc_read_toc_single_entry *)addr;
-            struct toc *toc = &cdp->toc;
-            struct toc buf;
-            u_char track = te->track;
-
-            if (!cdp->toc.hdr.ending_track)
-                return EIO;
-
-            if (te->address_format != CD_MSF_FORMAT && 
-		te->address_format != CD_LBA_FORMAT)
-                return EINVAL;
-
-            if (!track)
-                track = toc->hdr.starting_track;
-            else if (track == 170)
-                track = toc->hdr.ending_track + 1;
-            else if (track < toc->hdr.starting_track ||
-                     track > toc->hdr.ending_track + 1)
-                return EINVAL;
-
-            if (te->address_format == CD_MSF_FORMAT) {
-                struct cd_toc_entry *entry;
-
-                buf = cdp->toc;
-                toc = &buf;
-                entry = toc->tab + (track - toc->hdr.starting_track);
-                lba2msf(ntohl(entry->addr.lba), &entry->addr.msf.minute,
-                        &entry->addr.msf.second, &entry->addr.msf.frame);
-            }
-            bcopy(toc->tab + track - toc->hdr.starting_track,
-                  &te->entry, sizeof(struct cd_toc_entry));
-        }
-	break;
-
-    case CDIOCREADSUBCHANNEL:
-	{
-            struct ioc_read_subchannel *args =
-            	(struct ioc_read_subchannel *)addr;
-            struct cd_sub_channel_info data;
-            u_long len = args->data_len;
-            int abslba, rellba;
-
-            if (len > sizeof(data) ||
-                len < sizeof(struct cd_sub_channel_header))
-                return EINVAL;
-
-            if (acd_request_wait(cdp, ATAPI_READ_SUBCHANNEL,
-				 0, 0x40, 1, 0, 0, 0, 
-				 sizeof(cdp->subchan)>>8, sizeof(cdp->subchan),
-                		 0,
-				 (char *)&cdp->subchan, 
-				 sizeof(cdp->subchan)) != 0)
-                return EIO;
-            if (cdp->flags & F_DEBUG)
-                atapi_dump(cdp->ata->ctrlr, cdp->lun, "subchan", &cdp->subchan, 
-			   sizeof(cdp->subchan));
-
-            abslba = cdp->subchan.abslba;
-            rellba = cdp->subchan.rellba;
-            if (args->address_format == CD_MSF_FORMAT) {
-                lba2msf(ntohl(abslba),
-                    &data.what.position.absaddr.msf.minute,
-                    &data.what.position.absaddr.msf.second,
-                    &data.what.position.absaddr.msf.frame);
-                lba2msf(ntohl(rellba),
-                    &data.what.position.reladdr.msf.minute,
-                    &data.what.position.reladdr.msf.second,
-                    &data.what.position.reladdr.msf.frame);
-            } else {
-                data.what.position.absaddr.lba = abslba;
-                data.what.position.reladdr.lba = rellba;
-            }
-            data.header.audio_status = cdp->subchan.audio_status;
-            data.what.position.control = cdp->subchan.control & 0xf;
-            data.what.position.addr_type = cdp->subchan.control >> 4;
-            data.what.position.track_number = cdp->subchan.track;
-            data.what.position.index_number = cdp->subchan.indx;
-            return copyout(&data, args->data, len);
-        }
-
-    case CDIOCPLAYMSF:
-	{
-            struct ioc_play_msf *args = (struct ioc_play_msf *)addr;
-
-            return acd_request_wait(cdp, ATAPI_PLAY_MSF, 0, 0,
-                		    args->start_m, args->start_s, args->start_f,
-                		    args->end_m, args->end_s, args->end_f,
-				    0, 0, 0);
-        }
-
-    case CDIOCPLAYBLOCKS:
-	{
-            struct ioc_play_blocks *args = (struct ioc_play_blocks *)addr;
-
-            return acd_request_wait(cdp, ATAPI_PLAY_BIG, 0,
-                		    args->blk>>24 & 0xff, args->blk>>16 & 0xff,
-                		    args->blk>>8 & 0xff, args->blk & 0xff,
-                		    args->len>>24 & 0xff, args->len>>16 & 0xff,
-                		    args->len>>8 & 0xff, args->len & 0xff,
-				    0, 0);
-        }
-
-    case CDIOCPLAYTRACKS:
-	{
-            struct ioc_play_track *args = (struct ioc_play_track *)addr;
-            u_long start, len;
-            int t1, t2;
-
-            if (!cdp->toc.hdr.ending_track)
-                return EIO;
-
-            if (args->end_track < cdp->toc.hdr.ending_track + 1)
-                ++args->end_track;
-            if (args->end_track > cdp->toc.hdr.ending_track + 1)
-                args->end_track = cdp->toc.hdr.ending_track + 1;
-            t1 = args->start_track - cdp->toc.hdr.starting_track;
-            t2 = args->end_track - cdp->toc.hdr.starting_track;
-            if (t1 < 0 || t2 < 0)
-                return EINVAL;
-            start = ntohl(cdp->toc.tab[t1].addr.lba);
-            len = ntohl(cdp->toc.tab[t2].addr.lba) - start;
-
-            return acd_request_wait(cdp, ATAPI_PLAY_BIG, 0,
-                		    start>>24 & 0xff, start>>16 & 0xff,
-                		    start>>8 & 0xff, start & 0xff,
-                		    len>>24 & 0xff, len>>16 & 0xff,
-                		    len>>8 & 0xff, len & 0xff, 0, 0);
-        }
-
-    case CDIOCREADAUDIO:
-	{
-	    struct ioc_read_audio* args = (struct ioc_read_audio*) addr;
-	    int lba, frames, result = 0;
-	    u_char *buffer, *ubuf = args->buffer;
-
-	    if (!cdp->toc.hdr.ending_track)
-		return EIO;
-		
-	    if ((frames = args->nframes) < 0)
-		return EINVAL;
-
-	    if (args->address_format == CD_LBA_FORMAT)
-		lba = args->address.lba;
-	    else if (args->address_format == CD_MSF_FORMAT)
-	        lba = msf2lba(args->address.msf.minute,
-			     args->address.msf.second,
-			     args->address.msf.frame);
-	    else
-		return EINVAL;
-#ifndef CD_BUFFER_BLOCKS
-#define CD_BUFFER_BLOCKS 8
-#endif
-            if (!(buffer = malloc(CD_BUFFER_BLOCKS * 2352, M_TEMP, M_NOWAIT)))
-                return ENOMEM;
-
-            while (frames > 0) {
-                u_char blocks;
-                int size;
-
-                blocks = (frames>CD_BUFFER_BLOCKS) ? CD_BUFFER_BLOCKS : frames;
-                size = blocks * 2352;
-
-                result = acd_request_wait(cdp, ATAPI_READ_CD, 4,
-                                          lba>>24, (lba>>16)&0xff,
-                                          (lba>>8)&0xff, lba&0xff, 0, 0,
-                                          blocks, 0xf0, buffer, size);
-                if (result != 0)
-                    break;
-
-                result = copyout(buffer, ubuf, size);
-                if (result != 0)
-                    break;
-                    
-                ubuf += size;
-                frames -= blocks;
-                lba += blocks;
-            }
-
-            free(buffer, M_TEMP);
-            return result;
-        }
-
-    case CDIOCGETVOL:
-	{
-            struct ioc_vol *arg = (struct ioc_vol *)addr;
-
-            error = acd_request_wait(cdp, ATAPI_MODE_SENSE, 0, CDROM_AUDIO_PAGE,
-                		     0, 0, 0, 0, 
-				     sizeof(cdp->au)>>8, sizeof(cdp->au), 0,
-                		     (char *)&cdp->au, sizeof(cdp->au));
-            if (error)
-                return error;
-            if (cdp->flags & F_DEBUG)
-                atapi_dump(cdp->ata->ctrlr, cdp->lun, "au", &cdp->au,
-			   sizeof(cdp->au));
-            if (cdp->au.page_code != CDROM_AUDIO_PAGE)
-                return EIO;
-            arg->vol[0] = cdp->au.port[0].volume;
-            arg->vol[1] = cdp->au.port[1].volume;
-            arg->vol[2] = cdp->au.port[2].volume;
-            arg->vol[3] = cdp->au.port[3].volume;
-        }
-        break;
-
-    case CDIOCSETVOL:
-	{
-            struct ioc_vol *arg = (struct ioc_vol *)addr;
-
-            error = acd_request_wait(cdp, ATAPI_MODE_SENSE, 0, CDROM_AUDIO_PAGE,
-                		     0, 0, 0, 0, 
-				     sizeof(cdp->au)>>8, sizeof(cdp->au), 0,
-                		     (char *)&cdp->au, sizeof(cdp->au));
-            if (error)
-                return error;
-            if (cdp->flags & F_DEBUG)
-                atapi_dump(cdp->ata->ctrlr, cdp->lun, "au", &cdp->au, 
-			   sizeof(cdp->au));
-            if (cdp->au.page_code != CDROM_AUDIO_PAGE)
-                return EIO;
-
-            error = acd_request_wait(cdp, ATAPI_MODE_SENSE, 0, 
-				     CDROM_AUDIO_PAGE_MASK, 0, 0, 0, 0, 
-				     sizeof(cdp->aumask)>>8,sizeof(cdp->aumask),
-				     0,
-				     (char *)&cdp->aumask, sizeof(cdp->aumask));
-            if (error)
-                return error;
-            if (cdp->flags & F_DEBUG)
-                atapi_dump(cdp->ata->ctrlr, cdp->lun, "mask", &cdp->aumask, 
-			   sizeof(cdp->aumask));
-
-            cdp->au.data_length = 0;
-            cdp->au.port[0].channels = CHANNEL_0;
-            cdp->au.port[1].channels = CHANNEL_1;
-            cdp->au.port[0].volume = arg->vol[0] & cdp->aumask.port[0].volume;
-            cdp->au.port[1].volume = arg->vol[1] & cdp->aumask.port[1].volume;
-            cdp->au.port[2].volume = arg->vol[2] & cdp->aumask.port[2].volume;
-            cdp->au.port[3].volume = arg->vol[3] & cdp->aumask.port[3].volume;
-            return acd_request_wait(cdp, ATAPI_MODE_SELECT, 0x10,
-                		    0, 0, 0, 0, 0, 
-				    sizeof(cdp->au)>>8, sizeof(cdp->au),
-                		    0, (char *)&cdp->au, -sizeof(cdp->au));
-        }
-
-    case CDIOCSETPATCH:
-	{
-            struct ioc_patch *arg = (struct ioc_patch *)addr;
-
-            return acd_setchan(cdp, arg->patch[0], arg->patch[1],
-                	       arg->patch[2], arg->patch[3]);
-        }
-
-    case CDIOCSETMONO:
-        return acd_setchan(cdp, CHANNEL_0|CHANNEL_1, CHANNEL_0|CHANNEL_1, 0, 0);
-
-    case CDIOCSETSTEREO:
-        return acd_setchan(cdp, CHANNEL_0, CHANNEL_1, 0, 0);
-
-    case CDIOCSETMUTE:
-        return acd_setchan(cdp, 0, 0, 0, 0);
-
-    case CDIOCSETLEFT:
-        return acd_setchan(cdp, CHANNEL_0, CHANNEL_0, 0, 0);
-
-    case CDIOCSETRIGHT:
-        return acd_setchan(cdp, CHANNEL_1, CHANNEL_1, 0, 0);
-
-    case CDRIOCNEXTWRITEABLEADDR:
-	{
-	    struct acd_track_info track_info;
-
-	    if ((error = acd_read_track_info(cdp, 0xff, &track_info)))
-		break;
-	    if (!track_info.nwa_valid)
-		return EINVAL;
-	    cdp->next_writeable_lba = track_info.next_writeable_addr;
-	    *(int*)addr = track_info.next_writeable_addr;
-	}
-	break;
- 
-    case WORMIOCPREPDISK:
-        {
-            struct wormio_prepare_disk *w = (struct wormio_prepare_disk *)addr;
-
-            if (w->dummy != 0 && w->dummy != 1)
-                error = EINVAL;
-            else {
-                error = acd_open_disk(cdp, w->dummy);
-                if (error == 0) {
-                    cdp->flags |= F_DISK_PREPED;
-                    cdp->dummy = w->dummy;
-                    cdp->speed = w->speed;
-                }
-            }
-        }
-        break;
-
-    case WORMIOCPREPTRACK:
-        {
-            struct wormio_prepare_track *w =(struct wormio_prepare_track *)addr;
-
-            if (w->audio != 0 && w->audio != 1)
-                error = EINVAL;
-            else if (w->audio == 0 && w->preemp)
-                error = EINVAL;
-            else if ((cdp->flags & F_DISK_PREPED) == 0) {
-                error = EINVAL;
-                printf("wcd%d: sequence error (PREP_TRACK)\n", cdp->lun);
-            } else {
-                cdp->flags |= F_TRACK_PREP;
-                cdp->preptrack = *w;
-            }
-        }
-        break;
-
-    case WORMIOCFINISHTRACK:
-        if ((cdp->flags & F_TRACK_PREPED) != 0)
-            error = acd_close_track(cdp);
-        cdp->flags &= ~(F_TRACK_PREPED | F_TRACK_PREP);
-        break;
-
-    case WORMIOCFIXATION:
-        {
-            struct wormio_fixation *w =
-            (struct wormio_fixation *)addr;
-
-            if ((cdp->flags & F_WRITTEN) == 0)
-                error = EINVAL;
-            else if (w->toc_type < 0 /* WORM_TOC_TYPE_AUDIO */ ||
-                w->toc_type > 4 /* WORM_TOC_TYPE_CDI */ )
-                error = EINVAL;
-            else if (w->onp != 0 && w->onp != 1)
-                error = EINVAL;
-            else {
-                /* no fixation needed if dummy write */
-                if (cdp->dummy == 0)
-                    error = acd_close_disk(cdp);
-                cdp->flags &=
-                    ~(F_WRITTEN|F_DISK_PREPED|F_TRACK_PREP|F_TRACK_PREPED);
-            }
-        }
-        break;
-
-    case CDRIOCBLANK:
-        return acd_blank_disk(cdp);
-
-    default:
-        return ENOTTY;
-    }
-    return error;
-}
-
-static int 
-acd_read_toc(struct acd *cdp)
-{
-    int ntracks, len;
-    struct atapires result;
-
-    bzero(&cdp->toc, sizeof(cdp->toc));
-    bzero(&cdp->info, sizeof(cdp->info));
-
-    acd_select_slot(cdp);
-
-    result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_TEST_UNIT_READY,
-        			0, 0, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    if (result.code == RES_ERR &&
-        (result.error & AER_SKEY) == AER_SK_UNIT_ATTENTION) {
-        cdp->flags |= F_MEDIA_CHANGED;
-    	cdp->flags &= ~(F_WRITTEN|F_TRACK_PREP|F_TRACK_PREPED);
-        result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_TEST_UNIT_READY,
-				    0, 0, 0, 0, 0, 0, 0, 0,
-				    0, 0, 0, 0, 0, 0, 0, 0, 0);
-    }
-
-    if (result.code) {
-        atapi_error(cdp->ata, cdp->unit, result);
-        return EIO;
-    }
-
-    cdp->flags &= ~F_MEDIA_CHANGED;
-
-    len = sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry);
-    if (acd_request_wait(cdp, ATAPI_READ_TOC, 0, 0, 0, 0, 0, 0,
-        		 len>>8, len & 0xff, 0, (char *)&cdp->toc, len) != 0) {
-        bzero(&cdp->toc, sizeof(cdp->toc));
-        return 0;
-    }
-    ntracks = cdp->toc.hdr.ending_track - cdp->toc.hdr.starting_track + 1;
-    if (ntracks <= 0 || ntracks > MAXTRK) {
-        bzero(&cdp->toc, sizeof(cdp->toc));
-        return 0;
-    }
-
-    len = sizeof(struct ioc_toc_header) + ntracks * sizeof(struct cd_toc_entry);
-    if (acd_request_wait(cdp, ATAPI_READ_TOC, 0, 0, 0, 0, 0, 0,
-        		 len>>8, len & 0xff, 0, (char *)&cdp->toc, len) & 0xff){
-        bzero(&cdp->toc, sizeof(cdp->toc));
-        return 0;
-    }
-
-    cdp->toc.hdr.len = ntohs(cdp->toc.hdr.len);
-
-    if (acd_request_wait(cdp, ATAPI_READ_CAPACITY, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			 (char *)&cdp->info, sizeof(cdp->info)) != 0)
-        bzero(&cdp->info, sizeof(cdp->info));
-
-    cdp->toc.tab[ntracks].control = cdp->toc.tab[ntracks - 1].control;
-    cdp->toc.tab[ntracks].addr_type = cdp->toc.tab[ntracks - 1].addr_type;
-    cdp->toc.tab[ntracks].track = 170;
-    cdp->toc.tab[ntracks].addr.lba = cdp->info.volsize;
-
-    cdp->info.volsize = ntohl(cdp->info.volsize);
-    cdp->info.blksize = ntohl(cdp->info.blksize);
-
-    if (cdp->info.volsize && cdp->toc.hdr.ending_track
-        && (cdp->flags & F_DEBUG)) {
-        printf("wcd%d: ", cdp->lun);
-        if (cdp->toc.tab[0].control & 4)
-            printf("%ldMB ", cdp->info.volsize / 512);
-        else
-            printf("%ld:%ld audio ", cdp->info.volsize / 75 / 60,
-                cdp->info.volsize / 75 % 60);
-        printf("(%ld sectors (%ld bytes)), %d tracks\n", 
-	    cdp->info.volsize, cdp->info.blksize,
-            cdp->toc.hdr.ending_track - cdp->toc.hdr.starting_track + 1);
-    }
-    return 0;
-}
-
-/*
- * Set up the audio channel masks.
- */
-static int 
-acd_setchan(struct acd *cdp, u_char c0, u_char c1, u_char c2, u_char c3)
-{
-    int error;
-
-    error = acd_request_wait(cdp, ATAPI_MODE_SENSE, 0, CDROM_AUDIO_PAGE,
-        		     0, 0, 0, 0, 
-			     sizeof(cdp->au)>>8, sizeof(cdp->au), 0,
-        		     (char *)&cdp->au, sizeof(cdp->au));
-    if (error)
-        return error;
-    if (cdp->flags & F_DEBUG)
-        atapi_dump(cdp->ata->ctrlr, cdp->lun, "au", &cdp->au, sizeof(cdp->au));
-    if (cdp->au.page_code != CDROM_AUDIO_PAGE)
-        return EIO;
-
-    cdp->au.data_length = 0;
-    cdp->au.port[0].channels = c0;
-    cdp->au.port[1].channels = c1;
-    cdp->au.port[2].channels = c2;
-    cdp->au.port[3].channels = c3;
-    return acd_request_wait(cdp, ATAPI_MODE_SELECT, 0x10,
-        		    0, 0, 0, 0, 0, 
-			    sizeof(cdp->au)>>8, sizeof(cdp->au), 0,
-			    (char *)&cdp->au, -sizeof(cdp->au));
-}
-
-static int 
-acd_eject(struct acd *cdp, int close)
-{
-    struct atapires result;
-
-    acd_select_slot(cdp);
-
-    result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_START_STOP, 1,
-			        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    if (result.code == RES_ERR &&
-        ((result.error & AER_SKEY) == AER_SK_NOT_READY ||
-        (result.error & AER_SKEY) == AER_SK_UNIT_ATTENTION)) {
-        int err;
-
-        if (!close)
-            return 0;
-        err = acd_request_wait(cdp, ATAPI_START_STOP, 0, 0, 0, 3,
-			       0, 0, 0, 0, 0, 0, 0);
-        if (err)
-            return err;
-
-        acd_read_toc(cdp);
-
-        acd_request_wait(cdp, ATAPI_PREVENT_ALLOW, 0, 0, 0, 1,
-			 0, 0, 0, 0, 0, 0, 0);
-        cdp->flags |= F_LOCKED;
-        return 0;
-    }
-    if (result.code) {
-        atapi_error(cdp->ata, cdp->unit, result);
-        return EIO;
-    }
-    if (close)
-        return 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;
-
-    cdp->flags |= F_MEDIA_CHANGED;
-    cdp->flags &= ~(F_WRITTEN|F_TRACK_PREP|F_TRACK_PREPED);
-    return acd_request_wait(cdp, ATAPI_START_STOP, 0, 0, 0, 2,
-			    0, 0, 0, 0, 0, 0, 0);
-}
-
-static void
-acd_select_slot(struct acd *cdp)
-{
-    if (cdp->slot < 0 || cdp->changer_info->current_slot == cdp->slot)
-        return;
-
-    /* Unlock (might not be needed but its cheaper than asking) */
-    acd_request_wait(cdp, ATAPI_PREVENT_ALLOW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    /* Unload the current media from player */
-    acd_request_wait(cdp, ATAPI_LOAD_UNLOAD, 0, 0, 0, 2,
-		     0, 0, 0, cdp->changer_info->current_slot, 0, 0, 0);
-
-    /* load the wanted slot */
-    acd_request_wait(cdp, ATAPI_LOAD_UNLOAD, 0, 0, 0, 3,
-		     0, 0, 0, cdp->slot, 0, 0, 0);
-
-    cdp->changer_info->current_slot = cdp->slot;
-
-    /* Lock the media if needed */
-    if (cdp->flags & F_LOCKED) {
-        acd_request_wait(cdp, ATAPI_PREVENT_ALLOW, 0, 0, 0, 1,
-			 0, 0, 0, 0, 0, 0, 0);
-    }
-}
-
-static int
-acd_open_disk(struct acd *cdp, int test)
-{
-    cdp->next_writeable_lba = 0;
-    return 0;
-}
-
-static int
-acd_close_disk(struct acd *cdp)
-{
-    return acd_request_wait(cdp, ATAPI_CLOSE_TRACK, 0x00,
-        		    0x02, 0, 0, 0/*track*/, 0, 0, 0, 0, 0, 0);
-}
-
-static int
-acd_open_track(struct acd *cdp, struct wormio_prepare_track *ptp)
-{
-    struct write_param param;
-    struct atapires result;
-
-    result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_MODE_SENSE,
-        			0, 0x05, 0, 0, 0, 0, 
-				sizeof(param)>>8, sizeof(param),
-        			0, 0, 0, 0, 0, 0, 0,
-        			(char *)&param, sizeof(param));
-
-    if (cdp->flags & F_DEBUG)
-        atapi_dump(cdp->ata->ctrlr, cdp->lun, "0x05", &param, sizeof(param));
-
-    if (result.code == RES_UNDERRUN)
-        result.code = 0;
-
-    if (result.code) {
-        atapi_error(cdp->ata, cdp->unit, result);
-        return EIO;
-    }
-    param.page_code = 0x05;
-    param.page_length = 0x32;
-    param.test_write = cdp->dummy ? 1 : 0;
-    param.write_type = CDR_WTYPE_TRACK;
-
-    switch (ptp->audio) {
-/*    switch (data_type) { */
-
-    case 0:
-/*    case CDR_DATA: */
-	cdp->block_size = 2048;
-    	param.track_mode = CDR_TMODE_DATA;
-    	param.data_block_type = CDR_DB_ROM_MODE1;
-    	param.session_format = CDR_SESS_CDROM;
-	break;
-
-    default:
-/*    case CDR_AUDIO: */
-	cdp->block_size = 2352;
-	if (ptp->preemp)
-    	    param.track_mode = CDR_TMODE_AUDIO;
-	else
-    	    param.track_mode = 0;
-    	param.data_block_type = CDR_DB_RAW;
-    	param.session_format = CDR_SESS_CDROM;
-	break;
-
-/*
-    case CDR_MODE2:
-    	param.track_mode = CDR_TMODE_DATA;
-    	param.data_block_type = CDR_DB_ROM_MODE2;
-    	param.session_format = CDR_SESS_CDROM;
-	break;
-
-    case CDR_XA1:
-    	param.track_mode = CDR_TMODE_DATA;
-    	param.data_block_type = CDR_DB_XA_MODE1;
-    	param.session_format = CDR_SESS_CDROM_XA;
-	break;
-
-    case CDR_XA2:
-    	param.track_mode = CDR_TMODE_DATA;
-    	param.data_block_type = CDR_DB_XA_MODE2_F1;
-    	param.session_format = CDR_SESS_CDROM_XA;
-	break;
-
-    case CDR_CDI:
-    	param.track_mode = CDR_TMODE_DATA;
-    	param.data_block_type = CDR_DB_XA_MODE2_F1;
-    	param.session_format = CDR_SESS_CDI;
-	break;
-*/
-    }
-
-    param.multi_session = CDR_MSES_NONE;
-    param.fp = 0;
-    param.packet_size = 0;
-
-    if (cdp->flags & F_DEBUG)
-        atapi_dump(cdp->ata->ctrlr, cdp->lun, "0x05", &param, sizeof(param));
-
-    result = atapi_request_wait(cdp->ata, cdp->unit, ATAPI_MODE_SELECT,
-        			0x10, 0, 0, 0, 0, 0, 
-				sizeof(param)>>8, sizeof(param),
-        			0, 0, 0, 0, 0, 0, 0,
-        			(char *)&param, -sizeof(param));
-
-    if (result.code == RES_UNDERRUN)
-        result.code = 0;
-
-    if (result.code) {
-        atapi_error(cdp->ata, cdp->unit, result);
-        return EIO;
-    }
-    return 0;
-}
-
-static int
-acd_close_track(struct acd *cdp)
-{
-    return acd_request_wait(cdp, ATAPI_SYNCHRONIZE_CACHE, 0,
-        		    0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-static int
-acd_read_track_info(struct acd *cdp, int lba, struct acd_track_info *info)
-{
-    int error;
-
-    error = acd_request_wait(cdp, ATAPI_READ_TRACK_INFO, 0x01,
-                             lba>>24, (lba>>16)&0xff,
-                             (lba>>8)&0xff, lba&0xff,
-		 	     0, 
-			     sizeof(*info)>>8, sizeof(*info), 0,
-			     (char *)info, sizeof(*info));
-    if (error)
-	return error;
-    info->track_start_addr = ntohl(info->track_start_addr);
-    info->next_writeable_addr = ntohl(info->next_writeable_addr);
-    info->free_blocks = ntohl(info->free_blocks);
-    info->fixed_packet_size = ntohl(info->fixed_packet_size);
-    info->track_length = ntohl(info->track_length);
-    return 0;
-}
-
-static int
-acd_blank_disk(struct acd *cdp)
-{
-    int error;
-
-    error = acd_request_wait(cdp, 0xa1, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    cdp->flags |= F_MEDIA_CHANGED;
-    cdp->flags &= ~(F_WRITTEN|F_TRACK_PREP|F_TRACK_PREPED);
-    return error;
-}
-
-static void
-atapi_error(struct atapi *ata, int unit, struct atapires result)
-{
-    if (result.code != RES_ERR) {
-        printf("atapi%d:%d: ERROR %d, status=%b, error=%b\n", 
-	       ata->ctrlr, unit, result.code, result.status, 
-	       ARS_BITS, result.error, AER_BITS);
-        return;
-    }
-    switch (result.error & AER_SKEY) {
-    case AER_SK_NOT_READY:
-        if (ata->debug)
-            printf("atapi%d:%d: not ready\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_BLANK_CHECK:
-        if (ata->debug)
-            printf("atapi%d:%d: blank check\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_MEDIUM_ERROR:
-        if (ata->debug)
-            printf("atapi%d:%d: medium error\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_HARDWARE_ERROR:
-        if (ata->debug)
-            printf("atapi%d:%d: hardware error\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_ILLEGAL_REQUEST:
-        if (ata->debug)
-            printf("atapi%d:%d: illegal request\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_UNIT_ATTENTION:
-        if (ata->debug)
-            printf("atapi%d:%d: unit attention\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_DATA_PROTECT:
-        if (ata->debug)
-            printf("atapi%d:%d: reading protected data\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_ABORTED_COMMAND:
-        if (ata->debug)
-            printf("atapi%d:%d: command aborted\n", ata->ctrlr, unit);
-        break;
-
-    case AER_SK_MISCOMPARE:
-        if (ata->debug)
-            printf("atapi%d:%d: data don't match medium\n", ata->ctrlr, unit);
-        break;
-
-    default:
-        if (ata->debug)
-            printf("atapi%d:%d: unknown error, status=%b, error=%b\n", 
-	       	   ata->ctrlr, unit, result.status, ARS_BITS, 
-	           result.error, AER_BITS);
-    }
-}
-
-static void 
-atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
-{
-	u_char *p = data;
-
-	printf ("atapi%d%d: %s %x", ctrlr, lun, label, *p++);
-	while (--len > 0) printf ("-%x", *p++);
-	printf ("\n");
-}
-
-static void 
-acd_drvinit(void *unused)
-{
-    cdevsw_add(&acd_cdevsw);
-}
-
-SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL)
-#endif /* NWCD && NWDC */
diff --git a/sys/i386/isa/atapi-cd.h b/sys/i386/isa/atapi-cd.h
deleted file mode 100644
index a666522..0000000
--- a/sys/i386/isa/atapi-cd.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/*-
- * Copyright (c) 1998, 1999 Søren Schmidt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * CDROM Table Of Contents
- */
-#define MAXTRK 99
-struct toc {
-	struct ioc_toc_header hdr;
-	struct cd_toc_entry tab[MAXTRK + 1];
-};
-
-/*
- * CDROM Audio Control Parameters Page
- */
-struct audiopage {
-	/* Mode Page data header */
-	u_short data_length;
-	u_char medium_type;
-	u_char dev_spec;
-	u_char unused[2];
-	u_short blk_desc_len;
-
-	/* Audio control page */
-	u_char page_code;
-#define CDROM_AUDIO_PAGE      0x0e
-#define CDROM_AUDIO_PAGE_MASK 0x4e
-
-	u_char param_len;
-	u_char flags;
-#define CD_PA_SOTC      0x02
-#define CD_PA_IMMED     0x04
-
-	u_char reserved3;
-	u_char reserved4;
-	u_char reserved5;
-	u_short lb_per_sec;
-	struct port_control {
-		u_char channels:4;
-#define CHANNEL_0       1
-#define CHANNEL_1       2
-#define CHANNEL_2       4
-#define CHANNEL_3       8
-		u_char volume;
-	}            port[4];
-};
-
-/*
- * CDROM Capabilities and Mechanical Status Page
- */
-struct cappage {
-	/* Mode data header */
-	u_short data_length;
-	u_char medium_type;		/* Present media type */
-#define MST_TYPE_MASK_LOW	0x0f
-#define MST_FMT_NONE		0x00
-#define MST_DATA_120    	0x01
-#define MST_AUDIO_120  		0x02
-#define MST_COMB_120    	0x03
-#define MST_PHOTO_120   	0x04
-#define MST_DATA_80     	0x05
-#define MST_AUDIO_80    	0x06
-#define MST_COMB_80     	0x07
-#define MST_PHOTO_80    	0x08
-
-#define MST_TYPE_MASK_HIGH	0x70
-#define MST_CDROM		0x00
-#define MST_CDR	 		0x10
-#define MST_CDRW		0x20
-
-#define MST_NO_DISC     	0x70
-#define MST_DOOR_OPEN  	 	0x71
-#define MST_FMT_ERROR   	0x72
-
-	u_char dev_spec;
-	u_char unused[2];
-	u_short blk_desc_len;
-
-	/* Capabilities page */
-	u_char page_code;
-#define ATAPI_CDROM_CAP_PAGE        0x2a
-
-	u_char param_len;
-	u_char read_cdr:1;		/* Supports CD-R read */
-	u_char read_cdrw:1;		/* Supports CD-RW read */
-	u_char method2:1;		/* Supports reading packet tracks */
-	u_char byte2_37:5;
-	u_char write_cdr:1;		/* Supports CD-R write */
-	u_char write_cdrw:1;		/* Supports CD-RW write */
-	u_char test_write:1;		/* Supports test writing */
-	u_char byte3_37:5;
-	u_char audio_play:1;		/* Audio play supported */
-	u_char composite:1;		/* Composite audio/video supported */
-	u_char dport1:1;		/* Digital audio on port 1 */
-	u_char dport2:1;		/* Digital audio on port 2 */
-	u_char mode2_form1:1;		/* Mode 2 form 1 (XA) read */
-	u_char mode2_form2:1;		/* Mode 2 form 2 format */
-	u_char multisession:1;		/* Multi-session photo-CD */
-	u_char:1;
-	u_char cd_da:1;			/* Audio-CD read supported */
-	u_char cd_da_stream:1;		/* CD-DA streaming */
-	u_char rw:1;			/* Combined R-W subchannels */
-	u_char rw_corr:1;		/* R-W subchannel data corrected */
-	u_char c2:1;			/* C2 error pointers supported */
-	u_char isrc:1;			/* Can return the ISRC info */
-	u_char upc:1;			/* Can return the catalog number UPC */
-	u_char:1;
-	u_char lock:1;			/* Can be locked */
-	u_char locked:1;		/* Current lock state */
-	u_char prevent:1;		/* Prevent jumper installed */
-	u_char eject:1;			/* Can eject */
-	u_char:1;
-	u_char mech:3;			/* Loading mechanism type */
-#define MST_MECH_CADDY      0
-#define MST_MECH_TRAY       1
-#define MST_MECH_POPUP      2
-#define MST_MECH_CHANGER    4
-#define MST_MECH_CARTRIDGE  5
-
-	u_char sep_vol:1;		/* Independent volume of channels */
-	u_char sep_mute:1;		/* Independent mute of channels */
-	u_char:6;
-
-	u_short max_speed;		/* Max raw data rate in bytes/1000 */
-	u_short max_vol_levels;		/* Number of discrete volume levels */
-	u_short buf_size;		/* Internal buffer size in bytes/1024 */
-	u_short cur_speed;		/* Current data rate in bytes/1000  */
-
-	u_char reserved3;
-	u_char bckf:1;			/* Data valid on failing edge of BCK */
-	u_char rch:1;			/* High LRCK indicates left channel */
-	u_char lsbf:1;			/* Set if LSB first */
-	u_char dlen:2;
-#define MST_DLEN_32         0
-#define MST_DLEN_16         1
-#define MST_DLEN_24         2
-#define MST_DLEN_24_I2S     3
-
-	u_char:3;
-	u_char reserved4[2];
-};
-
-/*
- * CDROM Changer mechanism status structure
- */
-struct changer {
-	u_char current_slot:5;		/* Active changer slot */
-	u_char mech_state:2;		/* Current changer state */
-#define CH_READY	0
-#define CH_LOADING	1
-#define CH_UNLOADING	2
-#define CH_INITIALIZING	3
-
-	u_char fault:1;			/* Fault in last operation */
-	u_char reserved0:5;
-	u_char cd_state:3;		/* Current mechanism state */
-#define CD_IDLE		0
-#define CD_AUDIO_ACTIVE	1
-#define CD_AUDIO_SCAN	2
-#define CD_HOST_ACTIVE	3
-#define CD_NO_STATE	7
-
-	u_char current_lba[3];		/* Current LBA */
-	u_char slots;			/* Number of available slots */
-	u_short table_length;		/* Slot table length */
-	struct {
-		u_char changed:1;	/* Media has changed in this slot */
-		u_char unused:6;
-		u_char present:1;	/* Slot has a CD present */
-		u_char reserved0;
-		u_char reserved1;
-		u_char reserved2;
-	}      slot[32];
-};
-
-/*
- * CDROM Write Parameters Mode Page (Burners ONLY)
- */
-struct write_param {
-	/* Mode Page data header */
-	u_short data_length;
-	u_char medium_type;
-	u_char dev_spec;
-	u_char unused[2];
-	u_short blk_desc_len;
-
-	/* Write Parameters mode page */
-	u_char page_code;		/* 0x05 */
-	u_char page_length;		/* 0x32 */
-	u_char write_type:4;		/* Write stream type */
-#define	CDR_WTYPE_PACKET	0x00
-#define	CDR_WTYPE_TRACK		0x01
-#define	CDR_WTYPE_SESSION	0x02
-#define	CDR_WTYPE_RAW		0x03
-
-	u_char test_write:1;		/* Test write enable */
-	u_char reserved2_567:3;
-	u_char track_mode:4;		/* Track mode */
-#define CDR_TMODE_AUDIO		0x01
-#define CDR_TMODE_INCR_DATA	0x01
-#define CDR_TMODE_ALLOW_COPY	0x02
-#define CDR_TMODE_DATA		0x04
-#define CDR_TMODE_QUAD_AUDIO	0x08
-
-	u_char copy:1;			/* Generation stamp */
-	u_char fp:1;			/* Fixed packet type */
-	u_char multi_session:2;		/* Multi-session type */
-#define	CDR_MSES_NONE		0x00
-#define	CDR_MSES_FINAL		0x01
-#define	CDR_MSES_RESERVED	0x02
-#define	CDR_MSES_NULTI		0x03
-
-	u_char data_block_type:4;	/* Data block type code */
-#define CDR_DB_RAW		0x0	/* 2352 bytes of raw data */
-#define	CDR_DB_RAW_PQ		0x1	/* 2368 bytes raw data + P/Q subchan */
-#define	CDR_DB_RAW_PW		0x2	/* 2448 bytes raw data + P-W subchan */
-#define	CDR_DB_RAW_PW_R		0x3	/* 2448 bytes raw data + P-W raw sub */
-#define	CDR_DB_RES_4		0x4	/* Reserved */
-#define	CDR_DB_RES_5		0x5	/* Reserved */
-#define	CDR_DB_RES_6		0x6	/* Reserved */
-#define	CDR_DB_VS_7		0x7	/* Vendor specific */
-#define	CDR_DB_ROM_MODE1	0x8	/* 2048 bytes Mode 1 (ISO/IEC 10149) */
-#define	CDR_DB_ROM_MODE2	0x9	/* 2336 bytes Mode 2 (ISO/IEC 10149) */
-#define	CDR_DB_XA_MODE1		0x10	/* 2048 bytes Mode 1 (CD-ROM XA 1) */
-#define	CDR_DB_XA_MODE2_F1	0x11	/* 2056 bytes Mode 2 (CD-ROM XA 1) */
-#define	CDR_DB_XA_MODE2_F2	0x12	/* 2324 bytes Mode 2 (CD-ROM XA 2) */
-#define	CDR_DB_XA_MODE2_MIX	0x13	/* 2332 bytes Mode 2 (CD-ROM XA 1/2) */
-#define	CDR_DB_RES_14		0x14	/* Reserved */
-#define	CDR_DB_VS_15		0x15	/* Vendor specific */
-
-	u_char reserved4_4567:4;
-	u_char reserved5;
-	u_char reserved6;
-	u_char host_app_code:6;		/* Host application code */
-	u_char reserved7_67:2;
-	u_char session_format;		/* Session format */
-#define CDR_SESS_CDROM		0x00
-#define CDR_SESS_CDI		0x10
-#define CDR_SESS_CDROM_XA	0x20
-
-	u_char reserved9;
-	u_int packet_size;		/* Packet size in bytes */
-	u_short audio_pause_length;	/* Audio pause length in secs */
-	u_char media_catalog_number[16];
-	u_char isr_code[16];
-	u_char sub_hdr_byte0;
-	u_char sub_hdr_byte1;
-	u_char sub_hdr_byte2;
-	u_char sub_hdr_byte3;
-/*
-	u_char 	vendor_specific_byte0;
-	u_char 	vendor_specific_byte1;
-	u_char 	vendor_specific_byte2;
-	u_char 	vendor_specific_byte3;
-*/
-
-} __attribute__((packed));
-/*
- * CDROM Read Track Information structure
- */
-struct acd_track_info {
-        u_short data_length;
-	u_char	track_number;		/* Current track number */
-	u_char	session_number;		/* Current session number */
-	u_char	reserved4;
-	u_char	track_mode:4;		/* Mode of this track */
-	u_char	copy:1;			/* Generation stamp */
-	u_char	damage:1;		/* Damaged track */
-	u_char	reserved5_67:2;
-	u_char	data_mode:4;		/* Data mode of this disc */
-	u_char	fp:1;			/* Fixed packet */
-	u_char	packet:1;		/* Packet track */
-	u_char	blank:1;		/* Blank (empty) track */
-	u_char	rt:1;			/* Reserved track */
-	u_char	nwa_valid:1;		/* next_writeable_addr field valid */
-	u_char	reserved7_17:7;
-	u_int	track_start_addr;	/* Start of this track */
-	u_int	next_writeable_addr;	/* Next writeable addr on this disc */
-	u_int	free_blocks;		/* Free block on this disc */
-	u_int	fixed_packet_size;	/* Size of packets on this track */
-	u_int	track_length;		/* Length of this track */
-};
-
-/*
- * Structure describing an ATAPI CDROM device
- */
-struct acd {
-	int unit;			/* IDE bus drive unit */
-	int lun;			/* Logical device unit */
-	int flags;			/* Device state flags */
-	int refcnt;			/* The number of raw opens */
-	struct atapi *ata;		/* Controller structure */
-	struct buf_queue_head buf_queue;	/* Queue of i/o requests */
-	struct atapi_params *param;	/* Drive parameters table */
-	struct toc toc;			/* Table of disc contents */
-	struct {
-		u_long volsize;		/* Volume size in blocks */
-		u_long blksize;		/* Block size in bytes */
-	}      info;
-	struct audiopage au;		/* Audio page info */
-	struct cappage cap;		/* Capabilities page info */
-	struct audiopage aumask;	/* Audio page mask */
-	struct {			/* Subchannel info */
-		u_char void0;
-		u_char audio_status;
-		u_short data_length;
-		u_char data_format;
-		u_char control;
-		u_char track;
-		u_char indx;
-		u_long abslba;
-		u_long rellba;
-	} subchan;
-	struct changer *changer_info;	/* Changer info */
-	int slot;			/* This lun's slot number */
-	struct devstat *device_stats;	/* Devstat parameters */
-	u_int block_size;		/* Blocksize currently used */
-	u_char dummy;			/* Use dummy writes */
-	u_char speed;			/* Select drive speed */
-	u_int next_writeable_lba;	/* Next writable position */
-	struct wormio_prepare_track preptrack;	/* Scratch region */
-};
diff --git a/sys/i386/isa/atapi.h b/sys/i386/isa/atapi.h
index c57b41d..66989a4 100644
--- a/sys/i386/isa/atapi.h
+++ b/sys/i386/isa/atapi.h
@@ -15,6 +15,9 @@
  * $FreeBSD$
  */
 
+#define atapi_attach wdc_atapi_attach
+#define acdattach wdc_acdattach
+
 /*
  * Disk Controller ATAPI register definitions.
  */
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index 898af01..e210a3f 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.c
@@ -47,7 +47,7 @@
 #include <sys/conf.h>
 #include <sys/stat.h>
 #include <i386/isa/atapi.h>
-#include <i386/isa/atapi-cd.h>
+#include <i386/isa/wd_cd.h>
 
 static d_open_t		acdopen;
 static d_close_t	acdclose;