summaryrefslogtreecommitdiff
path: root/usr.bin/cdio/extern.h
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2008-08-30 10:41:39 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2008-08-30 10:41:39 +0000
commit56c840f41a74c47a85ce76154c0456b0ccf24911 (patch)
tree56c57d0ba62c5fc1db652a1675999df355c63b57 /usr.bin/cdio/extern.h
parent7314db6f44b437f813fc445c521d10dcce8a6ddc (diff)
use a bitmap to store the features. simplify the code a bit and allow for
future work. ok av@ a similar diff.
Diffstat (limited to 'usr.bin/cdio/extern.h')
-rw-r--r--usr.bin/cdio/extern.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/cdio/extern.h b/usr.bin/cdio/extern.h
index fd26816c000..38a18063d9d 100644
--- a/usr.bin/cdio/extern.h
+++ b/usr.bin/cdio/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.13 2008/08/13 12:21:19 av Exp $ */
+/* $OpenBSD: extern.h,v 1.14 2008/08/30 10:41:38 fgsch Exp $ */
/*
* Copyright (c) 2002 Marc Espie.
*
@@ -39,11 +39,6 @@ struct track_info {
};
SLIST_HEAD(track_head, track_info) tracks;
-/* Media capabilities (bitmask) */
-#define MEDIACAP_TAO 0x01 /* Track-At-Once writing mode */
-#define MEDIACAP_CDRW_WRITE 0x02 /* media is CD-RW and can be written */
-#define MEDIACAP_CDRW_CAV 0x04 /* Constant Angular Velocity */
-
/* Read/Write speed */
#define DRIVE_SPEED_MAX 0xfffe
#define DRIVE_SPEED_OPTIMAL 0xffff /* automatically adjusted by drive */
@@ -60,9 +55,14 @@ SLIST_HEAD(track_head, track_info) tracks;
*/
#define CD_MAX_SPEED 380
-/*
- * Media types
- */
+/* MMC feature codes */
+#define MMC_FEATURE_CDRW_CAV 0x27 /* Constant Angular Velocity */
+#define MMC_FEATURE_CD_TAO 0x2d /* Track-At-Once writing mode */
+#define MMC_FEATURE_CDRW_WRITE 0x37 /* media is CD-RW and can be written */
+
+#define MMC_FEATURE_MAX 0x0110
+
+/* Media types */
#define MEDIATYPE_UNKNOWN 0
#define MEDIATYPE_CDR 1
#define MEDIATYPE_CDRW 2
@@ -74,7 +74,7 @@ extern char ** cddb(const char *, int, struct cd_toc_entry *, char *);
extern unsigned long cddb_discid(int, struct cd_toc_entry *);
extern void free_names(char **);
extern int get_media_type(void);
-extern int get_media_capabilities(int *cap);
+extern int get_media_capabilities(int *, int);
extern int blank(void);
extern int unit_ready(void);
extern int synchronize_cache(void);