aboutsummaryrefslogtreecommitdiff
path: root/sys/i386/isa/mcdreg.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386/isa/mcdreg.h')
-rw-r--r--sys/i386/isa/mcdreg.h23
1 files changed, 16 insertions, 7 deletions
diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h
index c18b2c3987e9..086a856ceda2 100644
--- a/sys/i386/isa/mcdreg.h
+++ b/sys/i386/isa/mcdreg.h
@@ -1,6 +1,7 @@
/*
* Copyright 1993 by Holger Veit (data part)
* Copyright 1993 by Brian Moore (audio part)
+ * Changes Copyright 1993 by Gary Clark II
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This software was developed by Holger Veit and Brian Moore
- * for use with "386BSD" and similar operating systems.
+ * for use with "386BSD" and similar operating systems.
* "Similar operating systems" includes mainly non-profit oriented
* systems for research and education, including but not restricted to
* "NetBSD", "FreeBSD", "Mach" (by CMU).
@@ -40,7 +41,7 @@
* the manufacturer or anyone else might provide better documentation,
* so this file (and the driver) will then have a better quality.
*
- * $Id: mcdreg.h,v 1.1 1993/10/12 06:08:31 rgrimes Exp $
+ * $Id: mcdreg.h,v 1.3 1994/02/22 08:44:31 rgrimes Exp $
*/
#ifndef MCD_H
@@ -67,8 +68,8 @@ typedef unsigned char bcd_t;
#define mcd_reset 1
#define mcd_xfer 1
#define mcd_ctl2 2 /* XXX Is this right? */
-
#define mcd_config 3
+
#define MCD_MASK_DMA 0x07 /* bits 2-0 = DMA channel */
#define MCD_MASK_IRQ 0x70 /* bits 6-4 = INT number */
/* 001 = int 2,9 */
@@ -77,14 +78,22 @@ typedef unsigned char bcd_t;
/* 100 = int 10 */
/* 101 = int 11 */
/* flags */
-#define STATUS_AVAIL 0xb
-#define DATA_AVAIL 0xf
+#define STATUS_AVAIL 0xB
+#define DATA_AVAIL 0xF
+
+/* New Flags */
+#define M_STATUS_AVAIL 0xFB
+#define M_DATA_AVAIL 0xFD
+
+/* New Commands */
+#define M_RESET 0x00
+#define M_PICKLE 0x04
/* ports */
#define MCD_DATA 0
#define MCD_FLAGS 1
-#define MCD_DONT_KNOW 2 /* What are these two ports for??? */
-#define CHANNEL 3
+#define MCD_CTRL 2
+#define CHANNEL 3 /* XXX ??? */
/* Status bits */
#define MCD_ST_DOOROPEN 0x80