Initial integration of pieces of Manuel's patch5. From the announce:

	- integration of Milton Ngan's patch, which provide audio
	  command support.

..with lots of cleaning up by me.

Audio is still untested.  This will change shortly.

3 files changed, 553 insertions, 380 deletions

diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c
index e5dfa3a4f0f..20d026705fe 100644
--- a/sys/dev/atapi/acd.c
+++ b/sys/dev/atapi/acd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acd.c,v 1.5 1996/06/10 08:01:06 downsj Exp $	*/
+/*	$OpenBSD: acd.c,v 1.6 1996/07/22 03:35:41 downsj Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -55,6 +55,15 @@
 #define	CDPART(z)			DISKPART(z)
 #define	MAKECDDEV(maj, unit, part)	MAKEDISKDEV(maj, unit, part)
 
+#define MAXTRACK	99
+#define CD_BLOCK_OFFSET	150
+#define CD_FRAMES	75
+#define CD_SECS		60
+struct cd_toc {
+	struct ioc_toc_header hdr;
+	struct cd_toc_entry tab[MAXTRACK+1];	/* One extra for the leadout */
+};
+
 #ifdef ACD_DEBUG
 #define ACD_DEBUG_PRINT(args)		printf args
 #else
@@ -77,7 +86,8 @@ struct acd_softc {
 #define	CDF_WLABEL	0x04		/* label is writable */
 #define	CDF_LABELLING	0x08		/* writing label */
 	struct	at_dev_link *ad_link;	/* contains our drive number, etc ... */
-	struct	cappage cap;		/* drive capabilities */
+	struct	atapi_mode_data mode_page;	/* drive capabilities */
+
 	struct	cd_parms {
 		int	blksize;
 		u_long	disksize;	/* total number sectors */
@@ -104,6 +114,18 @@ int	acd_pause __P((struct acd_softc *, int));
 void	acdminphys __P((struct buf*));
 u_long	acd_size __P((struct acd_softc*, int));
 int	acddone __P((struct atapi_command_packet *));
+int	acd_get_mode __P((struct acd_softc *, struct atapi_mode_data *, int, int, int));
+int	acd_set_mode __P((struct acd_softc *, struct atapi_mode_data *, int));
+int	acd_setchan __P((struct acd_softc *, u_char, u_char, u_char, u_char));
+int	acd_play __P((struct acd_softc *, int, int));
+int	acd_play_big __P((struct acd_softc *, int, int));
+int	acd_load_toc __P((struct acd_softc *, struct cd_toc *));
+int	acd_play_tracks __P((struct acd_softc *, int, int, int, int));
+int	acd_play_msf __P((struct acd_softc *, int, int, int, int, int, int));
+int	acd_read_subchannel __P((struct acd_softc *, int, int, int, struct cd_sub_channel_info *, int));
+int	acd_read_toc __P((struct acd_softc *, int, int, void *, int));
+u_long	msf2lba __P((u_char, u_char, u_char ));
+
 
 struct dkdriver acddkdriver = { acdstrategy };
 
@@ -124,6 +146,7 @@ acdmatch(parent, match, aux)
 	    sa->id.config.device_type & ATAPI_DEVICE_TYPE_MASK);
 #endif
 
+	/* XXX!!! */
 	if (((sa->id.config.device_type & ATAPI_DEVICE_TYPE_MASK) ==
 	    ATAPI_DEVICE_TYPE_CD) ||
 	   (((sa->id.config.device_type & ATAPI_DEVICE_TYPE_MASK) ==
@@ -144,7 +167,7 @@ acdattach(parent, self, aux)
 {
 	struct acd_softc *acd = (void *)self;
 	struct at_dev_link *sa = aux;
-	struct mode_sense cmd;
+	struct atapi_cappage *cap;
 
 	printf("\n");
 
@@ -164,43 +187,34 @@ acdattach(parent, self, aux)
 
 	dk_establish(&acd->sc_dk, &acd->sc_dev);   
 
-	(void)atapi_test_unit_ready(sa, A_POLLED | A_SILENT); 
-	delay(1000);
-	(void)atapi_test_unit_ready(sa, A_POLLED | A_SILENT);
+	if (atapi_test_unit_ready(sa, A_POLLED | A_SILENT) != 0) {
+		/* To clear media change, etc ...*/
+		delay(1000);
+		(void)atapi_test_unit_ready(sa, A_POLLED | A_SILENT);
+	}
 
-	/* To clear media change, etc ...*/
-	bzero(&cmd, sizeof(cmd));
-	cmd.operation_code = ATAPI_MODE_SENSE;
-	cmd.page_code_control = CAP_PAGE;
-	_lto2b(sizeof(struct cappage), cmd.length);
-	if (atapi_exec_cmd(sa, &cmd , sizeof(cmd), &acd->cap,
-	    sizeof(struct cappage), B_READ, A_POLLED) != 0) {
-		printf("%s: can't MODE SENSE: atapi_exec_cmd failed\n",
-		    self->dv_xname);
+	if (acd_get_mode(acd, &acd->mode_page, ATAPI_CAP_PAGE, CAPPAGESIZE,
+			 A_POLLED) != 0) {
+		printf("%s: can't MODE SENSE: acd_get_mode failed\n",
+		       self->dv_xname);
 		return;
 	}
 
 	/*
-	 * Fix cappage entries in place.
-	 */
-	acd->cap.max_speed = _2btos((u_int8_t *)&acd->cap.max_speed);
-	acd->cap.max_vol_levels = _2btos((u_int8_t *)&acd->cap.max_vol_levels);
-	acd->cap.buf_size = _2btos((u_int8_t *)&acd->cap.buf_size);
-	acd->cap.cur_speed = _2btos((u_int8_t *)&acd->cap.cur_speed);
-
-	/*
 	 * Display useful information about the drive (not media!).
 	 */
+	cap = &acd->mode_page.page_cap;
+
 	printf ("%s: ", self->dv_xname);
-	if (acd->cap.cur_speed != acd->cap.max_speed)
-		printf ("%d/", acd->cap.cur_speed * 1000 / 1024);
-	printf ("%dKb/sec", acd->cap.max_speed * 1000 / 1024);
-	if (acd->cap.buf_size)
-		printf (", %dKb cache", acd->cap.buf_size);
-	if (acd->cap.format_cap & FORMAT_AUDIO_PLAY)
+	if (cap->cur_speed != cap->max_speed)
+		printf ("%d/", cap->cur_speed * 1000 / 1024);
+	printf ("%dKb/sec", cap->max_speed * 1000 / 1024);
+	if (cap->buf_size)
+		printf (", %dKb cache", cap->buf_size);
+	if (cap->format_cap & FORMAT_AUDIO_PLAY)
 		printf (", audio play");
-	if (acd->cap.max_vol_levels)
-		printf (", %d volume levels", acd->cap.max_vol_levels);
+	if (cap->max_vol_levels)
+		printf (", %d volume levels", cap->max_vol_levels);
 	printf ("\n");
 }
 
@@ -264,14 +278,15 @@ acdopen(dev, flag, fmt)
 
 	ad_link = acd->ad_link;
 
-	if ((error = atapi_test_unit_ready(ad_link,0)) != 0) {
+	if ((error = atapi_test_unit_ready(ad_link, 0)) != 0) {
 		if (error != UNIT_ATTENTION)
 			return EIO;
 		if ((ad_link->flags & ADEV_OPEN) != 0)
 			return EIO;
 	}
 
-	if (error = acdlock(acd))
+	error = acdlock(acd);
+	if (error)
 		return error;
 
 	if (acd->sc_dk.dk_openmask != 0) {
@@ -486,7 +501,7 @@ acdstart(acd)
 	struct at_dev_link *ad_link;
 	struct buf *bp = 0;
 	struct buf *dp;
-	struct read cmd;
+	struct atapi_read cmd;
 	u_int32_t blkno, nblks;
 	struct partition *p;
 
@@ -498,7 +513,7 @@ acdstart(acd)
 		return;
 	}
 #endif
-		
+
 	ad_link = acd->ad_link;
 
 #ifdef DIAGNOSTIC
@@ -574,7 +589,7 @@ acdstart(acd)
 		 *  Fill out the atapi command
 		 */
 		bzero(&cmd, sizeof(cmd));
-		cmd.operation_code = ATAPI_READ;
+		cmd.opcode = ATAPI_READ;
 		_lto4b(blkno, cmd.lba);
 		_lto2b(nblks, cmd.length);
 
@@ -609,6 +624,31 @@ acdwrite(dev, uio)
 }
 
 /*
+ * conversion between minute-seconde-frame and logical block adress
+ * adresses format
+ */
+void
+lba2msf (lba, m, s, f)
+	u_long lba;
+	u_char *m, *s, *f;
+{
+	u_long tmp;
+	tmp = lba + CD_BLOCK_OFFSET;	/* offset of first logical frame */
+	tmp &= 0xffffff;		/* negative lbas use only 24 bits */
+	*m = tmp / (CD_SECS * CD_FRAMES);
+	tmp %= (CD_SECS * CD_FRAMES);
+	*s = tmp / CD_FRAMES;
+	*f = tmp % CD_FRAMES;
+}
+
+u_long
+msf2lba (m, s, f)
+	u_char m, s, f;
+{
+	return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_BLOCK_OFFSET;
+}
+
+/*
  * Perform special action on behalf of the user.
  * Knows about the internals of this device
  */
@@ -663,236 +703,154 @@ acdioctl(dev, cmd, addr, flag, p)
 	case DIOCWLABEL:
 		return EROFS;
 
-#ifdef notyet
-	case CDIOCPLAYTRACKS:
-		{
+	case CDIOCPLAYTRACKS: {
 		struct ioc_play_track *args = (struct ioc_play_track *)addr;
-		struct acd_mode_data data;
-		if (error = acd_get_mode(acd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.flags &= ~CD_PA_SOTC;
-		data.page.audio.flags |= CD_PA_IMMED;
-		if (error = acd_set_mode(acd, &data))
-			return error;
+
 		return acd_play_tracks(acd, args->start_track,
-		    args->start_index, args->end_track, args->end_index);
+				       args->start_index, args->end_track,
+				       args->end_index);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCPLAYMSF:
-		{
-		struct ioc_play_msf *args
-		= (struct ioc_play_msf *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.flags &= ~CD_PA_SOTC;
-		data.page.audio.flags |= CD_PA_IMMED;
-		if (error = cd_set_mode(cd, &data))
-			return error;
-		return cd_play_msf(cd, args->start_m, args->start_s,
-		    args->start_f, args->end_m, args->end_s, args->end_f);
+	case CDIOCPLAYMSF: {
+		struct ioc_play_msf *args = (struct ioc_play_msf *)addr;
+
+		return acd_play_msf(acd, args->start_m, args->start_s,
+				    args->start_f, args->end_m, args->end_s,
+				    args->end_f);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCPLAYBLOCKS:
-	{
-		struct ioc_play_blocks *args
-		= (struct ioc_play_blocks *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.flags &= ~CD_PA_SOTC;
-		data.page.audio.flags |= CD_PA_IMMED;
-		if (error = cd_set_mode(cd, &data))
-			return error;
-		return cd_play(cd, args->blk, args->len);
+	case CDIOCPLAYBLOCKS: {
+		struct ioc_play_blocks *args = (struct ioc_play_blocks *)addr;
+
+		return acd_play(acd, args->blk, args->len);
 	}
-#endif
 
-#ifdef notyet 
-	case CDIOCREADSUBCHANNEL:
-	{
+	case CDIOCREADSUBCHANNEL: {
 		struct ioc_read_subchannel *args
-		= (struct ioc_read_subchannel *)addr;
+				= (struct ioc_read_subchannel *)addr;
 		struct cd_sub_channel_info data;
 		int len = args->data_len;
+
 		if (len > sizeof(data) ||
 		    len < sizeof(struct cd_sub_channel_header))
 			return EINVAL;
-		if (error = cd_read_subchannel(cd, args->address_format,
-		    args->data_format, args->track, &data, len))
+
+		if (error = acd_read_subchannel(acd, args->address_format,
+		    				args->data_format, args->track,
+						&data, len))
 			return error;
-		len = min(len, ((data.header.data_len[0] << 8) +
-		    data.header.data_len[1] +
-		    sizeof(struct cd_sub_channel_header)));
 		return copyout(&data, args->data, len);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOREADTOCHEADER:
-	{
-		struct ioc_toc_header th;
-		if (error = cd_read_toc(cd, 0, 0, &th, sizeof(th)))
+	case CDIOREADTOCHEADER: {
+		struct ioc_toc_header hdr;
+
+		if (error = acd_read_toc(acd, 0, 0, &hdr, sizeof(hdr)))
 			return error;
-		th.len = ntohs(th.len);
-		bcopy(&th, addr, sizeof(th));
+		hdr.len = ntohs(hdr.len);
+		bcopy(&hdr, addr, sizeof(hdr));
 		return 0;
 	}
-#endif
 
-#ifdef notyet
-	case CDIOREADTOCENTRYS:
-	{
-		struct cd_toc {
-			struct ioc_toc_header header;
-			struct cd_toc_entry entries[65];
-		} data;
+	case CDIOREADTOCENTRYS: {
 		struct ioc_read_toc_entry *te =
-		(struct ioc_read_toc_entry *)addr;
-		struct ioc_toc_header *th;
+				(struct ioc_read_toc_entry *)addr;
+		struct cd_toc toc;
+		struct ioc_toc_header *th = &toc.hdr;
 		int len = te->data_len;
-		th = &data.header;
+		int ntracks;
 
-		if (len > sizeof(data.entries) ||
+		if (len > sizeof(toc.tab) ||
 		    len < sizeof(struct cd_toc_entry))
 			return EINVAL;
-		if (error = cd_read_toc(cd, te->address_format,
-		    te->starting_track, (struct cd_toc_entry *)&data,
-		    len + sizeof(struct ioc_toc_header)))
+
+		if (error = acd_read_toc(acd, te->address_format,
+		    			 te->starting_track, &toc,
+		    			 len + sizeof(struct ioc_toc_header)))
 			return error;
-		len = min(len, ntohs(th->len) - (sizeof(th->starting_track) +
-		    sizeof(th->ending_track)));
-		return copyout(data.entries, te->data, len);
+
+		if (te->address_format == CD_LBA_FORMAT) {
+		    for (ntracks = th->ending_track - th->starting_track + 1;
+		         ntracks >= 0; ntracks--) {
+			toc.tab[ntracks].addr_type = CD_LBA_FORMAT;
+			(u_int32_t)(*toc.tab[ntracks].addr.addr) =
+				ntohl((u_int32_t)(*toc.tab[ntracks].addr.addr));
+		    }
+		}
+		th->len = ntohs(th->len);
+
+		len = min(len, th->len - sizeof(struct ioc_toc_header));
+		return copyout(toc.tab, te->data, len);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCSETPATCH:
-	{
+	case CDIOCSETPATCH: {
 		struct ioc_patch *arg = (struct ioc_patch *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.port[LEFT_PORT].channels = arg->patch[0];
-		data.page.audio.port[RIGHT_PORT].channels = arg->patch[1];
-		data.page.audio.port[2].channels = arg->patch[2];
-		data.page.audio.port[3].channels = arg->patch[3];
-		return cd_set_mode(cd, &data);
+
+		return acd_setchan(acd, arg->patch[0], arg->patch[1],
+				   arg->patch[2], arg->patch[3]);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCGETVOL:
-	{
+	case CDIOCGETVOL: {
 		struct ioc_vol *arg = (struct ioc_vol *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
+		struct atapi_mode_data data;
+		if (error = acd_get_mode(acd, &data, ATAPI_AUDIO_PAGE,
+					   AUDIOPAGESIZE, 0))
 			return error;
-		arg->vol[LEFT_PORT] = data.page.audio.port[LEFT_PORT].volume;
-		arg->vol[RIGHT_PORT] = data.page.audio.port[RIGHT_PORT].volume;
-		arg->vol[2] = data.page.audio.port[2].volume;
-		arg->vol[3] = data.page.audio.port[3].volume;
+		arg->vol[0] = data.page_audio.port[0].volume;
+		arg->vol[1] = data.page_audio.port[1].volume;
+		arg->vol[2] = data.page_audio.port[2].volume;
+		arg->vol[3] = data.page_audio.port[3].volume;
 		return 0;
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCSETVOL:
-	{
+	case CDIOCSETVOL: {
 		struct ioc_vol *arg = (struct ioc_vol *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
+		struct atapi_mode_data data, mask;
+
+		if (error = acd_get_mode(acd, &data, ATAPI_AUDIO_PAGE,
+					 AUDIOPAGESIZE, 0))
 			return error;
-		data.page.audio.port[LEFT_PORT].channels = CHANNEL_0;
-		data.page.audio.port[LEFT_PORT].volume = arg->vol[LEFT_PORT];
-		data.page.audio.port[RIGHT_PORT].channels = CHANNEL_1;
-		data.page.audio.port[RIGHT_PORT].volume = arg->vol[RIGHT_PORT];
-		data.page.audio.port[2].volume = arg->vol[2];
-		data.page.audio.port[3].volume = arg->vol[3];
-		return cd_set_mode(cd, &data);
-	}
-#endif
 
-#ifdef notyet
-	case CDIOCSETMONO:
-	{
-		struct ioc_vol *arg = (struct ioc_vol *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
+		if (error = acd_get_mode(acd, &mask, ATAPI_AUDIO_PAGE_MASK,
+					 AUDIOPAGESIZE, 0))
 			return error;
-		data.page.audio.port[LEFT_PORT].channels =
-		    LEFT_CHANNEL | RIGHT_CHANNEL | 4 | 8;
-		data.page.audio.port[RIGHT_PORT].channels =
-		    LEFT_CHANNEL | RIGHT_CHANNEL;
-		data.page.audio.port[2].channels = 0;
-		data.page.audio.port[3].channels = 0;
-		return cd_set_mode(cd, &data);
+
+		data.page_audio.port[0].volume = arg->vol[0] &
+		    mask.page_audio.port[0].volume;
+		data.page_audio.port[1].volume = arg->vol[1] &
+		    mask.page_audio.port[1].volume;
+		data.page_audio.port[2].volume = arg->vol[2] &
+		    mask.page_audio.port[2].volume;
+		data.page_audio.port[3].volume = arg->vol[3] &
+		    mask.page_audio.port[3].volume;
+
+		return acd_set_mode(acd, &data, AUDIOPAGESIZE);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCSETSTEREO:
-	{
-		struct ioc_vol *arg = (struct ioc_vol *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.port[LEFT_PORT].channels = LEFT_CHANNEL;
-		data.page.audio.port[RIGHT_PORT].channels = RIGHT_CHANNEL;
-		data.page.audio.port[2].channels = 0;
-		data.page.audio.port[3].channels = 0;
-		return cd_set_mode(cd, &data);
+	case CDIOCSETMONO: {
+		return acd_setchan(acd, BOTH_CHANNEL, BOTH_CHANNEL,
+				   MUTE_CHANNEL, MUTE_CHANNEL);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCSETMUTE:
-	{
-		struct ioc_vol *arg = (struct ioc_vol *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.port[LEFT_PORT].channels = 0;
-		data.page.audio.port[RIGHT_PORT].channels = 0;
-		data.page.audio.port[2].channels = 0;
-		data.page.audio.port[3].channels = 0;
-		return cd_set_mode(cd, &data);
+	case CDIOCSETSTEREO: {
+		return acd_setchan(acd, LEFT_CHANNEL, RIGHT_CHANNEL,
+				   MUTE_CHANNEL, MUTE_CHANNEL);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCSETLEFT:
-	{
-		struct ioc_vol *arg = (struct ioc_vol *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.port[LEFT_PORT].channels = LEFT_CHANNEL;
-		data.page.audio.port[RIGHT_PORT].channels = LEFT_CHANNEL;
-		data.page.audio.port[2].channels = 0;
-		data.page.audio.port[3].channels = 0;
-		return cd_set_mode(cd, &data);
+	case CDIOCSETMUTE: {
+		return acd_setchan(acd, MUTE_CHANNEL, MUTE_CHANNEL,
+				   MUTE_CHANNEL, MUTE_CHANNEL);
 	}
-#endif
 
-#ifdef notyet
-	case CDIOCSETRIGHT:
-	{
-		struct ioc_vol *arg = (struct ioc_vol *)addr;
-		struct cd_mode_data data;
-		if (error = cd_get_mode(cd, &data, AUDIO_PAGE))
-			return error;
-		data.page.audio.port[LEFT_PORT].channels = RIGHT_CHANNEL;
-		data.page.audio.port[RIGHT_PORT].channels = RIGHT_CHANNEL;
-		data.page.audio.port[2].channels = 0;
-		data.page.audio.port[3].channels = 0;
-		return cd_set_mode(cd, &data);
+	case CDIOCSETLEFT: {
+		return acd_setchan(acd, LEFT_CHANNEL, LEFT_CHANNEL,
+				   MUTE_CHANNEL, MUTE_CHANNEL);
+	}
+
+	case CDIOCSETRIGHT: {
+		return acd_setchan(acd, RIGHT_CHANNEL, RIGHT_CHANNEL,
+				   MUTE_CHANNEL, MUTE_CHANNEL);
 	}
-#endif
 
 	case CDIOCRESUME:
 		return acd_pause(acd, PA_RESUME);
@@ -932,7 +890,7 @@ acdioctl(dev, cmd, addr, flag, p)
 	}
 
 #ifdef DIAGNOSTIC
-	panic("cdioctl: impossible");
+	panic("acdioctl: impossible");
 #endif
 }
 
@@ -992,8 +950,8 @@ acd_size(cd, flags)
 	struct acd_softc *cd;
 	int flags;
 {
-	struct read_cd_capacity_data rdcap;
-	struct read_cd_capacity cmd;
+	struct atapi_read_cd_capacity_data rdcap;
+	struct atapi_read_cd_capacity cmd;
 	u_long blksize;
 	u_long size;
 
@@ -1002,7 +960,7 @@ acd_size(cd, flags)
 	 * it for you.
 	 */
 	bzero(&cmd, sizeof(cmd));
-	cmd.operation_code = ATAPI_READ_CD_CAPACITY;
+	cmd.opcode = ATAPI_READ_CD_CAPACITY;
 	cmd.len = sizeof(rdcap);
 
 	/*
@@ -1029,133 +987,210 @@ acd_size(cd, flags)
 	return size;
 }
 
-#ifdef notyet
 /*
  * Get the requested page into the buffer given
  */
 int
-cd_get_mode(cd, data, page)
-	struct acd_softc *cd;
-	struct cd_mode_data *data;
-	int page;
+acd_get_mode(acd, data, page, len, flags)
+	struct acd_softc *acd;
+	struct atapi_mode_data *data;
+	int page, len, flags;
 {
-	struct scsi_mode_sense scsi_cmd;
+	struct atapi_mode_sense atapi_cmd;
 	int error;
 
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	bzero(data, sizeof(*data));
-	scsi_cmd.opcode = MODE_SENSE;
-	scsi_cmd.page = page;
-	scsi_cmd.length = sizeof(*data) & 0xff;
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), (u_char *)data, sizeof(*data), CDRETRIES, 20000,
-	    NULL, SCSI_DATA_IN);
+	bzero(&atapi_cmd, sizeof(atapi_cmd));
+	bzero(data, sizeof(struct atapi_mode_data));
+	atapi_cmd.opcode = ATAPI_MODE_SENSE;
+	atapi_cmd.page_code_control = page;
+	_lto2b(len, atapi_cmd.length);
+
+	error = atapi_exec_cmd(acd->ad_link, &atapi_cmd, sizeof(atapi_cmd),
+			       data, len, B_READ, flags);
+	if (!error) {
+		switch(page) {
+		case ATAPI_CAP_PAGE: {
+			struct atapi_cappage *fix = &data->page_cap;
+        		/*
+	         	 * Fix cappage entries in place.
+			 */
+			fix->max_speed = _2btos((u_int8_t *)&fix->max_speed);
+			fix->max_vol_levels = _2btos((u_int8_t *)&fix->max_vol_levels);
+			fix->buf_size = _2btos((u_int8_t *)&fix->buf_size);
+			fix->cur_speed = _2btos((u_int8_t *)&fix->cur_speed);
+			} break;
+		}
+	}
+
+	return(error);
 }
 
 /*
  * Get the requested page into the buffer given
  */
 int
-cd_set_mode(cd, data)
-	struct acd_softc *cd;
-	struct cd_mode_data *data;
+acd_set_mode(acd, data, len)
+	struct acd_softc *acd;
+	struct atapi_mode_data *data;
+	int len;
 {
-	struct scsi_mode_select scsi_cmd;
-
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = MODE_SELECT;
-	scsi_cmd.byte2 |= SMS_PF;
-	scsi_cmd.length = sizeof(*data) & 0xff;
-	data->header.data_length = 0;
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), (u_char *)data, sizeof(*data), CDRETRIES, 20000,
-	    NULL, SCSI_DATA_OUT);
+	struct atapi_mode_select atapi_cmd;
+
+	bzero(&data->header.length, sizeof(data->header.length));
+	bzero(&atapi_cmd, sizeof(atapi_cmd));
+
+	atapi_cmd.opcode = ATAPI_MODE_SELECT;
+	atapi_cmd.flags |= MODE_BIT;
+	atapi_cmd.page = data->page_code;
+	_lto2b(len, atapi_cmd.length);
+
+	return atapi_exec_cmd(acd->ad_link, &atapi_cmd, sizeof(atapi_cmd),
+			      data, len, B_WRITE, 0);
+}
+
+int
+acd_setchan(acd, c0, c1, c2, c3)
+	struct acd_softc *acd;
+	u_char c0, c1, c2, c3;
+{
+	struct atapi_mode_data data;
+	int error;
+
+	error = acd_get_mode(acd, &data, ATAPI_AUDIO_PAGE, AUDIOPAGESIZE, 0);
+	if (error)
+		return error;
+
+	data.page_audio.port[0].channels = c0;
+	data.page_audio.port[1].channels = c1;
+	data.page_audio.port[2].channels = c2;
+	data.page_audio.port[3].channels = c3;
+
+	return acd_set_mode(acd, &data, AUDIOPAGESIZE);
 }
 
 /*
- * Get scsi driver to send a "start playing" command
+ * Get atapi driver to send a "start playing" command
  */
 int
-cd_play(cd, blkno, nblks)
-	struct acd_softc *cd;
+acd_play(acd, blkno, nblks)
+	struct acd_softc *acd;
 	int blkno, nblks;
 {
-	struct scsi_play scsi_cmd;
+	struct atapi_play atapi_cmd;
 
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = PLAY;
-	_lto4b(blkno, scsi_cmd.blk_addr);
-	_lto2b(nblks, scsi_cmd.xfer_len);
+	bzero(&atapi_cmd, sizeof(atapi_cmd));
+	atapi_cmd.opcode = ATAPI_PLAY_AUDIO;
+	_lto4b(blkno, atapi_cmd.lba);
+	_lto2b(nblks, atapi_cmd.length);
 
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), 0, 0, CDRETRIES, 200000, NULL, 0);
+	return atapi_exec_cmd(acd->ad_link, &atapi_cmd, sizeof(atapi_cmd),
+			      NULL, 0, 0, 0);
 }
 
 /*
- * Get scsi driver to send a "start playing" command
+ * Get atapi driver to send a "start playing" command
  */
 int
-cd_play_big(cd, blkno, nblks)
-	struct acd_softc *cd;
+acd_play_big(acd, blkno, nblks)
+	struct acd_softc *acd;
 	int blkno, nblks;
 {
-	struct scsi_play_big scsi_cmd;
+	struct atapi_play_big atapi_cmd;
 
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = PLAY_BIG;
-	_lto4b(blkno, scsi_cmd.blk_addr);
-	_lto4b(nblks, scsi_cmd.xfer_len);
+	bzero(&atapi_cmd, sizeof(atapi_cmd));
+	atapi_cmd.opcode = ATAPI_PLAY_BIG;
+	_lto4b(blkno, atapi_cmd.lba);
+	_lto4b(nblks, atapi_cmd.length);
 
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), 0, 0, CDRETRIES, 20000, NULL, 0);
+	return atapi_exec_cmd(acd->ad_link, &atapi_cmd, sizeof(atapi_cmd),
+			      NULL, 0, 0, 0);
+}
+
+int
+acd_load_toc(acd, toc)
+	struct acd_softc *acd;
+	struct cd_toc *toc;
+{
+	int i, ntracks, len, error;
+	u_int32_t *lba;
+
+	error = acd_read_toc(acd, 0, 0, toc, sizeof(toc->hdr));
+	if (error)
+		return error;
+
+	ntracks = toc->hdr.ending_track-toc->hdr.starting_track + 1;
+	len = (ntracks+1) * sizeof(struct cd_toc_entry) + sizeof(toc->hdr);
+	error = acd_read_toc(acd, CD_MSF_FORMAT, 0, toc, len);
+	if (error)
+		return(error);
+	for (i = 0; i <= ntracks; i++) {
+		lba = (u_int32_t*)toc->tab[i].addr.addr;
+		*lba = msf2lba(toc->tab[i].addr.addr[1],
+			       toc->tab[i].addr.addr[2],
+			       toc->tab[i].addr.addr[3]);
+	}
+	return 0;
 }
 
 /*
- * Get scsi driver to send a "start playing" command
+ * Get atapi driver to send a "start playing" command
  */
 int
-cd_play_tracks(cd, strack, sindex, etrack, eindex)
-	struct acd_softc *cd;
+acd_play_tracks(acd, strack, sindex, etrack, eindex)
+	struct acd_softc *acd;
 	int strack, sindex, etrack, eindex;
 {
-	struct scsi_play_track scsi_cmd;
+	u_int32_t *start, *end, len;
+	struct cd_toc toc;
+	int error;
+
+	if (!etrack)
+		return EIO;
+	if (strack > etrack)
+		return EINVAL;
 
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = PLAY_TRACK;
-	scsi_cmd.start_track = strack;
-	scsi_cmd.start_index = sindex;
-	scsi_cmd.end_track = etrack;
-	scsi_cmd.end_index = eindex;
+	error = acd_load_toc(acd, &toc);
+	if (error)
+		return error;
+
+	if (++etrack > (toc.hdr.ending_track + 1))
+		etrack = toc.hdr.ending_track + 1;
+
+	strack -= toc.hdr.starting_track;
+	etrack -= toc.hdr.starting_track;
+	if (strack < 0)
+		return EINVAL;
+
+	start = (u_int32_t*)toc.tab[strack].addr.addr;
+	end = (u_int32_t*)toc.tab[etrack].addr.addr;
+	len = *end - *start;
 
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), 0, 0, CDRETRIES, 20000, NULL, 0);
+	return acd_play_big(acd, *start, len);
 }
 
 /*
- * Get scsi driver to send a "play msf" command
+ * Get atapi driver to send a "play msf" command
  */
 int
-cd_play_msf(cd, startm, starts, startf, endm, ends, endf)
-	struct acd_softc *cd;
+acd_play_msf(acd, startm, starts, startf, endm, ends, endf)
+	struct acd_softc *acd;
 	int startm, starts, startf, endm, ends, endf;
 {
-	struct scsi_play_msf scsi_cmd;
-
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = PLAY_MSF;
-	scsi_cmd.start_m = startm;
-	scsi_cmd.start_s = starts;
-	scsi_cmd.start_f = startf;
-	scsi_cmd.end_m = endm;
-	scsi_cmd.end_s = ends;
-	scsi_cmd.end_f = endf;
-
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), 0, 0, CDRETRIES, 2000, NULL, 0);
+	struct atapi_play_msf atapi_cmd;
+
+	bzero(&atapi_cmd, sizeof(atapi_cmd));
+	atapi_cmd.opcode = ATAPI_PLAY_MSF;
+	atapi_cmd.start_m = startm;
+	atapi_cmd.start_s = starts;
+	atapi_cmd.start_f = startf;
+	atapi_cmd.end_m = endm;
+	atapi_cmd.end_s = ends;
+	atapi_cmd.end_f = endf;
+
+	return atapi_exec_cmd(acd->ad_link, (struct atapi_generic *)&atapi_cmd,
+			      sizeof(atapi_cmd), NULL, 0, 0, 0);
 }
 
-#endif  /* notyet */
-
 /*
  * Get atapi driver to send a "start up" command
  */
@@ -1164,10 +1199,10 @@ acd_pause(acd, go)
 	struct acd_softc *acd;
 	int go;
 {
-	struct pause_resume cmd;
+	struct atapi_pause_resume cmd;
 
 	bzero(&cmd, sizeof(cmd));
-	cmd.operation_code = ATAPI_PAUSE_RESUME;
+	cmd.opcode = ATAPI_PAUSE_RESUME;
 	cmd.resume = go & 0xff;
 
 	return atapi_exec_cmd(acd->ad_link, &cmd , sizeof(cmd), 0, 0, 0, 0);
@@ -1187,66 +1222,57 @@ acd_reset(acd)
 #endif
 }
 
-#ifdef notyet
 /*
  * Read subchannel
  */
 int
-cd_read_subchannel(cd, mode, format, track, data, len)
-	struct acd_softc *cd;
+acd_read_subchannel(acd, mode, format, track, data, len)
+	struct acd_softc *acd;
 	int mode, format, len;
 	struct cd_sub_channel_info *data;
 {
-	struct scsi_read_subchannel scsi_cmd;
+	struct atapi_read_subchannel atapi_cmd;
+
+	bzero(&atapi_cmd, sizeof(atapi_cmd));
 
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = READ_SUBCHANNEL;
+	atapi_cmd.opcode = ATAPI_READ_SUBCHANNEL;
 	if (mode == CD_MSF_FORMAT)
-		scsi_cmd.byte2 |= CD_MSF;
-	scsi_cmd.byte3 = SRS_SUBQ;
-	scsi_cmd.subchan_format = format;
-	scsi_cmd.track = track;
-	_lto2b(len, scsi_cmd.data_len);
-
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(struct scsi_read_subchannel), (u_char *)data, len,
-	    CDRETRIES, 5000, NULL, SCSI_DATA_IN);
+		atapi_cmd.flags[0] |= SUBCHAN_MSF;
+	if (len > sizeof(struct cd_sub_channel_header))
+		atapi_cmd.flags[1] |= SUBCHAN_SUBQ;
+	atapi_cmd.subchan_format = format;
+	atapi_cmd.track = track;
+	_lto2b(len, atapi_cmd.length);
+
+	return atapi_exec_cmd(acd->ad_link, (struct atapi_generic *)&atapi_cmd,
+			      sizeof(struct atapi_read_subchannel),
+			      (u_char *)data, len, B_READ, 0);
 }
 
 /*
  * Read table of contents
  */
 int
-cd_read_toc(cd, mode, start, data, len)
-	struct acd_softc *cd;
+acd_read_toc(acd, mode, start, data, len)
+	struct acd_softc *acd;
 	int mode, start, len;
-	struct cd_toc_entry *data;
+	void *data;
 {
-	struct scsi_read_toc scsi_cmd;
-	int ntoc;
-
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-#if 0
-	if (len != sizeof(struct ioc_toc_header))
-		ntoc = ((len) - sizeof(struct ioc_toc_header)) /
-		    sizeof(struct cd_toc_entry);
-	else
-#endif
-		ntoc = len;
+	struct atapi_read_toc atapi_cmd;
+
+	bzero(&atapi_cmd, sizeof(atapi_cmd));
 
-	scsi_cmd.opcode = READ_TOC;
+	atapi_cmd.opcode = ATAPI_READ_TOC;
 	if (mode == CD_MSF_FORMAT)
-		scsi_cmd.byte2 |= CD_MSF;
-	scsi_cmd.from_track = start;
-	_lto2b(ntoc, scsi_cmd.data_len);
+		atapi_cmd.flags |= TOC_MSF;
+	atapi_cmd.track = start;
+	_lto2b(len, atapi_cmd.length);
 
-	return scsi_scsi_cmd(cd->ad_link, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(struct scsi_read_toc), (u_char *)data, len, CDRETRIES,
-	    5000, NULL, SCSI_DATA_IN);
+	return atapi_exec_cmd(acd->ad_link, (struct atapi_generic *)&atapi_cmd,
+			      sizeof(struct atapi_read_toc), data,
+			      len, B_READ, 0);
 }
 
-#endif /* notyet */
-
 /*
  * Get the atapi driver to send a full inquiry to the device and use the
  * results to fill out the disk parameter structure.
diff --git a/sys/dev/atapi/atapi.h b/sys/dev/atapi/atapi.h
index d382863e561..6ca00f1734e 100644
--- a/sys/dev/atapi/atapi.h
+++ b/sys/dev/atapi/atapi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atapi.h,v 1.3 1996/06/10 08:01:11 downsj Exp $	*/
+/*	$OpenBSD: atapi.h,v 1.4 1996/07/22 03:35:42 downsj Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -38,8 +38,8 @@
  */
 #define ATAPI_TEST_UNIT_READY		0x00
 
-struct test_unit_ready {
-	u_int8_t	operation_code;
+struct atapi_test_unit_ready {
+	u_int8_t	opcode;
 	u_int8_t	reserved1[15];
 };
 
@@ -48,8 +48,8 @@ struct test_unit_ready {
  */ 
 #define ATAPI_START_STOP_UNIT		0x1b
  
-struct start_stop_unit {
-	u_int8_t	operation_code;
+struct atapi_start_stop_unit {
+	u_int8_t	opcode;
 	u_int8_t	flags;
 #define START_STOP_IMMED	0x01
 	u_int8_t	reserved2[2]; 
@@ -65,8 +65,8 @@ struct start_stop_unit {
  */ 
 #define ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL 0x1e
  
-struct prevent_allow_medium_removal {
-	u_int8_t	operation_code;
+struct atapi_prevent_allow_medium_removal {
+	u_int8_t	opcode;
 	u_int8_t	reserved1[3];
 	u_int8_t	how;	
 #define PR_PREVENT	0x01
@@ -80,8 +80,8 @@ struct prevent_allow_medium_removal {
  */
 #define ATAPI_READ_CD_CAPACITY		0x25
 
-struct read_cd_capacity {
-	u_int8_t	operation_code;
+struct atapi_read_cd_capacity {
+	u_int8_t	opcode;
 	u_int8_t	reserved1[7];
 	u_int8_t	len;
 	u_int8_t	reserved2[7];
@@ -90,7 +90,7 @@ struct read_cd_capacity {
 /* 
  * Volume size info.
  */
-struct read_cd_capacity_data {
+struct atapi_read_cd_capacity_data {
 	u_long	size;		/* Volume size in blocks */
 	u_long	blksize;	/* Block size in bytes */
 };
@@ -100,8 +100,8 @@ struct read_cd_capacity_data {
  */  
 #define ATAPI_READ			0x28  
 
-struct read {    
-	u_int8_t	operation_code;
+struct atapi_read {
+	u_int8_t	opcode;
 	u_int8_t	reserved1;
 	u_int8_t	lba[4];
 	u_int8_t	reserved2;
@@ -109,13 +109,91 @@ struct read {
 	u_int8_t	reserved3[7];
 }; 
 
+/*
+ * READ_SUBCHANNEL
+ */
+#define ATAPI_READ_SUBCHANNEL		0x42
+
+struct atapi_read_subchannel {
+	u_int8_t	opcode;
+	u_int8_t	flags[2];
+#define SUBCHAN_MSF	0x02
+#define SUBCHAN_SUBQ	0x40
+	u_int8_t	subchan_format;
+	u_int8_t	reserved5[2];
+	u_int8_t	track;
+	u_int8_t	length[2];
+	u_int8_t	reserved6[3];
+};
+
+/*
+ * READ_TOC
+ */
+#define ATAPI_READ_TOC			0x43
+
+struct atapi_read_toc {
+	u_int8_t	opcode;
+	u_int8_t	flags;
+#define TOC_MSF		0x02
+	u_int8_t	reserved3[4];
+	u_int8_t	track;
+	u_int8_t	length[2];
+	u_int8_t	format_flag;
+#define TOC_FORMAT	0x40
+	u_int8_t	reserved5[2];
+};
+
+/*
+ * PLAY AUDIO (10)
+ */
+#define ATAPI_PLAY_AUDIO		0x45
+
+struct atapi_play {
+	u_int8_t	opcode;
+	u_int8_t	reserved1;
+	u_int8_t	lba[4];
+	u_int8_t	reserved2;
+	u_int8_t	length[2];
+	u_int8_t	reserved3[7];
+};
+
+/*
+ * PLAY AUDIO (12)
+ */
+#define ATAPI_PLAY_BIG			0xa5
+
+struct atapi_play_big {
+	u_int8_t	opcode;
+	u_int8_t	reserved1;
+	u_int8_t	lba[4];
+	u_int8_t	length[4];
+	u_int8_t	reserved2[6];
+};
+
+/*
+ * PLAY MSF
+ */
+#define ATAPI_PLAY_MSF			0x47
+
+struct atapi_play_msf {
+	u_int8_t	opcode;
+	u_int8_t	reserved1[2];
+	u_int8_t	start_m;
+	u_int8_t	start_s;
+	u_int8_t	start_f;
+	u_int8_t	end_m;
+	u_int8_t	end_s;
+	u_int8_t	end_f;
+	u_int8_t	reserved3[3];
+};
+
 /* 
  * PAUSE/RESUME (optional) 
  */ 
 #define ATAPI_PAUSE_RESUME		0x4b
  
-struct pause_resume {
-	u_int8_t	operation_code;
+struct atapi_pause_resume {
+	u_int8_t	opcode;
 	u_int8_t	reserved1[7];
 	u_int8_t	resume;
 #define PA_PAUSE	0x00
@@ -124,12 +202,28 @@ struct pause_resume {
 };
 
 /*
+ * MODE SELECT
+ */
+#define ATAPI_MODE_SELECT		0x55
+
+struct atapi_mode_select {
+	u_int8_t	opcode;
+	u_int8_t	flags;
+#define MODE_SAVEPAGE	0x01;
+#define MODE_BIT	0x10;
+	u_int8_t	page;
+	u_int8_t	reserved3[4];
+	u_int8_t	length[2];
+	u_int8_t	reserved4[7];
+};
+
+/*
  * MODE SENSE (mandatory)
  */
 #define ATAPI_MODE_SENSE        0x5a
 
-struct mode_sense {
-	u_int8_t	operation_code;
+struct atapi_mode_sense {
+	u_int8_t	opcode;
 	u_int8_t	reserved1;
 	u_int8_t	page_code_control;
 #define PAGE_CODE_MASK		0x3f
@@ -139,29 +233,11 @@ struct mode_sense {
 	u_int8_t	reserved3[7];
 };
 
-struct cappage {
-	/* Mode data header */
-	u_int8_t	data_length[2];
-	u_int8_t	medium_type;
-#define MDT_UNKNOWN	0x00        
-#define MDT_DATA_120	0x01
-#define MDT_AUDIO_120	0x02
-#define MDT_COMB_120	0x03    
-#define MDT_PHOTO_120	0x04    
-#define MDT_DATA_80	0x05
-#define MDT_AUDIO_80	0x06
-#define MDT_COMB_80	0x07 
-#define MDT_PHOTO_80	0x08
-#define MDT_NO_DISC	0x70
-#define MDT_DOOR_OPEN	0x71
-#define MDT_FMT_ERROR	0x72
-	u_int8_t	reserved1[5];
-
+struct atapi_cappage {
 	/* Capabilities page */
 	u_int8_t	page_code;
-#define CAP_PAGE	0x2a
-	u_int8_t param_len;
-	u_int8_t reserved2[2];
+	u_int8_t	param_len;
+	u_int8_t	reserved2[2];
 
 	u_int8_t	format_cap;
 #define FORMAT_AUDIO_PLAY	0x01	/* audio play supported */
@@ -219,6 +295,77 @@ struct cappage {
 	u_int8_t	reserved4[2];
 };
 
+struct atapi_audiopage {
+	u_int8_t	page;
+	u_int8_t	length;
+	u_int8_t	flags;
+#define ATAPI_PA_SOTC	0x2
+#define ATAPI_PA_IMMED	0x4
+	u_int8_t	reserved4[3];
+	u_int8_t	lbaps[2];
+	struct port {
+#define CHANNEL_0	0x1
+#define CHANNEL_1	0x2
+#define CHANNEL_2	0x4
+#define CHANNEL_3	0x8
+#define MUTE_CHANNEL	0x0
+#define LEFT_CHANNEL	0x1
+#define RIGHT_CHANNEL	0x2
+#define BOTH_CHANNEL	0x3
+#define LEFT2_CHANNEL	0x4
+#define RIGHT2_CHANNEL	0x8
+		u_int8_t	channels;	/* first four bits */
+		u_int8_t	volume;
+	} port[4];
+};
+
+struct atapi_cdrompage {
+	u_int8_t	page;
+	u_int8_t	length;
+	u_int8_t	reserved1;
+	u_int8_t	inact_mult;		/* first four bits */
+	u_int16_t	spm;
+	u_int16_t	fps;
+};
+
+struct atapi_mode_data {
+	struct mode_header {
+		u_int8_t	length[2];
+		u_int8_t	medium;
+#define MDT_UNKNOWN	0x00
+#define MDT_DATA_120	0x01
+#define MDT_AUDIO_120	0x02
+#define MDT_COMB_120	0x03
+#define MDT_PHOTO_120	0x04
+#define MDT_DATA_80	0x05
+#define MDT_AUDIO_80	0x06
+#define MDT_COMB_80	0x07
+#define MDT_PHOTO_80	0x08
+#define MDT_NO_DISC	0x70
+#define MDT_DOOR_OPEN	0x71
+#define MDT_FMT_ERROR	0x72
+		u_int8_t	reserved[5];
+	} header;
+#define ATAPI_CDROM_PAGE	0x0d
+#define ATAPI_AUDIO_PAGE	0x0e
+#define ATAPI_AUDIO_PAGE_MASK	0x4e
+#define ATAPI_CAP_PAGE		0x2a
+	union {
+		u_int8_t		atapi_page_code;
+		struct atapi_cdrompage	atapi_page_cdrom;
+		struct atapi_cappage	atapi_page_cap;
+		struct atapi_audiopage	atapi_page_audio;
+	} page;
+#define page_code	page.atapi_page_code
+#define page_cdrom	page.atapi_page_cdrom
+#define	page_cap	page.atapi_page_cap
+#define page_audio	page.atapi_page_audio
+};
+
+#define AUDIOPAGESIZE	sizeof(struct atapi_audiopage)+sizeof(struct mode_header)
+#define CDROMPAGESIZE	sizeof(struct atapi_cdrompage)+sizeof(struct mode_header)
+#define CAPPAGESIZE	sizeof(struct atapi_cappage)+sizeof(struct mode_header)
+
 /* ATAPI error codes */
 #define ATAPI_SK_NO_SENSE		0x0
 #define ATAPI_SK_REC_ERROR		0x1	/* recovered error */
diff --git a/sys/dev/atapi/atapiconf.c b/sys/dev/atapi/atapiconf.c
index dc60f426cf5..ec5bb34d984 100644
--- a/sys/dev/atapi/atapiconf.c
+++ b/sys/dev/atapi/atapiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atapiconf.c,v 1.3 1996/06/10 08:01:13 downsj Exp $	*/
+/*	$OpenBSD: atapiconf.c,v 1.4 1996/07/22 03:35:42 downsj Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -491,12 +491,12 @@ atapi_test_unit_ready(ad_link, flags)
 	int flags;
 {	
 	int ret;
-	struct test_unit_ready cmd;
+	struct atapi_test_unit_ready cmd;
 
 	ATAPI_DEBUG_FCTN_PRINT(("atapi_test_unit_ready: "));
 
 	bzero(&cmd, sizeof(cmd));
-	cmd.operation_code = ATAPI_TEST_UNIT_READY;
+	cmd.opcode = ATAPI_TEST_UNIT_READY;
 
 	ret = atapi_exec_cmd(ad_link, &cmd, sizeof(cmd), 0, 0, 0, flags);
 
@@ -511,13 +511,13 @@ atapi_start_stop(ad_link, how, flags)
 	int how;
 	int flags;
 {
-	struct start_stop_unit cmd;
+	struct atapi_start_stop_unit cmd;
 	int ret;
 		
 	ATAPI_DEBUG_FCTN_PRINT(("atapi_start_stop: "));
 
 	bzero(&cmd, sizeof(cmd));
-	cmd.operation_code = ATAPI_START_STOP_UNIT;
+	cmd.opcode = ATAPI_START_STOP_UNIT;
 	cmd.how = how;
 
 	ret = atapi_exec_cmd(ad_link, &cmd, sizeof(cmd), 0,0,0,flags);
@@ -532,13 +532,13 @@ atapi_prevent(ad_link, how)
 	struct at_dev_link *ad_link;
 	int how;
 {
-	struct prevent_allow_medium_removal cmd;
+	struct atapi_prevent_allow_medium_removal cmd;
 	int ret;
 
 	ATAPI_DEBUG_FCTN_PRINT(("atapi_prevent: "));
 
 	bzero(&cmd, sizeof(cmd));
-	cmd.operation_code = ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL;
+	cmd.opcode = ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL;
 	cmd.how = how & 0xff;
 
 	ret = atapi_exec_cmd(ad_link, &cmd, sizeof(cmd), 0,0,0,0);