Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pasto in type of dev_ioctl method.

This commit is contained in:
augustss 2001-10-03 20:48:41 +00:00
parent 4aaca49ce6
commit 3d2be4cf9b
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/man/man9/audio.9
View File

@ -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. .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
.\" All rights reserved. .\" All rights reserved.
@ -92,8 +92,7 @@ struct audio_hw_if {
void (*)(void *), void *, struct audio_params *); void (*)(void *), void *, struct audio_params *);
int (*trigger_input)(void *, void *, void *, int, int (*trigger_input)(void *, void *, void *, int,
void (*)(void *), void *, struct audio_params *); void (*)(void *), void *, struct audio_params *);
int (*dev_ioctl)(struct audio_softc *sc, u_long cmd, int (*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
caddr_t addr, int flag, struct proc *p);
}; };
struct audio_params { struct audio_params {
@ -411,7 +410,7 @@ should be called with the argument
Once started the transfer may be stopped using Once started the transfer may be stopped using
.Va halt_input . .Va halt_input .
Return 0 on success, otherwise an error code. 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 .br
.Dv "int flag, struct proc *p)" .Dv "int flag, struct proc *p)"
.br .br

11
sys/dev/audio.c
View File

@ -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. * Copyright (c) 1991-1993 Regents of the University of California.
@ -1671,7 +1671,7 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
default: default:
if (hw->dev_ioctl) { 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 { } else {
DPRINTF(("audio_ioctl: unknown ioctl\n")); DPRINTF(("audio_ioctl: unknown ioctl\n"));
error = EINVAL; error = EINVAL;
@ -2891,11 +2891,10 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
break; break;
default: default:
if (hw->dev_ioctl) { 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 { else
error = EINVAL; error = EINVAL;
}
break; break;
} }
DPRINTF(("mixer_ioctl(%lu,'%c',%lu) result %d\n", DPRINTF(("mixer_ioctl(%lu,'%c',%lu) result %d\n",

5
sys/dev/audio_if.h
View File

@ -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. * Copyright (c) 1994 Havard Eidnes.
@ -122,8 +122,7 @@ struct audio_hw_if {
void (*)(void *), void *, struct audio_params *); void (*)(void *), void *, struct audio_params *);
int (*trigger_input)(void *, void *, void *, int, int (*trigger_input)(void *, void *, void *, int,
void (*)(void *), void *, struct audio_params *); void (*)(void *), void *, struct audio_params *);
int (*dev_ioctl)(struct audio_softc *sc, u_long cmd, caddr_t addr, int (*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
int flag, struct proc *p);
}; };
struct audio_attach_args { struct audio_attach_args {