summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2001-01-28 09:45:27 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2001-01-28 09:45:27 +0000
commit47e9e06316651d588c2243176e352f078a61cf82 (patch)
tree192d541506f200f460cca1aed94e4f80dffd2181 /sys
parent068c901929c8e128152d9695e219c78a5c15d162 (diff)
Add a field to mixer_devinto_t that indicates the minimum delta to change
mixer value. A value of 0 indicates that the driver doesn't supply a delta. The change is backwards compatible. From NetBSD (needed for uaudio(4) update).
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/audio.c3
-rw-r--r--sys/sys/audioio.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 52f5d472141..0fcc80d79fc 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: audio.c,v 1.24 2000/11/09 21:31:33 mickey Exp $ */
+/* $OpenBSD: audio.c,v 1.25 2001/01/28 09:45:26 aaron Exp $ */
/* $NetBSD: audio.c,v 1.105 1998/09/27 16:43:56 christos Exp $ */
/*
@@ -2998,6 +2998,7 @@ mixer_ioctl(dev, cmd, addr, flag, p)
case AUDIO_MIXER_DEVINFO:
DPRINTF(("AUDIO_MIXER_DEVINFO\n"));
+ ((mixer_devinfo_t *)addr)->un.v.delta = 0; /* default */
error = hw->query_devinfo(sc->hw_hdl, (mixer_devinfo_t *)addr);
break;
diff --git a/sys/sys/audioio.h b/sys/sys/audioio.h
index 141ca973fcb..ec79f610af0 100644
--- a/sys/sys/audioio.h
+++ b/sys/sys/audioio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: audioio.h,v 1.11 2000/04/25 23:33:58 csapuntz Exp $ */
+/* $OpenBSD: audioio.h,v 1.12 2001/01/28 09:45:26 aaron Exp $ */
/* $NetBSD: audioio.h,v 1.24 1998/08/13 06:28:41 mrg Exp $ */
/*
@@ -232,6 +232,7 @@ typedef struct mixer_devinfo {
struct audio_mixer_value {
audio_mixer_name_t units;
int num_channels;
+ int delta;
} v;
} un;
} mixer_devinfo_t;