mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-10 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pcm: hw: add helper functions to map/unmap status/control data for runtime of PCM substream

Browse source 
Handling mapping operation for status/control data includes some
supplemental operations for fallback mode. It's better to have helper
functions for this purpose.

This commit adds the helper functions.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2017-06-25 13:41:19 +09:00 • committed by Takashi Iwai
parent 987788dbfe
commit 2fbad9bc4e
1 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/pcm/pcm_hw.c
View file

@ -31,6 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <unistd.h> #include <unistd.h>
#include <stdbool.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
@ -866,7 +867,7 @@ static snd_pcm_sframes_t snd_pcm_hw_readn(snd_pcm_t *pcm, void **bufs, snd_pcm_u
return xfern.result; return xfern.result;
} }
static int snd_pcm_hw_mmap_status(snd_pcm_t *pcm) static int map_status_data(snd_pcm_t *pcm)
{ {
snd_pcm_hw_t *hw = pcm->private_data; snd_pcm_hw_t *hw = pcm->private_data;
struct snd_pcm_sync_ptr sync_ptr; struct snd_pcm_sync_ptr sync_ptr;
@ -900,7 +901,7 @@ static int snd_pcm_hw_mmap_status(snd_pcm_t *pcm)
return 0; return 0;
} }
static int snd_pcm_hw_mmap_control(snd_pcm_t *pcm) static int map_control_data(snd_pcm_t *pcm)
{ {
snd_pcm_hw_t *hw = pcm->private_data; snd_pcm_hw_t *hw = pcm->private_data;
void *ptr; void *ptr;
@ -922,10 +923,28 @@ static int snd_pcm_hw_mmap_control(snd_pcm_t *pcm)
return 0; return 0;
} }
static int snd_pcm_hw_munmap_status(snd_pcm_t *pcm) static int map_status_and_control_data(snd_pcm_t *pcm, bool force_fallback)
{ {
snd_pcm_hw_t *hw = pcm->private_data; snd_pcm_hw_t *hw = pcm->private_data;
int err; int err;
hw->sync_ptr_ioctl = (int)force_fallback;
err = map_status_data(pcm);
if (err < 0)
return err;
err = map_control_data(pcm);
if (err < 0)
return err;
return 0;
}
static int unmap_status_data(snd_pcm_hw_t *hw)
{
int err;
if (hw->sync_ptr_ioctl) { if (hw->sync_ptr_ioctl) {
free(hw->sync_ptr); free(hw->sync_ptr);
hw->sync_ptr = NULL; hw->sync_ptr = NULL;
@ -939,10 +958,10 @@ static int snd_pcm_hw_munmap_status(snd_pcm_t *pcm)
return 0; return 0;
} }
static int snd_pcm_hw_munmap_control(snd_pcm_t *pcm) static int unmap_control_data(snd_pcm_hw_t *hw)
{ {
snd_pcm_hw_t *hw = pcm->private_data;
int err; int err;
if (hw->sync_ptr_ioctl) { if (hw->sync_ptr_ioctl) {
free(hw->sync_ptr); free(hw->sync_ptr);
hw->sync_ptr = NULL; hw->sync_ptr = NULL;
@ -956,6 +975,12 @@ static int snd_pcm_hw_munmap_control(snd_pcm_t *pcm)
return 0; return 0;
} }
static void unmap_status_and_control_data(snd_pcm_hw_t *hw)
{
unmap_status_data(hw);
unmap_control_data(hw);
}
static int snd_pcm_hw_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED) static int snd_pcm_hw_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
{ {
return 0; return 0;
@ -974,8 +999,9 @@ static int snd_pcm_hw_close(snd_pcm_t *pcm)
err = -errno; err = -errno;
SYSMSG("close failed (%i)\n", err); SYSMSG("close failed (%i)\n", err);
} }
snd_pcm_hw_munmap_status(pcm);
snd_pcm_hw_munmap_control(pcm); unmap_status_and_control_data(hw);
free(hw); free(hw);
return err; return err;
} }
@ -1484,7 +1510,6 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name, int fd,
hw->device = info.device; hw->device = info.device;
hw->subdevice = info.subdevice; hw->subdevice = info.subdevice;
hw->fd = fd; hw->fd = fd;
hw->sync_ptr_ioctl = sync_ptr_ioctl;
/* no restriction */ /* no restriction */
hw->format = SND_PCM_FORMAT_UNKNOWN; hw->format = SND_PCM_FORMAT_UNKNOWN;
hw->rate = 0; hw->rate = 0;
@ -1508,12 +1533,7 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name, int fd,
#endif #endif
pcm->own_state_check = 1; /* skip the common state check */ pcm->own_state_check = 1; /* skip the common state check */
ret = snd_pcm_hw_mmap_status(pcm); ret = map_status_and_control_data(pcm, !!sync_ptr_ioctl);
if (ret < 0) {
snd_pcm_close(pcm);
return ret;
}
ret = snd_pcm_hw_mmap_control(pcm);
if (ret < 0) { if (ret < 0) {
snd_pcm_close(pcm); snd_pcm_close(pcm);
return ret; return ret;