Page MenuHomeFreeBSD
Files F147748970

D48008.id147754.diff
No OneTemporary
Actions

D48008.id147754.diff
View Options

diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.h
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
-#define SNDBUF_LOCKASSERT(b)
-
#define SNDBUF_F_MANAGED 0x00000008
#define SNDBUF_NAMELEN 48
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -455,39 +455,30 @@
unsigned int
sndbuf_getxrun(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
-
return b->xrun;
}
void
sndbuf_setxrun(struct snd_dbuf *b, unsigned int xrun)
{
- SNDBUF_LOCKASSERT(b);
-
b->xrun = xrun;
}
unsigned int
sndbuf_gethwptr(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
-
return b->hp;
}
void
sndbuf_sethwptr(struct snd_dbuf *b, unsigned int ptr)
{
- SNDBUF_LOCKASSERT(b);
-
b->hp = ptr;
}
unsigned int
sndbuf_getready(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
KASSERT((b->rl >= 0) && (b->rl <= b->bufsize), ("%s: b->rl invalid %d", __func__, b->rl));
return b->rl;
@@ -496,7 +487,6 @@
unsigned int
sndbuf_getreadyptr(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
KASSERT((b->rp >= 0) && (b->rp <= b->bufsize), ("%s: b->rp invalid %d", __func__, b->rp));
return b->rp;
@@ -505,7 +495,6 @@
unsigned int
sndbuf_getfree(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
KASSERT((b->rl >= 0) && (b->rl <= b->bufsize), ("%s: b->rl invalid %d", __func__, b->rl));
return b->bufsize - b->rl;
@@ -514,7 +503,6 @@
unsigned int
sndbuf_getfreeptr(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
KASSERT((b->rp >= 0) && (b->rp <= b->bufsize), ("%s: b->rp invalid %d", __func__, b->rp));
KASSERT((b->rl >= 0) && (b->rl <= b->bufsize), ("%s: b->rl invalid %d", __func__, b->rl));
@@ -524,40 +512,30 @@
u_int64_t
sndbuf_getblocks(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
-
return b->total / b->blksz;
}
u_int64_t
sndbuf_getprevblocks(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
-
return b->prev_total / b->blksz;
}
u_int64_t
sndbuf_gettotal(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
-
return b->total;
}
u_int64_t
sndbuf_getprevtotal(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
-
return b->prev_total;
}
void
sndbuf_updateprevtotal(struct snd_dbuf *b)
{
- SNDBUF_LOCKASSERT(b);
-
b->prev_total = b->total;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 14, 9:31 AM (13 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29663399
Default Alt Text
D48008.id147754.diff (2 KB)

Event Timeline