mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed mmap and close

Browse source
This commit is contained in:
Abramo Bagnara 2000-11-22 14:27:37 +00:00
parent 41bb7068f2
commit a42a452c1c
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pcm/pcm.c
View file

@ -2678,3 +2678,7 @@ int snd_pcm_hw_params_rulesv(snd_pcm_t *pcm,
return snd_pcm_hw_params_rules(pcm, params, count, rules); return snd_pcm_hw_params_rules(pcm, params, count, rules);
} }
size_t _snd_pcm_mmap_hw_ptr(snd_pcm_t *pcm)
{
return *pcm->hw_ptr;
}

26
src/pcm/pcm_hw.c
View file

@ -241,8 +241,10 @@ static int snd_pcm_hw_start(snd_pcm_t *pcm)
{ {
snd_pcm_hw_t *hw = pcm->private; snd_pcm_hw_t *hw = pcm->private;
int fd = hw->fd; int fd = hw->fd;
#if 0
assert(pcm->stream != SND_PCM_STREAM_PLAYBACK || assert(pcm->stream != SND_PCM_STREAM_PLAYBACK ||
snd_pcm_mmap_playback_hw_avail(pcm) > 0); snd_pcm_mmap_playback_hw_avail(pcm) > 0);
#endif
if (ioctl(fd, SND_PCM_IOCTL_START) < 0) { if (ioctl(fd, SND_PCM_IOCTL_START) < 0) {
SYSERR("SND_PCM_IOCTL_START failed"); SYSERR("SND_PCM_IOCTL_START failed");
return -errno; return -errno;
@ -390,7 +392,7 @@ static int snd_pcm_hw_mmap_control(snd_pcm_t *pcm)
static int snd_pcm_hw_munmap_status(snd_pcm_t *pcm) static int snd_pcm_hw_munmap_status(snd_pcm_t *pcm)
{ {
snd_pcm_hw_t *hw = pcm->private; snd_pcm_hw_t *hw = pcm->private;
if (munmap((void*)hw->mmap_status, sizeof(*hw->mmap_status)) < 0) { if (munmap((void*)hw->mmap_status, PAGE_ALIGN(sizeof(*hw->mmap_status))) < 0) {
SYSERR("status munmap failed"); SYSERR("status munmap failed");
return -errno; return -errno;
} }
@ -400,7 +402,7 @@ static int snd_pcm_hw_munmap_status(snd_pcm_t *pcm)
static int snd_pcm_hw_munmap_control(snd_pcm_t *pcm) static int snd_pcm_hw_munmap_control(snd_pcm_t *pcm)
{ {
snd_pcm_hw_t *hw = pcm->private; snd_pcm_hw_t *hw = pcm->private;
if (munmap(hw->mmap_control, sizeof(*hw->mmap_control)) < 0) { if (munmap(hw->mmap_control, PAGE_ALIGN(sizeof(*hw->mmap_control))) < 0) {
SYSERR("control munmap failed"); SYSERR("control munmap failed");
return -errno; return -errno;
} }
@ -573,14 +575,12 @@ int snd_pcm_hw_open_subdevice(snd_pcm_t **pcmp, int card, int device, int subdev
__again: __again:
if (attempt++ > 3) { if (attempt++ > 3) {
snd_ctl_close(ctl); ret = -EBUSY;
return -EBUSY; goto _err;
} }
ret = snd_ctl_pcm_prefer_subdevice(ctl, subdevice); ret = snd_ctl_pcm_prefer_subdevice(ctl, subdevice);
if (ret < 0) { if (ret < 0)
snd_ctl_close(ctl); goto _err;
return ret;
}
fmode = O_RDWR; fmode = O_RDWR;
if (mode & SND_PCM_NONBLOCK) if (mode & SND_PCM_NONBLOCK)
fmode |= O_NONBLOCK; fmode |= O_NONBLOCK;
@ -588,8 +588,8 @@ int snd_pcm_hw_open_subdevice(snd_pcm_t **pcmp, int card, int device, int subdev
fmode |= O_ASYNC; fmode |= O_ASYNC;
if ((fd = open(filename, fmode)) < 0) { if ((fd = open(filename, fmode)) < 0) {
SYSERR("open %s failed", filename); SYSERR("open %s failed", filename);
snd_ctl_close(ctl); ret = -errno;
return -errno; goto _err;
} }
if (ioctl(fd, SND_PCM_IOCTL_PVERSION, &ver) < 0) { if (ioctl(fd, SND_PCM_IOCTL_PVERSION, &ver) < 0) {
SYSERR("SND_PCM_IOCTL_PVERSION failed"); SYSERR("SND_PCM_IOCTL_PVERSION failed");
@ -627,6 +627,7 @@ int snd_pcm_hw_open_subdevice(snd_pcm_t **pcmp, int card, int device, int subdev
ret = -ENOMEM; ret = -ENOMEM;
goto _err; goto _err;
} }
snd_ctl_close(ctl);
pcm->type = SND_PCM_TYPE_HW; pcm->type = SND_PCM_TYPE_HW;
pcm->stream = stream; pcm->stream = stream;
pcm->mode = mode; pcm->mode = mode;
@ -640,13 +641,11 @@ int snd_pcm_hw_open_subdevice(snd_pcm_t **pcmp, int card, int device, int subdev
ret = snd_pcm_hw_mmap_status(pcm); ret = snd_pcm_hw_mmap_status(pcm);
if (ret < 0) { if (ret < 0) {
snd_pcm_close(pcm); snd_pcm_close(pcm);
snd_ctl_close(ctl);
return ret; return ret;
} }
ret = snd_pcm_hw_mmap_control(pcm); ret = snd_pcm_hw_mmap_control(pcm);
if (ret < 0) { if (ret < 0) {
snd_pcm_close(pcm); snd_pcm_close(pcm);
snd_ctl_close(ctl);
return ret; return ret;
} }
return 0; return 0;
@ -656,7 +655,8 @@ int snd_pcm_hw_open_subdevice(snd_pcm_t **pcmp, int card, int device, int subdev
free(hw); free(hw);
if (pcm) if (pcm)
free(pcm); free(pcm);
close(fd); if (fd >= 0)
close(fd);
snd_ctl_close(ctl); snd_ctl_close(ctl);
return ret; return ret;
} }