summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1998-11-03 21:15:03 +0000
committerJason Downs <downsj@cvs.openbsd.org>1998-11-03 21:15:03 +0000
commitf10e83087fe10388d339fffd59ebc2785be4d8e5 (patch)
treecd5165e09ecc2c3828f1b2efaeaf0ba80a84e7fb /sys
parent87815b8040f5b8dbdc8d25f2ededd71b2ccf5595 (diff)
Update audio_hw_if.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/isa/aria.c6
-rw-r--r--sys/dev/isa/gus.c5
-rw-r--r--sys/dev/isa/pas.c10
-rw-r--r--sys/dev/isa/pss.c8
-rw-r--r--sys/dev/isa/sb.c10
-rw-r--r--sys/dev/isa/wss.c4
-rw-r--r--sys/dev/isa/ym.c4
7 files changed, 31 insertions, 16 deletions
diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c
index c965453619c..57340ad4b5d 100644
--- a/sys/dev/isa/aria.c
+++ b/sys/dev/isa/aria.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aria.c,v 1.3 1997/07/10 23:06:32 provos Exp $ */
+/* $OpenBSD: aria.c,v 1.4 1998/11/03 21:14:58 downsj Exp $ */
/*
* Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved.
@@ -259,7 +259,9 @@ struct audio_hw_if aria_hw_if = {
aria_mixer_get_port,
aria_mixer_query_devinfo,
1, /* full-duplex */
- 0
+ 0,
+ NULL,
+ NULL
};
/*
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index c3978b3668c..50a6de1db83 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gus.c,v 1.17 1998/08/20 08:37:47 provos Exp $ */
+/* $OpenBSD: gus.c,v 1.18 1998/11/03 21:14:59 downsj Exp $ */
/* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
/*-
@@ -620,6 +620,9 @@ struct audio_hw_if gus_hw_if = {
ad1848_round,
ad1848_mappage,
gus_get_props,
+
+ NULL,
+ NULL
};
static struct audio_hw_if gusmax_hw_if = {
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 058236a37b2..771bf81ad58 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pas.c,v 1.16 1998/05/13 10:25:11 provos Exp $ */
+/* $OpenBSD: pas.c,v 1.17 1998/11/03 21:15:00 downsj Exp $ */
/* $NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $ */
/*
@@ -113,11 +113,11 @@ void pasconf __P((int, int, int, int));
struct audio_hw_if pas_hw_if = {
sbdsp_open,
sbdsp_close,
- 0,
+ NULL,
sbdsp_query_encoding,
sbdsp_set_params,
sbdsp_round_blocksize,
- 0,
+ NULL,
sbdsp_dma_init_output,
sbdsp_dma_init_input,
sbdsp_dma_output,
@@ -126,7 +126,7 @@ struct audio_hw_if pas_hw_if = {
sbdsp_haltdma,
sbdsp_speaker_ctl,
pas_getdev,
- 0,
+ NULL,
sbdsp_mixer_set_port,
sbdsp_mixer_get_port,
sbdsp_mixer_query_devinfo,
@@ -135,6 +135,8 @@ struct audio_hw_if pas_hw_if = {
sb_round,
sb_mappage,
sbdsp_get_props,
+ NULL,
+ NULL
};
/* The Address Translation code is used to convert I/O register addresses to
diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c
index 5258451ffc2..0013819440a 100644
--- a/sys/dev/isa/pss.c
+++ b/sys/dev/isa/pss.c
@@ -1,12 +1,12 @@
-/* $OpenBSD: pss.c,v 1.15 1998/05/13 10:25:07 provos Exp $ */
+/* $OpenBSD: pss.c,v 1.16 1998/11/03 21:15:01 downsj Exp $ */
/* $NetBSD: pss.c,v 1.38 1998/01/12 09:43:44 thorpej Exp $ */
/*
* Copyright (c) 1994 John Brezak
* Copyright (c) 1991-1993 Regents of the University of California.
- * All rightOAs reserved.
+ * All rights reserved.
*
-x * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
@@ -246,6 +246,8 @@ struct audio_hw_if pss_audio_if = {
ad1848_round,
ad1848_mappage,
ad1848_get_props,
+ NULL,
+ NULL
};
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 34e777bf15b..46ee9b33aaa 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sb.c,v 1.15 1998/05/13 10:25:10 provos Exp $ */
+/* $OpenBSD: sb.c,v 1.16 1998/11/03 21:15:01 downsj Exp $ */
/* $NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $ */
/*
@@ -77,11 +77,11 @@ int sb_getdev __P((void *, struct audio_device *));
struct audio_hw_if sb_hw_if = {
sbdsp_open,
sbdsp_close,
- 0,
+ NULL,
sbdsp_query_encoding,
sbdsp_set_params,
sbdsp_round_blocksize,
- 0,
+ NULL,
sbdsp_dma_init_output,
sbdsp_dma_init_input,
sbdsp_dma_output,
@@ -90,7 +90,7 @@ struct audio_hw_if sb_hw_if = {
sbdsp_haltdma,
sbdsp_speaker_ctl,
sb_getdev,
- 0,
+ NULL,
sbdsp_mixer_set_port,
sbdsp_mixer_get_port,
sbdsp_mixer_query_devinfo,
@@ -99,6 +99,8 @@ struct audio_hw_if sb_hw_if = {
sb_round,
sb_mappage,
sbdsp_get_props,
+ NULL,
+ NULL
};
#ifdef AUDIO_DEBUG
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 147298bf6a5..9476f45fb4e 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wss.c,v 1.16 1998/05/08 18:37:24 csapuntz Exp $ */
+/* $OpenBSD: wss.c,v 1.17 1998/11/03 21:15:01 downsj Exp $ */
/* $NetBSD: wss.c,v 1.42 1998/01/19 22:18:23 augustss Exp $ */
/*
@@ -110,6 +110,8 @@ struct audio_hw_if wss_hw_if = {
ad1848_round,
ad1848_mappage,
ad1848_get_props,
+ NULL,
+ NULL
};
/*
diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c
index e752bf3c902..0c527479112 100644
--- a/sys/dev/isa/ym.c
+++ b/sys/dev/isa/ym.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ym.c,v 1.1 1998/05/08 18:37:25 csapuntz Exp $ */
+/* $OpenBSD: ym.c,v 1.2 1998/11/03 21:15:02 downsj Exp $ */
/*
@@ -91,6 +91,8 @@ struct audio_hw_if ym_hw_if = {
ad1848_round,
ad1848_mappage,
ad1848_get_props,
+ NULL,
+ NULL
};