diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h index 64c11ce7434f..2bd6e396ae10 100644 --- a/sys/dev/audio_if.h +++ b/sys/dev/audio_if.h @@ -1,4 +1,4 @@ -/* $NetBSD: audio_if.h,v 1.39 2002/03/07 14:37:02 kent Exp $ */ +/* $NetBSD: audio_if.h,v 1.40 2002/03/11 14:59:57 kent Exp $ */ /* * Copyright (c) 1994 Havard Eidnes. @@ -54,9 +54,9 @@ struct audio_params { /* * The following four members represent what format is used in a * hardware. If hw_sample_rate != sample_rate || hw_channels != - * channels, the audio framework may adjust data. Encoding and + * channels, the audio framework converts data. Encoding and * precision are converted in sw_code(). - * set_param() should set correct values to them if no conversion is + * set_params() should set correct values to them if no conversion is * neede. */ u_long hw_sample_rate; @@ -72,20 +72,20 @@ struct audio_hw_if { int (*open)(void *, int); /* open hardware */ void (*close)(void *); /* close hardware */ int (*drain)(void *); /* Optional: drain buffers */ - + /* Encoding. */ /* XXX should we have separate in/out? */ int (*query_encoding)(void *, struct audio_encoding *); /* Set the audio encoding parameters (record and play). - * Return 0 on success, or an error code if the + * Return 0 on success, or an error code if the * requested parameters are impossible. * The values in the params struct may be changed (e.g. rounding * to the nearest sample rate.) */ - int (*set_params)(void *, int, int, struct audio_params *, + int (*set_params)(void *, int, int, struct audio_params *, struct audio_params *); - + /* Hardware may have some say in the blocksize to choose */ int (*round_blocksize)(void *, int); @@ -115,20 +115,20 @@ struct audio_hw_if { int (*getdev)(void *, struct audio_device *); int (*setfd)(void *, int); - + /* Mixer (in/out ports) */ int (*set_port)(void *, mixer_ctrl_t *); int (*get_port)(void *, mixer_ctrl_t *); int (*query_devinfo)(void *, mixer_devinfo_t *); - + /* Allocate/free memory for the ring buffer. Usually malloc/free. */ void *(*allocm)(void *, int, size_t, int, int); void (*freem)(void *, void *, int); size_t (*round_buffersize)(void *, int, size_t); paddr_t (*mappage)(void *, void *, off_t, int); - int (*get_props)(void *); /* device properties */ + int (*get_props)(void *); /* device properties */ int (*trigger_output)(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *);