git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
core
/
seq
/
oss
/
seq_oss_writeq.c
diff --git
a/sound/core/seq/oss/seq_oss_writeq.c
b/sound/core/seq/oss/seq_oss_writeq.c
index
87f85f7
..
5c84956
100644
(file)
--- a/
sound/core/seq/oss/seq_oss_writeq.c
+++ b/
sound/core/seq/oss/seq_oss_writeq.c
@@
-32,13
+32,13
@@
/*
* create a write queue record
*/
/*
* create a write queue record
*/
-s
eq_oss_writeq_t
*
-snd_seq_oss_writeq_new(s
eq_oss_devinfo_t
*dp, int maxlen)
+s
truct seq_oss_writeq
*
+snd_seq_oss_writeq_new(s
truct seq_oss_devinfo
*dp, int maxlen)
{
{
- s
eq_oss_writeq_t
*q;
- s
nd_seq_client_pool_t
pool;
+ s
truct seq_oss_writeq
*q;
+ s
truct snd_seq_client_pool
pool;
- if ((q = k
calloc(1,
sizeof(*q), GFP_KERNEL)) == NULL)
+ if ((q = k
zalloc(
sizeof(*q), GFP_KERNEL)) == NULL)
return NULL;
q->dp = dp;
q->maxlen = maxlen;
return NULL;
q->dp = dp;
q->maxlen = maxlen;
@@
-61,7
+61,7
@@
snd_seq_oss_writeq_new(seq_oss_devinfo_t *dp, int maxlen)
* delete the write queue
*/
void
* delete the write queue
*/
void
-snd_seq_oss_writeq_delete(s
eq_oss_writeq_t
*q)
+snd_seq_oss_writeq_delete(s
truct seq_oss_writeq
*q)
{
snd_seq_oss_writeq_clear(q); /* to be sure */
kfree(q);
{
snd_seq_oss_writeq_clear(q); /* to be sure */
kfree(q);
@@
-72,9
+72,9
@@
snd_seq_oss_writeq_delete(seq_oss_writeq_t *q)
* reset the write queue
*/
void
* reset the write queue
*/
void
-snd_seq_oss_writeq_clear(s
eq_oss_writeq_t
*q)
+snd_seq_oss_writeq_clear(s
truct seq_oss_writeq
*q)
{
{
- s
nd_seq_remove_events_t
reset;
+ s
truct snd_seq_remove_events
reset;
memset(&reset, 0, sizeof(reset));
reset.remove_mode = SNDRV_SEQ_REMOVE_OUTPUT; /* remove all */
memset(&reset, 0, sizeof(reset));
reset.remove_mode = SNDRV_SEQ_REMOVE_OUTPUT; /* remove all */
@@
-88,9
+88,9
@@
snd_seq_oss_writeq_clear(seq_oss_writeq_t *q)
* wait until the write buffer has enough room
*/
int
* wait until the write buffer has enough room
*/
int
-snd_seq_oss_writeq_sync(s
eq_oss_writeq_t
*q)
+snd_seq_oss_writeq_sync(s
truct seq_oss_writeq
*q)
{
{
- s
eq_oss_devinfo_t
*dp = q->dp;
+ s
truct seq_oss_devinfo
*dp = q->dp;
abstime_t time;
time = snd_seq_oss_timer_cur_tick(dp->timer);
abstime_t time;
time = snd_seq_oss_timer_cur_tick(dp->timer);
@@
-98,8
+98,8
@@
snd_seq_oss_writeq_sync(seq_oss_writeq_t *q)
return 0; /* already finished */
if (! q->sync_event_put) {
return 0; /* already finished */
if (! q->sync_event_put) {
- s
nd_seq_event_
t ev;
-
evrec_t
*rec;
+ s
truct snd_seq_even
t ev;
+
union evrec
*rec;
/* put echoback event */
memset(&ev, 0, sizeof(ev));
/* put echoback event */
memset(&ev, 0, sizeof(ev));
@@
-108,7
+108,7
@@
snd_seq_oss_writeq_sync(seq_oss_writeq_t *q)
ev.time.tick = time;
/* echo back to itself */
snd_seq_oss_fill_addr(dp, &ev, dp->addr.client, dp->addr.port);
ev.time.tick = time;
/* echo back to itself */
snd_seq_oss_fill_addr(dp, &ev, dp->addr.client, dp->addr.port);
- rec = (
evrec_t
*)&ev.data;
+ rec = (
union evrec
*)&ev.data;
rec->t.code = SEQ_SYNCTIMER;
rec->t.time = time;
q->sync_event_put = 1;
rec->t.code = SEQ_SYNCTIMER;
rec->t.time = time;
q->sync_event_put = 1;
@@
-128,7
+128,7
@@
snd_seq_oss_writeq_sync(seq_oss_writeq_t *q)
* wake up sync - echo event was catched
*/
void
* wake up sync - echo event was catched
*/
void
-snd_seq_oss_writeq_wakeup(s
eq_oss_writeq_t
*q, abstime_t time)
+snd_seq_oss_writeq_wakeup(s
truct seq_oss_writeq
*q, abstime_t time)
{
unsigned long flags;
{
unsigned long flags;
@@
-146,9
+146,9
@@
snd_seq_oss_writeq_wakeup(seq_oss_writeq_t *q, abstime_t time)
* return the unused pool size
*/
int
* return the unused pool size
*/
int
-snd_seq_oss_writeq_get_free_size(s
eq_oss_writeq_t
*q)
+snd_seq_oss_writeq_get_free_size(s
truct seq_oss_writeq
*q)
{
{
- s
nd_seq_client_pool_t
pool;
+ s
truct snd_seq_client_pool
pool;
pool.client = q->dp->cseq;
snd_seq_oss_control(q->dp, SNDRV_SEQ_IOCTL_GET_CLIENT_POOL, &pool);
return pool.output_free;
pool.client = q->dp->cseq;
snd_seq_oss_control(q->dp, SNDRV_SEQ_IOCTL_GET_CLIENT_POOL, &pool);
return pool.output_free;
@@
-159,9
+159,9
@@
snd_seq_oss_writeq_get_free_size(seq_oss_writeq_t *q)
* set output threshold size from ioctl
*/
void
* set output threshold size from ioctl
*/
void
-snd_seq_oss_writeq_set_output(s
eq_oss_writeq_t
*q, int val)
+snd_seq_oss_writeq_set_output(s
truct seq_oss_writeq
*q, int val)
{
{
- s
nd_seq_client_pool_t
pool;
+ s
truct snd_seq_client_pool
pool;
pool.client = q->dp->cseq;
snd_seq_oss_control(q->dp, SNDRV_SEQ_IOCTL_GET_CLIENT_POOL, &pool);
pool.output_room = val;
pool.client = q->dp->cseq;
snd_seq_oss_control(q->dp, SNDRV_SEQ_IOCTL_GET_CLIENT_POOL, &pool);
pool.output_room = val;