summaryrefslogtreecommitdiff
path: root/sys/dev/isa/essvar.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/isa/essvar.h')
-rw-r--r--sys/dev/isa/essvar.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/isa/essvar.h b/sys/dev/isa/essvar.h
index cf1838a94d2..a3530f682b0 100644
--- a/sys/dev/isa/essvar.h
+++ b/sys/dev/isa/essvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: essvar.h,v 1.2 1999/09/30 22:13:52 kstailey Exp $ */
+/* $OpenBSD: essvar.h,v 1.3 2001/01/29 06:27:59 mickey Exp $ */
/* $NetBSD: essvar.h,v 1.14 1999/03/18 06:03:31 mycroft Exp $ */
/*
* Copyright 1997
@@ -34,7 +34,7 @@
*/
/*
-** @(#) $RCSfile: essvar.h,v $ $Revision: 1.2 $ (SHARK) $Date: 1999/09/30 22:13:52 $
+** @(#) $RCSfile: essvar.h,v $ $Revision: 1.3 $ (SHARK) $Date: 2001/01/29 06:27:59 $
**
**++
**
@@ -46,16 +46,16 @@
**
** MODULE DESCRIPTION:
**
-** This module contains the structure definitions and function
-** prototypes for the ESS Technologies 1887/888 sound chip
-** driver.
+** This module contains the structure definitions and function
+** prototypes for the ESS Technologies 1887/888 sound chip
+** driver.
**
** AUTHORS:
**
** Blair Fidler Software Engineering Australia
** Gold Coast, Australia.
**
-** CREATION DATE:
+** CREATION DATE:
**
** May 12, 1997.
**
@@ -125,22 +125,23 @@ struct ess_softc
isa_chipset_tag_t sc_ic;
bus_space_tag_t sc_iot; /* tag */
bus_space_handle_t sc_ioh; /* handle */
+ struct timeout sc_tmo1, sc_tmo2;
int sc_iobase; /* I/O port base address */
u_short sc_open; /* reference count of open calls */
- int ndevs;
+ int ndevs;
u_char gain[ESS_MAX_NDEVS][2]; /* kept in input levels */
#define ESS_LEFT 0
#define ESS_RIGHT 1
-
+
u_int out_port; /* output port */
u_int in_mask; /* input ports */
u_int in_port; /* XXX needed for MI interface */
u_int spkr_state; /* non-null is on */
-
+
struct ess_audio_channel sc_audio1; /* audio channel for record */
struct ess_audio_channel sc_audio2; /* audio channel for playback */