summaryrefslogtreecommitdiff
path: root/sys/dev/audiovar.h
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1998-11-03 21:00:12 +0000
committerJason Downs <downsj@cvs.openbsd.org>1998-11-03 21:00:12 +0000
commit37cd2221614ee5b8e773155476a3fa2a32d3883d (patch)
tree9686c429d116ce4ca9e050b9ccf26eb5f4720d62 /sys/dev/audiovar.h
parent992e71fb1eb27d0e5b39f16328cfd34968b8d503 (diff)
Partial sync with NetBSD, adds new trigger methods.
Diffstat (limited to 'sys/dev/audiovar.h')
-rw-r--r--sys/dev/audiovar.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/audiovar.h b/sys/dev/audiovar.h
index f712205c9a2..f3f471e5959 100644
--- a/sys/dev/audiovar.h
+++ b/sys/dev/audiovar.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: audiovar.h,v 1.5 1998/04/26 21:03:09 provos Exp $ */
-/* $NetBSD: audiovar.h,v 1.17 1997/10/19 07:42:01 augustss Exp $ */
+/* $OpenBSD: audiovar.h,v 1.6 1998/11/03 21:00:11 downsj Exp $ */
+/* $NetBSD: audiovar.h,v 1.18 1998/03/03 09:16:16 augustss Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -124,7 +124,7 @@ struct audio_softc {
struct audio_params sc_pparams; /* play encoding parameters */
struct audio_params sc_rparams; /* record encoding parameters */
- int sc_eof; /* EOF, i.e. zero sixed write, counter */
+ int sc_eof; /* EOF, i.e. zero sized write, counter */
u_long sc_wstamp;
u_long sc_playdrop;
@@ -134,13 +134,13 @@ struct audio_softc {
int sc_monitor_port;
#ifdef AUDIO_INTR_TIME
- u_long sc_pfirstintr; /* first time we saw a xmit interrupt */
+ u_long sc_pfirstintr; /* first time we saw a play interrupt */
int sc_pnintr; /* number of interrupts */
- u_long sc_plastintr; /* last time we saw a xmit interrupt */
+ u_long sc_plastintr; /* last time we saw a play interrupt */
long sc_pblktime; /* nominal time between interrupts */
u_long sc_rfirstintr; /* first time we saw a rec interrupt */
int sc_rnintr; /* number of interrupts */
- u_long sc_rlastintr; /* last time we saw a xrec interrupt */
+ u_long sc_rlastintr; /* last time we saw a rec interrupt */
long sc_rblktime; /* nominal time between interrupts */
#endif
};