[src/trunk]: src Fix pasto in type of dev_ioctl method.

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75064645544f
branches:  trunk
changeset: 515727:75064645544f
user:      augustss <augustss%NetBSD.org@localhost>
date:      Wed Oct 03 20:48:41 2001 +0000

description:
Fix pasto in type of dev_ioctl method.

diffstat:

 share/man/man9/audio.9 |   7 +++----
 sys/dev/audio.c        |  11 +++++------
 sys/dev/audio_if.h     |   5 ++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diffs (80 lines):

diff -r 5e4a438b3348 -r 75064645544f share/man/man9/audio.9
--- a/share/man/man9/audio.9    Wed Oct 03 20:29:39 2001 +0000
+++ b/share/man/man9/audio.9    Wed Oct 03 20:48:41 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: audio.9,v 1.18 2001/10/02 23:58:03 augustss Exp $
+.\"    $NetBSD: audio.9,v 1.19 2001/10/03 20:50:31 augustss Exp $
 .\"
 .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -92,8 +92,7 @@
                    void (*)(void *), void *, struct audio_params *);
        int     (*trigger_input)(void *, void *, void *, int,
                    void (*)(void *), void *, struct audio_params *);
-       int     (*dev_ioctl)(struct audio_softc *sc, u_long cmd,
-                   caddr_t addr, int flag, struct proc *p);
+       int     (*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
 };
 
 struct audio_params {
@@ -411,7 +410,7 @@
 Once started the transfer may be stopped using
 .Va halt_input .
 Return 0 on success, otherwise an error code.
-.It Dv int dev_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr,
+.It Dv int dev_ioctl(void *hdl, u_long cmd, caddr_t addr,
 .br
 .Dv "int flag, struct proc *p)"
 .br
diff -r 5e4a438b3348 -r 75064645544f sys/dev/audio.c
--- a/sys/dev/audio.c   Wed Oct 03 20:29:39 2001 +0000
+++ b/sys/dev/audio.c   Wed Oct 03 20:48:41 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.141 2001/10/03 00:04:49 augustss Exp $     */
+/*     $NetBSD: audio.c,v 1.142 2001/10/03 20:48:41 augustss Exp $     */
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -1671,7 +1671,7 @@
 
        default:
                if (hw->dev_ioctl) {
-                       error = hw->dev_ioctl(sc, cmd, addr, flag, p);
+                       error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
                } else {
                        DPRINTF(("audio_ioctl: unknown ioctl\n"));
                        error = EINVAL;
@@ -2891,11 +2891,10 @@
                break;
 
        default:
-               if (hw->dev_ioctl) {
-                       error = hw->dev_ioctl(sc, cmd, addr, flag, p);
-               } else {
+               if (hw->dev_ioctl)
+                       error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
+               else
                        error = EINVAL;
-               }
                break;
        }
        DPRINTF(("mixer_ioctl(%lu,'%c',%lu) result %d\n",
diff -r 5e4a438b3348 -r 75064645544f sys/dev/audio_if.h
--- a/sys/dev/audio_if.h        Wed Oct 03 20:29:39 2001 +0000
+++ b/sys/dev/audio_if.h        Wed Oct 03 20:48:41 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio_if.h,v 1.37 2001/10/03 00:04:49 augustss Exp $   */
+/*     $NetBSD: audio_if.h,v 1.38 2001/10/03 20:48:41 augustss Exp $   */
 
 /*
  * Copyright (c) 1994 Havard Eidnes.
@@ -122,8 +122,7 @@
                    void (*)(void *), void *, struct audio_params *);
        int     (*trigger_input)(void *, void *, void *, int,
                    void (*)(void *), void *, struct audio_params *);
-       int     (*dev_ioctl)(struct audio_softc *sc, u_long cmd, caddr_t addr,
-                   int flag, struct proc *p);
+       int     (*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
 };
 
 struct audio_attach_args {