upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fix for SNDCTL_DSP_GETOSPACE ioctl. It would report 0 bytes

Browse source 
available in buffer when buffer was completely empty.
It now correctly reports the total buffer space available.

Reviewed by:	jkh, davidg
Obtained from:  Linux 1.3.20's sound driver code
This commit is contained in:
Steven Wallace 1997-02-12 06:56:57 +00:00
parent 724ab19569
commit 1a46116d9d
3 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/i386/include/soundcard.h
View file

@ -577,6 +577,7 @@ typedef struct {
*/
typedef struct audio_buf_info {
int fragments; /* # of available fragments (partially usend ones not counted) */
int fragstotal; /* Total # of fragments allocated */
int fragsize; /* Size of a fragment in bytes */
int bytes; /* Available space in bytes (includes partially used fragments) */

50
sys/i386/isa/sound/dmabuf.c
View file

@ -44,6 +44,10 @@ static struct dma_buffparms dmaps[MAX_AUDIO_DEV] =
* Needs dynamic run-time alloction.
*/
static int space_in_queue (int);
static void reorganize_buffers (int);
static void dma_init_buffers (int);
static void
reorganize_buffers (int dev)
{
@ -510,14 +514,48 @@ DMAbuf_ioctl (int dev, unsigned int cmd, unsigned int arg, int local)
case SNDCTL_DSP_GETOSPACE:
if (!local)
return RET_ERROR (EINVAL);
else
{
audio_buf_info *info = (audio_buf_info *) arg;
{
audio_buf_info *info = (audio_buf_info *) arg;
if (!(dmap->flags & DMA_ALLOC_DONE))
reorganize_buffers (dev);
info->fragments = dmap->qlen;
info->fragsize = dmap->fragment_size;
info->bytes = dmap->qlen * dmap->fragment_size;
}
info->fragstotal = dmap->nbufs;
if (cmd == SNDCTL_DSP_GETISPACE)
info->fragments = dmap->qlen;
else
{
if (!space_in_queue (dev))
info->fragments = 0;
else
{
info->fragments = dmap->nbufs - dmap->qlen;
if (audio_devs[dev]->local_qlen)
{
int tmp = audio_devs[dev]->local_qlen (dev);
if (tmp & info->fragments)
tmp--; /*
* This buffer has been counted twice
*/
info->fragments -= tmp;
}
}
}
if (info->fragments < 0)
info->fragments = 0;
else if (info->fragments > dmap->nbufs)
info->fragments = dmap->nbufs;
info->fragsize = dmap->fragment_size;
info->bytes = info->fragments * dmap->fragment_size;
if (cmd == SNDCTL_DSP_GETISPACE && dmap->qlen)
info->bytes -= dmap->counts[dmap->qhead];
}
return 0;
default:

1
sys/sys/soundcard.h
View file

@ -577,6 +577,7 @@ typedef struct {
*/
typedef struct audio_buf_info {
int fragments; /* # of available fragments (partially usend ones not counted) */
int fragstotal; /* Total # of fragments allocated */
int fragsize; /* Size of a fragment in bytes */
int bytes; /* Available space in bytes (includes partially used fragments) */