Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/drv/Makefile (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -38,4 +38,6 @@ generic/log.c \ generic/logbuf.c \ + generic/remote_audio_mixer.c \ + generic/remote_audio_pcm_buffer.c \ generic/remote_hw_res.c \ generic/remote_char_dev.c \ Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/drv/generic/dev_iface.c (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -46,14 +46,18 @@ #include "remote_usbhid.h" #include "remote_pci.h" +#include "remote_audio_mixer.h" +#include "remote_audio_pcm_buffer.h" -static iface_dipatch_table_t remote_ifaces = { +static const iface_dipatch_table_t remote_ifaces = { .ifaces = { - &remote_hw_res_iface, - &remote_char_dev_iface, - &remote_nic_iface, - &remote_pci_iface, - &remote_usb_iface, - &remote_usbhc_iface, - &remote_usbhid_iface + [AUDIO_MIXER_IFACE] = &remote_audio_mixer_iface, + [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_buffer_iface, + [HW_RES_DEV_IFACE] = &remote_hw_res_iface, + [CHAR_DEV_IFACE] = &remote_char_dev_iface, + [NIC_DEV_IFACE] = &remote_nic_iface, + [PCI_DEV_IFACE] = &remote_pci_iface, + [USB_DEV_IFACE] = &remote_usb_iface, + [USBHC_DEV_IFACE] = &remote_usbhc_iface, + [USBHID_DEV_IFACE] = &remote_usbhid_iface, } }; Index: uspace/lib/drv/generic/remote_audio_mixer.c =================================================================== --- uspace/lib/drv/generic/remote_audio_mixer.c (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) +++ uspace/lib/drv/generic/remote_audio_mixer.c (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -0,0 +1,447 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 libdrv + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +#include "audio_mixer_iface.h" +#include "ddf/driver.h" + +typedef enum { + /** Asks for basic mixer info: Mixer name and number of controllable + * items. + * Answer: + * - ENOTSUP - call not supported + * - EOK - call successful, info is valid + * Answer arguments: + * - Mixer name + * - Number of controllable items + */ + IPC_M_AUDIO_MIXER_GET_INFO, + + /** Asks for item mixer info: Item name and number of controllable + * channels. + * Answer: + * - ENOTSUP - call not supported + * - ENOENT - no such item + * - EOK - call successful, info is valid + * Answer arguments: + * - Item name + * - Number of controllable channels + */ + IPC_M_AUDIO_MIXER_GET_ITEM_INFO, + + /** Asks for channel name and number of volume levels. + * Answer: + * - ENOTSUP - call not supported + * - ENOENT - no such channel + * - EOK - call successful, info is valid + * Answer arguments: + * - Channel name + * - Volume levels + */ + IPC_M_AUDIO_MIXER_GET_CHANNEL_INFO, + + /** Set channel mute status + * Answer: + * - ENOTSUP - call not supported + * - ENOENT - no such channel + * - EOK - call successful, info is valid + */ + IPC_M_AUDIO_MIXER_CHANNEL_MUTE_SET, + + /** Get channel mute status + * Answer: + * - ENOTSUP - call not supported + * - ENOENT - no such channel + * - EOK - call successful, info is valid + * Answer arguments: + * - Channel mute status + */ + IPC_M_AUDIO_MIXER_CHANNEL_MUTE_GET, + + /** Set channel volume level + * Answer: + * - ENOTSUP - call not supported + * - ENOENT - no such channel + * - EOK - call successful, info is valid + */ + IPC_M_AUDIO_MIXER_CHANNEL_VOLUME_SET, + + /** Get channel volume level + * Answer: + * - ENOTSUP - call not supported + * - ENOENT - no such channel + * - EOK - call successful, info is valid + * Answer arguments: + * - Channel volume level + * - Channel maximum volume level + */ + IPC_M_AUDIO_MIXER_CHANNEL_VOLUME_GET, +} audio_mixer_iface_funcs_t; + +/* + * CLIENT SIDE + */ +int audio_mixer_get_info(async_exch_t *exch, const char **name, unsigned *items) +{ + if (!exch) + return EINVAL; + sysarg_t name_size, itemc; + const int ret = async_req_1_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE), + IPC_M_AUDIO_MIXER_GET_INFO, &name_size, &itemc); + if (ret == EOK && name) { + char *name_place = calloc(1, name_size); + if (!name_place) { + /* Make the other side fail + * as it waits for read request */ + async_data_read_start(exch, (void*)-1, 0); + return ENOMEM; + } + const int ret = + async_data_read_start(exch, name_place, name_size); + if (ret != EOK) { + free(name_place); + return ret; + } + *name = name_place; + } + if (ret == EOK && items) + *items = itemc; + return ret; +} +/*----------------------------------------------------------------------------*/ +int audio_mixer_get_item_info(async_exch_t *exch, unsigned item, + const char ** name, unsigned *channels) +{ + if (!exch) + return EINVAL; + sysarg_t name_size, chans; + const int ret = async_req_2_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE), + IPC_M_AUDIO_MIXER_GET_ITEM_INFO, item, &name_size, &chans); + if (ret == EOK && name) { + char *name_place = calloc(1, name_size); + if (!name_place) { + /* Make the other side fail + * as it waits for read request */ + async_data_read_start(exch, (void*)-1, 0); + return ENOMEM; + } + const int ret = + async_data_read_start(exch, name_place, name_size); + if (ret != EOK) { + free(name_place); + return ret; + } + *name = name_place; + } + if (ret == EOK && chans) + *channels = chans; + return ret; +} +/*----------------------------------------------------------------------------*/ +int audio_mixer_get_channel_info(async_exch_t *exch, unsigned item, + unsigned channel, const char **name, unsigned *volume_levels) +{ + if (!exch) + return EINVAL; + sysarg_t name_size, levels; + const int ret = async_req_3_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE), + IPC_M_AUDIO_MIXER_GET_CHANNEL_INFO, item, channel, + &name_size, &levels); + if (ret == EOK && name) { + char *name_place = calloc(1, name_size); + if (!name_place) { + /* Make the other side fail + * as it waits for read request */ + async_data_read_start(exch, (void*)-1, 0); + return ENOMEM; + } + const int ret = + async_data_read_start(exch, name_place, name_size); + if (ret != EOK) { + free(name_place); + return ret; + } + *name = name_place; + } + if (ret == EOK && volume_levels) + *volume_levels = levels; + return ret; +} +/*----------------------------------------------------------------------------*/ +int audio_mixer_channel_mute_set(async_exch_t *exch, unsigned item, + unsigned channel, bool mute_status) +{ + if (!exch) + return EINVAL; + return async_req_4_0(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE), + IPC_M_AUDIO_MIXER_CHANNEL_MUTE_SET, item, channel, mute_status); +} +/*----------------------------------------------------------------------------*/ +int audio_mixer_channel_mute_get(async_exch_t *exch, unsigned item, + unsigned channel, bool *mute_status) +{ + if (!exch) + return EINVAL; + sysarg_t mute; + const int ret = async_req_3_1(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE), + IPC_M_AUDIO_MIXER_CHANNEL_MUTE_GET, item, channel, &mute); + if (ret == EOK && mute_status) + *mute_status = (bool)mute; + return ret; +} +/*----------------------------------------------------------------------------*/ +int audio_mixer_channel_volume_set(async_exch_t *exch, unsigned item, + unsigned channel, unsigned volume) +{ + if (!exch) + return EINVAL; + return async_req_4_0(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE), + IPC_M_AUDIO_MIXER_CHANNEL_VOLUME_SET, item, channel, volume); +} +/*----------------------------------------------------------------------------*/ +int audio_mixer_channel_volume_get(async_exch_t *exch, unsigned item, + unsigned channel, unsigned *volume_current, unsigned *volume_max) +{ + if (!exch) + return EINVAL; + sysarg_t current, max; + const int ret = async_req_3_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE), + IPC_M_AUDIO_MIXER_CHANNEL_VOLUME_GET, item, channel, + ¤t, &max); + if (ret == EOK && volume_current) + *volume_current = current; + if (ret == EOK && volume_max) + *volume_max = max; + return ret; +} + +/* + * SERVER SIDE + */ +static void remote_audio_mixer_get_info(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_mixer_get_item_info(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_mixer_get_channel_info(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_mixer_channel_mute_set(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_mixer_channel_mute_get(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_mixer_channel_volume_set(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_mixer_channel_volume_get(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); + +/** Remote audio mixer interface operations. */ +static remote_iface_func_ptr_t remote_audio_mixer_iface_ops[] = { + [IPC_M_AUDIO_MIXER_GET_INFO] = remote_audio_mixer_get_info, + [IPC_M_AUDIO_MIXER_GET_ITEM_INFO] = remote_audio_mixer_get_item_info, + [IPC_M_AUDIO_MIXER_GET_CHANNEL_INFO] = remote_audio_mixer_get_channel_info, + [IPC_M_AUDIO_MIXER_CHANNEL_MUTE_SET] = remote_audio_mixer_channel_mute_set, + [IPC_M_AUDIO_MIXER_CHANNEL_MUTE_GET] = remote_audio_mixer_channel_mute_get, + [IPC_M_AUDIO_MIXER_CHANNEL_VOLUME_SET] = remote_audio_mixer_channel_volume_set, + [IPC_M_AUDIO_MIXER_CHANNEL_VOLUME_GET] = remote_audio_mixer_channel_volume_get, +}; + +/** Remote audio mixer interface structure. */ +remote_iface_t remote_audio_mixer_iface = { + .method_count = sizeof(remote_audio_mixer_iface_ops) / + sizeof(remote_audio_mixer_iface_ops[0]), + .methods = remote_audio_mixer_iface_ops +}; +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_get_info( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->get_info) { + async_answer_0(callid, ENOTSUP); + return; + } + const char *name = NULL; + unsigned items = 0; + const int ret = mixer_iface->get_info(fun, &name, &items); + const size_t name_size = name ? str_size(name) + 1 : 0; + async_answer_2(callid, ret, name_size, items); + /* Send the name. */ + if (ret == EOK && name_size > 0) { + size_t size; + ipc_callid_t name_id; + if (!async_data_read_receive(&name_id, &size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (size != name_size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_data_read_finalize(name_id, name, name_size); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_get_item_info( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->get_item_info) { + async_answer_0(callid, ENOTSUP); + return; + } + + const unsigned item = DEV_IPC_GET_ARG1(*call); + const char *name = NULL; + unsigned channels = 0; + const int ret = mixer_iface->get_item_info(fun, item, &name, &channels); + const size_t name_size = name ? str_size(name) + 1 : 0; + async_answer_2(callid, ret, name_size, channels); + /* Send the name. */ + if (ret == EOK && name_size > 0) { + size_t size; + ipc_callid_t name_id; + if (!async_data_read_receive(&name_id, &size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (size != name_size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_data_read_finalize(name_id, name, name_size); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_get_channel_info( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->get_channel_info) { + async_answer_0(callid, ENOTSUP); + return; + } + + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + const char *name = NULL; + unsigned levels = 0; + const int ret = + mixer_iface->get_channel_info(fun, item, channel, &name, &levels); + const size_t name_size = name ? str_size(name) + 1 : 0; + async_answer_2(callid, ret, name_size, levels); + /* Send the name. */ + if (ret == EOK && name_size > 0) { + size_t size; + ipc_callid_t name_id; + if (!async_data_read_receive(&name_id, &size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (size != name_size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_data_read_finalize(name_id, name, name_size); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_mute_set( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_mute_set) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + const bool mute = DEV_IPC_GET_ARG3(*call); + const int ret = mixer_iface->channel_mute_set(fun, item, channel, mute); + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_mute_get( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_mute_get) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + bool mute = false; + const int ret = + mixer_iface->channel_mute_get(fun, item, channel, &mute); + async_answer_1(callid, ret, mute); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_volume_set( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_volume_set) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + const unsigned level = DEV_IPC_GET_ARG3(*call); + const int ret = + mixer_iface->channel_volume_set(fun, item, channel, level); + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_volume_get( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_volume_get) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + unsigned current = 0, max = 0; + const int ret = + mixer_iface->channel_volume_get(fun, item, channel, ¤t, &max); + async_answer_2(callid, ret, current, max); +} + +/** + * @} + */ Index: uspace/lib/drv/generic/remote_audio_pcm_buffer.c =================================================================== --- uspace/lib/drv/generic/remote_audio_pcm_buffer.c (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) +++ uspace/lib/drv/generic/remote_audio_pcm_buffer.c (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -0,0 +1,479 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 libdrv + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + +#include "audio_pcm_buffer_iface.h" +#include "ddf/driver.h" + +typedef enum { + IPC_M_AUDIO_PCM_GET_INFO_STR, + IPC_M_AUDIO_PCM_GET_BUFFER, + IPC_M_AUDIO_PCM_RELEASE_BUFFER, + IPC_M_AUDIO_PCM_START_PLAYBACK, + IPC_M_AUDIO_PCM_STOP_PLAYBACK, + IPC_M_AUDIO_PCM_START_RECORD, + IPC_M_AUDIO_PCM_STOP_RECORD, +} audio_pcm_iface_funcs_t; + +/* + * CLIENT SIDE + */ +int audio_pcm_buffer_get_info_str(async_exch_t *exch, const char **name) +{ + if (!exch) + return EINVAL; + sysarg_t name_size; + const int ret = async_req_1_1(exch, + DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), + IPC_M_AUDIO_PCM_GET_INFO_STR, &name_size); + if (ret == EOK && name) { + char *name_place = calloc(1, name_size); + if (!name_place) { + /* Make the other side fail + * as it waits for read request */ + async_data_read_start(exch, (void*)-1, 0); + return ENOMEM; + } + const int ret = + async_data_read_start(exch, name_place, name_size); + if (ret != EOK) { + free(name_place); + return ret; + } + *name = name_place; + } + return ret; +} +/*----------------------------------------------------------------------------*/ +int audio_pcm_buffer_get_buffer(async_exch_t *exch, void **buffer, size_t *size, + unsigned *id) +{ + if (!exch || !buffer || !size) + return EINVAL; + sysarg_t buffer_size, buffer_id; + const int ret = async_req_1_2(exch, + DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_GET_BUFFER, + &buffer_size, &buffer_id); + if (ret == EOK) { + void *dst = as_get_mappable_page(buffer_size); + // FIXME Should we create as_area? + // FIXME Do we need to know the flags? + const int ret = + async_share_in_start_0_0(exch, dst, buffer_size); + if (ret != EOK) { + return ret; + } + *buffer = dst; + *size = buffer_size; + } + if (ret == EOK && id) + *id = buffer_id; + return ret; +} +/*----------------------------------------------------------------------------*/ +int audio_pcm_buffer_release_buffer(async_exch_t *exch, unsigned id) +{ + if (!exch) + return EINVAL; + return async_req_2_0(exch, DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), + IPC_M_AUDIO_PCM_RELEASE_BUFFER, id); +} +/*----------------------------------------------------------------------------*/ +int audio_pcm_buffer_start_playback(async_exch_t *exch, unsigned id, + unsigned sample_rate, uint16_t sample_size, uint8_t channels, bool sign) +{ + if (!exch) + return EINVAL; + sysarg_t packed = + (sample_size << 16) | (channels << 8) | (sign ? 1 : 0); + return async_req_4_0(exch, DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), + IPC_M_AUDIO_PCM_START_PLAYBACK, id, sample_rate, packed); +} +/*----------------------------------------------------------------------------*/ +int audio_pcm_buffer_stop_playback(async_exch_t *exch, unsigned id) +{ + if (!exch) + return EINVAL; + return async_req_2_0(exch, DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), + IPC_M_AUDIO_PCM_STOP_PLAYBACK, id); +} +/*----------------------------------------------------------------------------*/ +int audio_pcm_buffer_start_record(async_exch_t *exch, unsigned id, + unsigned sample_rate, unsigned sample_size, unsigned channels, bool sign) +{ + if (!exch || sample_size > UINT16_MAX || channels > (UINT16_MAX >> 1)) + return EINVAL; + sysarg_t packed = sample_size << 16 | channels << 1 | sign ? 1 : 0; + return async_req_4_0(exch, DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), + IPC_M_AUDIO_PCM_START_RECORD, id, sample_rate, packed); +} +/*----------------------------------------------------------------------------*/ +int audio_pcm_buffer_stop_record(async_exch_t *exch, unsigned id) +{ + if (!exch) + return EINVAL; + return async_req_2_0(exch, DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), + IPC_M_AUDIO_PCM_STOP_RECORD, id); +} + +/* + * SERVER SIDE + */ +static void remote_audio_pcm_get_info_str(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_pcm_get_buffer(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_pcm_release_buffer(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_pcm_start_playback(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_pcm_stop_playback(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_pcm_start_record(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_audio_pcm_stop_record(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); + +/** Remote audio pcm buffer interface operations. */ +static remote_iface_func_ptr_t remote_audio_pcm_iface_ops[] = { + [IPC_M_AUDIO_PCM_GET_INFO_STR] = remote_audio_pcm_get_info_str, + [IPC_M_AUDIO_PCM_GET_BUFFER] = remote_audio_pcm_get_buffer, + [IPC_M_AUDIO_PCM_RELEASE_BUFFER] = remote_audio_pcm_release_buffer, + [IPC_M_AUDIO_PCM_START_PLAYBACK] = remote_audio_pcm_start_playback, + [IPC_M_AUDIO_PCM_STOP_PLAYBACK] = remote_audio_pcm_stop_playback, + [IPC_M_AUDIO_PCM_START_RECORD] = remote_audio_pcm_start_record, + [IPC_M_AUDIO_PCM_STOP_RECORD] = remote_audio_pcm_stop_record, +}; + +/** Remote audio mixer interface structure. */ +remote_iface_t remote_audio_pcm_buffer_iface = { + .method_count = sizeof(remote_audio_pcm_iface_ops) / + sizeof(remote_audio_pcm_iface_ops[0]), + .methods = remote_audio_pcm_iface_ops +}; +/*----------------------------------------------------------------------------*/ +void remote_audio_pcm_get_info_str(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const audio_pcm_buffer_iface_t *pcm_iface = iface; + + if (!pcm_iface->get_info_str) { + async_answer_0(callid, ENOTSUP); + return; + } + const char *name = NULL; + const int ret = pcm_iface->get_info_str(fun, &name); + const size_t name_size = name ? str_size(name) + 1 : 0; + async_answer_1(callid, ret, name_size); + /* Send the string. */ + if (ret == EOK && name_size > 0) { + size_t size; + ipc_callid_t name_id; + if (!async_data_read_receive(&name_id, &size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (size != name_size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_data_read_finalize(name_id, name, name_size); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_pcm_get_buffer(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const audio_pcm_buffer_iface_t *pcm_iface = iface; + + if (!pcm_iface->get_buffer) { + async_answer_0(callid, ENOTSUP); + return; + } + void *buffer = NULL; + size_t size = 0; + unsigned id = 0; + const int ret = pcm_iface->get_buffer(fun, &buffer, &size, &id); + async_answer_2(callid, ret, size, id); + /* Share the buffer. */ + if (ret == EOK && size > 0) { + size_t share_size; + ipc_callid_t name_id; + if (!async_share_in_receive(&name_id, &share_size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (share_size != size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_share_in_finalize(name_id, buffer, PROTO_READ | PROTO_WRITE); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_pcm_release_buffer(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const audio_pcm_buffer_iface_t *pcm_iface = iface; + + const unsigned id = DEV_IPC_GET_ARG1(*call); + const int ret = pcm_iface->release_buffer ? + pcm_iface->release_buffer(fun, id) : ENOTSUP; + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_pcm_start_playback(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const audio_pcm_buffer_iface_t *pcm_iface = iface; + + const unsigned id = DEV_IPC_GET_ARG1(*call); + const unsigned rate = DEV_IPC_GET_ARG2(*call); + const unsigned size = DEV_IPC_GET_ARG3(*call) >> 16; + const unsigned channels = (DEV_IPC_GET_ARG3(*call) >> 8) && UINT8_MAX; + const bool sign = (bool)(DEV_IPC_GET_ARG3(*call) & 1); + + const int ret = pcm_iface->start_playback + ? pcm_iface->start_playback(fun, id, rate, size, channels, sign) + : ENOTSUP; + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_pcm_stop_playback(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const audio_pcm_buffer_iface_t *pcm_iface = iface; + + const unsigned id = DEV_IPC_GET_ARG1(*call); + const int ret = pcm_iface->stop_playback ? + pcm_iface->stop_playback(fun, id) : ENOTSUP; + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_pcm_start_record(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const audio_pcm_buffer_iface_t *pcm_iface = iface; + + const unsigned id = DEV_IPC_GET_ARG1(*call); + const unsigned rate = DEV_IPC_GET_ARG2(*call); + const unsigned size = DEV_IPC_GET_ARG3(*call) >> 16; + const unsigned channels = (DEV_IPC_GET_ARG3(*call) & UINT16_MAX) >> 1; + const bool sign = (bool)(DEV_IPC_GET_ARG3(*call) & 1); + + const int ret = pcm_iface->start_record + ? pcm_iface->start_record(fun, id, rate, size, channels, sign) + : ENOTSUP; + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_pcm_stop_record(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const audio_pcm_buffer_iface_t *pcm_iface = iface; + + const unsigned id = DEV_IPC_GET_ARG1(*call); + const int ret = pcm_iface->stop_record ? + pcm_iface->stop_record(fun, id) : ENOTSUP; + async_answer_0(callid, ret); +} + +#if 0 +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_get_info( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->get_info) { + async_answer_0(callid, ENOTSUP); + return; + } + const char *name = NULL; + unsigned items = 0; + const int ret = mixer_iface->get_info(fun, &name, &items); + const size_t name_size = name ? str_size(name) + 1 : 0; + async_answer_2(callid, ret, name_size, items); + /* Send the name. */ + if (ret == EOK && name_size > 0) { + size_t size; + ipc_callid_t name_id; + if (!async_data_read_receive(&name_id, &size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (size != name_size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_data_read_finalize(name_id, name, name_size); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_get_item_info( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->get_item_info) { + async_answer_0(callid, ENOTSUP); + return; + } + + const unsigned item = DEV_IPC_GET_ARG1(*call); + const char *name = NULL; + unsigned channels = 0; + const int ret = mixer_iface->get_item_info(fun, item, &name, &channels); + const size_t name_size = name ? str_size(name) + 1 : 0; + async_answer_2(callid, ret, name_size, channels); + /* Send the name. */ + if (ret == EOK && name_size > 0) { + size_t size; + ipc_callid_t name_id; + if (!async_data_read_receive(&name_id, &size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (size != name_size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_data_read_finalize(name_id, name, name_size); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_get_channel_info( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->get_channel_info) { + async_answer_0(callid, ENOTSUP); + return; + } + + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + const char *name = NULL; + unsigned levels = 0; + const int ret = + mixer_iface->get_channel_info(fun, item, channel, &name, &levels); + const size_t name_size = name ? str_size(name) + 1 : 0; + async_answer_2(callid, ret, name_size, levels); + /* Send the name. */ + if (ret == EOK && name_size > 0) { + size_t size; + ipc_callid_t name_id; + if (!async_data_read_receive(&name_id, &size)) { + async_answer_0(name_id, EPARTY); + return; + } + if (size != name_size) { + async_answer_0(name_id, ELIMIT); + return; + } + async_data_read_finalize(name_id, name, name_size); + } +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_mute_set( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_mute_set) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + const bool mute = DEV_IPC_GET_ARG3(*call); + const int ret = mixer_iface->channel_mute_set(fun, item, channel, mute); + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_mute_get( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_mute_get) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + bool mute = false; + const int ret = + mixer_iface->channel_mute_get(fun, item, channel, &mute); + async_answer_1(callid, ret, mute); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_volume_set( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_volume_set) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + const unsigned level = DEV_IPC_GET_ARG3(*call); + const int ret = + mixer_iface->channel_volume_set(fun, item, channel, level); + async_answer_0(callid, ret); +} +/*----------------------------------------------------------------------------*/ +void remote_audio_mixer_channel_volume_get( + ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call) +{ + audio_mixer_iface_t *mixer_iface = iface; + + if (!mixer_iface->channel_volume_get) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned item = DEV_IPC_GET_ARG1(*call); + const unsigned channel = DEV_IPC_GET_ARG2(*call); + unsigned current = 0, max = 0; + const int ret = + mixer_iface->channel_volume_get(fun, item, channel, ¤t, &max); + async_answer_2(callid, ret, current, max); +} +#endif + +/** + * @} + */ + Index: uspace/lib/drv/generic/remote_hw_res.c =================================================================== --- uspace/lib/drv/generic/remote_hw_res.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/drv/generic/remote_hw_res.c (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Lenka Trochtova + * Copyright (c) 2011 Jan Vesely * All rights reserved. * @@ -43,8 +44,11 @@ static void remote_hw_res_enable_interrupt(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); static remote_iface_func_ptr_t remote_hw_res_iface_ops [] = { - &remote_hw_res_get_resource_list, - &remote_hw_res_enable_interrupt + [HW_RES_GET_RESOURCE_LIST] = &remote_hw_res_get_resource_list, + [HW_RES_ENABLE_INTERRUPT] = &remote_hw_res_enable_interrupt, + [HW_RES_DMA_CHANNEL_SETUP] = &remote_hw_res_dma_channel_setup, }; @@ -94,4 +98,23 @@ } +static void remote_hw_res_dma_channel_setup(ddf_fun_t *fun, void *ops, + ipc_callid_t callid, ipc_call_t *call) +{ + hw_res_ops_t *hw_res_ops = ops; + + if (hw_res_ops->dma_channel_setup == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + const unsigned channel = DEV_IPC_GET_ARG1(*call); + const uint32_t address = DEV_IPC_GET_ARG2(*call); + const uint16_t size = DEV_IPC_GET_ARG3(*call) & 0xffff; + const uint8_t mode = DEV_IPC_GET_ARG3(*call) >> 16; + + const int ret = hw_res_ops->dma_channel_setup( + fun, channel, address, size, mode); + async_answer_0(callid, ret); +} + /** * @} Index: uspace/lib/drv/include/audio_mixer_iface.h =================================================================== --- uspace/lib/drv/include/audio_mixer_iface.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) +++ uspace/lib/drv/include/audio_mixer_iface.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 libdrv + * @addtogroup usb + * @{ + */ +/** @file + * @brief Audio mixer control interface. + */ + +#ifndef LIBDRV_AUDIO_MIXER_IFACE_H_ +#define LIBDRV_AUDIO_MIXER_IFACE_H_ + +#include +#include + +#include "ddf/driver.h" + +int audio_mixer_get_info(async_exch_t *, const char **, unsigned *); +int audio_mixer_get_item_info(async_exch_t *, unsigned, + const char **, unsigned *); +int audio_mixer_get_channel_info(async_exch_t *, unsigned, unsigned, + const char **, unsigned *); +int audio_mixer_channel_mute_set(async_exch_t *, unsigned, unsigned, bool); +int audio_mixer_channel_mute_get(async_exch_t *, unsigned, unsigned, bool *); +int audio_mixer_channel_volume_set(async_exch_t *, unsigned, unsigned, + unsigned); +int audio_mixer_channel_volume_get(async_exch_t *, unsigned, unsigned, + unsigned *, unsigned *); + + +/** Audio mixer communication interface. */ +typedef struct { + int (*get_info)(ddf_fun_t *, const char **, unsigned *); + int (*get_item_info)(ddf_fun_t *, unsigned, const char **, unsigned *); + int (*get_channel_info)(ddf_fun_t *, unsigned, unsigned, + const char **, unsigned *); + int (*channel_mute_set)(ddf_fun_t *, unsigned, unsigned, bool); + int (*channel_mute_get)(ddf_fun_t *, unsigned, unsigned, bool *); + int (*channel_volume_set)(ddf_fun_t *, unsigned, unsigned, unsigned); + int (*channel_volume_get)(ddf_fun_t *, unsigned, unsigned, + unsigned *, unsigned *); +} audio_mixer_iface_t; + +#endif +/** + * @} + */ Index: uspace/lib/drv/include/audio_pcm_buffer_iface.h =================================================================== --- uspace/lib/drv/include/audio_pcm_buffer_iface.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) +++ uspace/lib/drv/include/audio_pcm_buffer_iface.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 libdrv + * @addtogroup usb + * @{ + */ +/** @file + * @brief Audio PCM buffer interface. + */ + +#ifndef LIBDRV_AUDIO_PCM_BUFFER_IFACE_H_ +#define LIBDRV_AUDIO_PCM_BUFFER_IFACE_H_ + +#include +#include + +#include "ddf/driver.h" + +int audio_pcm_buffer_get_info_str(async_exch_t *, const char **); +int audio_pcm_buffer_get_buffer(async_exch_t *, void **, size_t *, unsigned *); +int audio_pcm_buffer_release_buffer(async_exch_t *, unsigned); + +int audio_pcm_buffer_start_playback(async_exch_t *, unsigned, + unsigned, uint16_t, uint8_t, bool); +int audio_pcm_buffer_stop_playback(async_exch_t *, unsigned); + +int audio_pcm_buffer_start_record(async_exch_t *, unsigned, + unsigned, unsigned, unsigned, bool); +int audio_pcm_buffer_stop_record(async_exch_t *, unsigned); + +/** Audio pcm communication interface. */ +typedef struct { + int (*get_info_str)(ddf_fun_t *, const char **); + int (*get_buffer)(ddf_fun_t *, void **, size_t *, unsigned *); + int (*release_buffer)(ddf_fun_t *, unsigned); + int (*start_playback)(ddf_fun_t *, unsigned, + unsigned, unsigned, unsigned, bool); + int (*stop_playback)(ddf_fun_t *, unsigned); + int (*start_record)(ddf_fun_t *, unsigned, + unsigned, unsigned, unsigned, bool); + int (*stop_record)(ddf_fun_t *, unsigned); +} audio_pcm_buffer_iface_t; + +#endif +/** + * @} + */ Index: uspace/lib/drv/include/remote_audio_mixer.h =================================================================== --- uspace/lib/drv/include/remote_audio_mixer.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) +++ uspace/lib/drv/include/remote_audio_mixer.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_REMOTE_AUDIO_MIXER_H_ +#define LIBDRV_REMOTE_AUDIO_MIXER_H_ + +extern remote_iface_t remote_audio_mixer_iface; + +#endif + +/** + * @} + */ + Index: uspace/lib/drv/include/remote_audio_pcm_buffer.h =================================================================== --- uspace/lib/drv/include/remote_audio_pcm_buffer.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) +++ uspace/lib/drv/include/remote_audio_pcm_buffer.h (revision 6843a9ccc55ea4287771f720d4f1117afbcb5bee) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_REMOTE_AUDIO_PCM_H_ +#define LIBDRV_REMOTE_AUDIO_PCM_H_ + +extern remote_iface_t remote_audio_pcm_buffer_iface; + +#endif + +/** + * @} + */ +