diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2009-04-24 16:05:07 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2009-04-24 16:05:07 +0000 |
| commit | 1342f46d071187250f53817f8dc6f7a424f23836 (patch) | |
| tree | 8b03e79686cfb63958c47c1c0f33774151b1ab08 /sys/dev/pci | |
| parent | 3f6345e0d34d1965a2e4e209f7b1dcd4df7145e6 (diff) | |
drop _generic from azalia_generic_codec_fnode(). there will not
be a non-generic version. move the prototype to azalia.h so it
can also be used in azalia.c in the future.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/azalia.h | 3 | ||||
| -rw-r--r-- | sys/dev/pci/azalia_codec.c | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h index 2f14a4f984a..a3bc08cd13c 100644 --- a/sys/dev/pci/azalia.h +++ b/sys/dev/pci/azalia.h @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.h,v 1.42 2009/04/24 16:02:17 jakemsr Exp $ */ +/* $OpenBSD: azalia.h,v 1.43 2009/04/24 16:05:06 jakemsr Exp $ */ /* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */ /*- @@ -685,3 +685,4 @@ int azalia_codec_init_vtbl(codec_t *); int azalia_codec_construct_format(codec_t *, int, int); int azalia_widget_enabled(const codec_t *, nid_t); int azalia_codec_gpio_quirks(codec_t *); +int azalia_codec_fnode(codec_t *, nid_t, int, int); diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c index 95343d0f788..cf0619b2d47 100644 --- a/sys/dev/pci/azalia_codec.c +++ b/sys/dev/pci/azalia_codec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia_codec.c,v 1.114 2009/01/24 09:44:02 jakemsr Exp $ */ +/* $OpenBSD: azalia_codec.c,v 1.115 2009/04/24 16:05:06 jakemsr Exp $ */ /* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */ /*- @@ -66,7 +66,6 @@ #define STAC9228X_DELL_V1400 0x02271028 int azalia_generic_codec_init_dacgroup(codec_t *); -int azalia_generic_codec_fnode(codec_t *, nid_t, int, int); int azalia_generic_codec_add_convgroup(codec_t *, convgroupset_t *, uint32_t, uint32_t); @@ -359,7 +358,7 @@ azalia_generic_codec_add_convgroup(codec_t *this, convgroupset_t *group, if (k < nconvs) continue; if (type == COP_AWTYPE_AUDIO_OUTPUT) { - k = azalia_generic_codec_fnode + k = azalia_codec_fnode (this, conv, i, 0); if (k < 0) continue; @@ -367,7 +366,7 @@ azalia_generic_codec_add_convgroup(codec_t *this, convgroupset_t *group, if (!azalia_widget_enabled(this, conv)) continue; - k = azalia_generic_codec_fnode + k = azalia_codec_fnode (this, w->nid, conv, 0); if (k < 0) continue; @@ -404,7 +403,7 @@ done: } int -azalia_generic_codec_fnode(codec_t *this, nid_t node, int index, int depth) +azalia_codec_fnode(codec_t *this, nid_t node, int index, int depth) { const widget_t *w; int i, ret; @@ -425,7 +424,7 @@ azalia_generic_codec_fnode(codec_t *this, nid_t node, int index, int depth) for (i = 0; i < w->nconnections; i++) { if (!azalia_widget_enabled(this, w->connections[i])) continue; - ret = azalia_generic_codec_fnode(this, node, + ret = azalia_codec_fnode(this, node, w->connections[i], depth); if (ret >= 0) return ret; |