summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2009-12-13 03:31:14 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2009-12-13 03:31:14 +0000
commit39cf359256414d5b1eb653a41dbe497fbd8dc1af (patch)
tree1958b0c3b716227d291edcfa4765f599f30dab3e /sys
parent084ff85769e86362f00323958a1a847b153a20a8 (diff)
remove #ifdef CDDA bits cos nothing in cd.c uses it and nothing i can find
defines it.
Diffstat (limited to 'sys')
-rw-r--r--sys/scsi/cd.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/scsi/cd.h b/sys/scsi/cd.h
index 7fe5044d13e..7d35aa77acf 100644
--- a/sys/scsi/cd.h
+++ b/sys/scsi/cd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.h,v 1.23 2009/12/13 03:29:01 dlg Exp $ */
+/* $OpenBSD: cd.h,v 1.24 2009/12/13 03:31:13 dlg Exp $ */
/* $NetBSD: scsi_cd.h,v 1.6 1996/03/19 03:06:39 mycroft Exp $ */
/*
@@ -282,9 +282,6 @@ struct cd_softc {
#define CDF_WLABEL 0x04 /* label is writable */
#define CDF_LABELLING 0x08 /* writing label */
#define CDF_ANCIENT 0x10 /* disk is ancient; for minphys */
-#ifdef CDDA
-#define CDF_CDDA 0x20
-#endif
#define CDF_WAITING 0x100
#define CDF_STARTING 0x200
struct scsi_link *sc_link; /* contains our targ, lun, etc. */
@@ -292,9 +289,6 @@ struct cd_softc {
u_int32_t blksize;
daddr64_t disksize; /* total number sectors */
} sc_params;
-#ifdef CDDA
- struct cd_parms sc_orig_params; /* filled in when CD-DA mode starts */
-#endif
struct buf sc_buf_queue;
struct mutex sc_queue_mtx;
struct mutex sc_start_mtx;