Index: uspace/drv/audio/hdaudio/Makefile =================================================================== --- uspace/drv/audio/hdaudio/Makefile (revision 31ccd42adb90aebbfaf4577da246e4836266f28c) +++ uspace/drv/audio/hdaudio/Makefile (revision 93c3163d85dbf285fc087252626c487aef284ce4) @@ -29,5 +29,5 @@ USPACE_PREFIX = ../../.. LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBPCM_PREFIX)/include BINARY = hdaudio @@ -37,4 +37,5 @@ hdactl.c \ hdaudio.c \ + pcm_iface.c \ stream.c Index: uspace/drv/audio/hdaudio/hdaudio.c =================================================================== --- uspace/drv/audio/hdaudio/hdaudio.c (revision 31ccd42adb90aebbfaf4577da246e4836266f28c) +++ uspace/drv/audio/hdaudio/hdaudio.c (revision 93c3163d85dbf285fc087252626c487aef284ce4) @@ -46,4 +46,5 @@ #include "hdactl.h" #include "hdaudio.h" +#include "pcm_iface.h" #include "spec/regs.h" @@ -71,4 +72,8 @@ }; +ddf_dev_ops_t hda_pcm_ops = { + .interfaces[AUDIO_PCM_BUFFER_IFACE] = &hda_pcm_iface +}; + irq_pio_range_t hdaudio_irq_pio_ranges[] = { { @@ -144,5 +149,5 @@ static int hda_dev_add(ddf_dev_t *dev) { - ddf_fun_t *fun_a; + ddf_fun_t *fun_pcm; hda_t *hda = NULL; hw_res_list_parsed_t res; @@ -264,21 +269,23 @@ ddf_msg(LVL_NOTE, "create function"); - fun_a = ddf_fun_create(dev, fun_exposed, "a"); - if (fun_a == NULL) { - ddf_msg(LVL_ERROR, "Failed creating function 'a'."); + fun_pcm = ddf_fun_create(dev, fun_exposed, "pcm"); + if (fun_pcm == NULL) { + ddf_msg(LVL_ERROR, "Failed creating function 'pcm'."); rc = ENOMEM; goto error; } - hda->fun_a = fun_a; - - rc = ddf_fun_bind(fun_a); + hda->fun_pcm = fun_pcm; + + ddf_fun_set_ops(fun_pcm, &hda_pcm_ops); + + rc = ddf_fun_bind(fun_pcm); if (rc != EOK) { - ddf_msg(LVL_ERROR, "Failed binding function 'a'."); - ddf_fun_destroy(fun_a); - goto error; - } - - ddf_fun_add_to_category(fun_a, "virtual"); + ddf_msg(LVL_ERROR, "Failed binding function 'pcm'."); + ddf_fun_destroy(fun_pcm); + goto error; + } + + ddf_fun_add_to_category(fun_pcm, "audio-pcm"); return EOK; error: @@ -299,10 +306,10 @@ ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev); - if (hda->fun_a != NULL) { - rc = ddf_fun_offline(hda->fun_a); + if (hda->fun_pcm != NULL) { + rc = ddf_fun_offline(hda->fun_pcm); if (rc != EOK) return rc; - rc = ddf_fun_unbind(hda->fun_a); + rc = ddf_fun_unbind(hda->fun_pcm); if (rc != EOK) return rc; @@ -319,6 +326,6 @@ ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev); - if (hda->fun_a != NULL) { - rc = ddf_fun_unbind(hda->fun_a); + if (hda->fun_pcm != NULL) { + rc = ddf_fun_unbind(hda->fun_pcm); if (rc != EOK) return rc; Index: uspace/drv/audio/hdaudio/hdaudio.h =================================================================== --- uspace/drv/audio/hdaudio/hdaudio.h (revision 31ccd42adb90aebbfaf4577da246e4836266f28c) +++ uspace/drv/audio/hdaudio/hdaudio.h (revision 93c3163d85dbf285fc087252626c487aef284ce4) @@ -45,5 +45,5 @@ typedef struct hda { async_sess_t *parent_sess; - ddf_fun_t *fun_a; + ddf_fun_t *fun_pcm; uint64_t rwbase; size_t rwsize; Index: uspace/drv/audio/hdaudio/pcm_iface.c =================================================================== --- uspace/drv/audio/hdaudio/pcm_iface.c (revision 93c3163d85dbf285fc087252626c487aef284ce4) +++ uspace/drv/audio/hdaudio/pcm_iface.c (revision 93c3163d85dbf285fc087252626c487aef284ce4) @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2014 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup hdaudio + * @{ + */ +/** @file High Definition Audio PCM interface + */ + +#include +#include +#include +#include +#include +#include + +static int hda_get_info_str(ddf_fun_t *, const char **); +static unsigned hda_query_cap(ddf_fun_t *, audio_cap_t); +static int hda_test_format(ddf_fun_t *, unsigned *, unsigned *, + pcm_sample_format_t *); +static int hda_get_buffer(ddf_fun_t *, void **, size_t *); +static int hda_get_buffer_position(ddf_fun_t *, size_t *); +static int hda_set_event_session(ddf_fun_t *, async_sess_t *); +static async_sess_t *hda_get_event_session(ddf_fun_t *); +static int hda_release_buffer(ddf_fun_t *); +static int hda_start_playback(ddf_fun_t *, unsigned, unsigned, unsigned, + pcm_sample_format_t); +static int hda_stop_playback(ddf_fun_t *, bool); +static int hda_start_capture(ddf_fun_t *, unsigned, unsigned, unsigned, + pcm_sample_format_t); +static int hda_stop_capture(ddf_fun_t *, bool); + +audio_pcm_iface_t hda_pcm_iface = { + .get_info_str = hda_get_info_str, + .test_format = hda_test_format, + .query_cap = hda_query_cap, + + .get_buffer = hda_get_buffer, + .release_buffer = hda_release_buffer, + .set_event_session = hda_set_event_session, + .get_event_session = hda_get_event_session, + .get_buffer_pos = hda_get_buffer_position, + + .start_playback = hda_start_playback, + .stop_playback = hda_stop_playback, + + .start_capture = hda_start_capture, + .stop_capture = hda_stop_capture +}; + +static int hda_get_info_str(ddf_fun_t *fun, const char **name) +{ + ddf_msg(LVL_NOTE, "hda_get_info_str()"); + return ENOTSUP; +} + +static unsigned hda_query_cap(ddf_fun_t *fun, audio_cap_t cap) +{ + ddf_msg(LVL_NOTE, "hda_query_cap()"); + return ENOTSUP; +} + +static int hda_test_format(ddf_fun_t *fun, unsigned *channels, + unsigned *rate, pcm_sample_format_t *format) +{ + ddf_msg(LVL_NOTE, "hda_test_format()"); + return ENOTSUP; +} + +static int hda_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size) +{ + ddf_msg(LVL_NOTE, "hda_get_buffer()"); + return ENOTSUP; +} + +static int hda_get_buffer_position(ddf_fun_t *fun, size_t *pos) +{ + ddf_msg(LVL_NOTE, "hda_get_buffer_position()"); + return ENOTSUP; +} + +static int hda_set_event_session(ddf_fun_t *fun, async_sess_t *sess) +{ + ddf_msg(LVL_NOTE, "hda_set_event_session()"); + return ENOTSUP; +} + +static async_sess_t *hda_get_event_session(ddf_fun_t *fun) +{ + ddf_msg(LVL_NOTE, "hda_get_event_session()"); + return NULL; +} + +static int hda_release_buffer(ddf_fun_t *fun) +{ + ddf_msg(LVL_NOTE, "hda_release_buffer()"); + return ENOTSUP; +} + +static int hda_start_playback(ddf_fun_t *fun, unsigned frames, + unsigned channels, unsigned rate, pcm_sample_format_t format) +{ + ddf_msg(LVL_NOTE, "hda_start_playback()"); + return ENOTSUP; +} + +static int hda_stop_playback(ddf_fun_t *fun, bool immediate) +{ + ddf_msg(LVL_NOTE, "hda_stop_playback()"); + return ENOTSUP; +} + +static int hda_start_capture(ddf_fun_t *fun, unsigned frames, unsigned channels, + unsigned rate, pcm_sample_format_t format) +{ + ddf_msg(LVL_NOTE, "hda_start_capture()"); + return ENOTSUP; +} + +static int hda_stop_capture(ddf_fun_t *fun, bool immediate) +{ + ddf_msg(LVL_NOTE, "hda_stop_capture()"); + return ENOTSUP; +} + +/** @} + */ Index: uspace/drv/audio/hdaudio/pcm_iface.h =================================================================== --- uspace/drv/audio/hdaudio/pcm_iface.h (revision 93c3163d85dbf285fc087252626c487aef284ce4) +++ uspace/drv/audio/hdaudio/pcm_iface.h (revision 93c3163d85dbf285fc087252626c487aef284ce4) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2014 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup hdaudio + * @{ + */ +/** @file High Definition Audio PCM interface + */ + +#ifndef PCM_IFACE_H +#define PCM_IFACE_H + +#include + +extern audio_pcm_iface_t hda_pcm_iface; + +#endif + +/** @} + */