===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/cdio.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- src/usr.bin/cdio/cdio.c	2008/08/13 12:21:19	1.66
+++ src/usr.bin/cdio/cdio.c	2008/08/30 10:41:38	1.67
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdio.c,v 1.66 2008/08/13 12:21:19 av Exp $	*/
+/*	$OpenBSD: cdio.c,v 1.67 2008/08/30 10:41:38 fgsch Exp $	*/
 
 /*  Copyright (c) 1995 Serge V. Vakulenko
  * All rights reserved.
@@ -149,7 +149,7 @@
 char		*cdname;
 int		fd = -1;
 int		writeperm = 0;
-int		mediacap = 0;
+int		mediacap[MMC_FEATURE_MAX / 8];
 int		verbose = 1;
 int		msf = 1;
 const char	*cddb_host;
@@ -513,11 +513,11 @@
 		if (!open_cd(cdname, 1))
 			return 0;
 
-		if (get_media_capabilities(&mediacap) == -1) {
+		if (get_media_capabilities(mediacap, 1) == -1) {
 			warnx("Can't determine media type");
 			return (0);
 		}
-		if ((mediacap & MEDIACAP_CDRW_WRITE) == 0 &&
+		if (isset(mediacap, MMC_FEATURE_CDRW_WRITE) == 0 &&
 		    get_media_type() != MEDIATYPE_CDRW) {
 			warnx("The media doesn't support blanking");
 			return (0);
@@ -658,9 +658,9 @@
 
 	if (!open_cd(cdname, 1))
 		exit(1);
-	if (get_media_capabilities(&mediacap) == -1)
+	if (get_media_capabilities(mediacap, 1) == -1)
 		errx(1, "Can't determine media type");
-	if ((mediacap & MEDIACAP_TAO) == 0)
+	if (isset(mediacap, MMC_FEATURE_CD_TAO) == 0)
 		errx(1, "The media can't be written in TAO mode");
 
 	get_disc_size(&availblk);