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
/
seq_fifo.c
diff --git
a/sound/core/seq/seq_fifo.c
b/sound/core/seq/seq_fifo.c
index
3b7647c
..
6b055ae
100644
(file)
--- a/
sound/core/seq/seq_fifo.c
+++ b/
sound/core/seq/seq_fifo.c
@@
-29,11
+29,11
@@
/* FIFO */
/* create new fifo */
/* FIFO */
/* create new fifo */
-
fifo_t
*snd_seq_fifo_new(int poolsize)
+
struct snd_seq_fifo
*snd_seq_fifo_new(int poolsize)
{
{
-
fifo_t
*f;
+
struct snd_seq_fifo
*f;
- f = k
calloc(1,
sizeof(*f), GFP_KERNEL);
+ f = k
zalloc(
sizeof(*f), GFP_KERNEL);
if (f == NULL) {
snd_printd("malloc failed for snd_seq_fifo_new() \n");
return NULL;
if (f == NULL) {
snd_printd("malloc failed for snd_seq_fifo_new() \n");
return NULL;
@@
-62,9
+62,9
@@
fifo_t *snd_seq_fifo_new(int poolsize)
return f;
}
return f;
}
-void snd_seq_fifo_delete(
fifo_t
**fifo)
+void snd_seq_fifo_delete(
struct snd_seq_fifo
**fifo)
{
{
-
fifo_t
*f;
+
struct snd_seq_fifo
*f;
snd_assert(fifo != NULL, return);
f = *fifo;
snd_assert(fifo != NULL, return);
f = *fifo;
@@
-88,12
+88,12
@@
void snd_seq_fifo_delete(fifo_t **fifo)
kfree(f);
}
kfree(f);
}
-static s
nd_seq_event_cell_t *fifo_cell_out(fifo_t
*f);
+static s
truct snd_seq_event_cell *fifo_cell_out(struct snd_seq_fifo
*f);
/* clear queue */
/* clear queue */
-void snd_seq_fifo_clear(
fifo_t
*f)
+void snd_seq_fifo_clear(
struct snd_seq_fifo
*f)
{
{
- s
nd_seq_event_cell_t
*cell;
+ s
truct snd_seq_event_cell
*cell;
unsigned long flags;
/* clear overflow flag */
unsigned long flags;
/* clear overflow flag */
@@
-110,9
+110,10
@@
void snd_seq_fifo_clear(fifo_t *f)
/* enqueue event to fifo */
/* enqueue event to fifo */
-int snd_seq_fifo_event_in(fifo_t *f, snd_seq_event_t *event)
+int snd_seq_fifo_event_in(struct snd_seq_fifo *f,
+ struct snd_seq_event *event)
{
{
- s
nd_seq_event_cell_t
*cell;
+ s
truct snd_seq_event_cell
*cell;
unsigned long flags;
int err;
unsigned long flags;
int err;
@@
-148,9
+149,9
@@
int snd_seq_fifo_event_in(fifo_t *f, snd_seq_event_t *event)
}
/* dequeue cell from fifo */
}
/* dequeue cell from fifo */
-static s
nd_seq_event_cell_t *fifo_cell_out(fifo_t
*f)
+static s
truct snd_seq_event_cell *fifo_cell_out(struct snd_seq_fifo
*f)
{
{
- s
nd_seq_event_cell_t
*cell;
+ s
truct snd_seq_event_cell
*cell;
if ((cell = f->head) != NULL) {
f->head = cell->next;
if ((cell = f->head) != NULL) {
f->head = cell->next;
@@
-167,9
+168,10
@@
static snd_seq_event_cell_t *fifo_cell_out(fifo_t *f)
}
/* dequeue cell from fifo and copy on user space */
}
/* dequeue cell from fifo and copy on user space */
-int snd_seq_fifo_cell_out(fifo_t *f, snd_seq_event_cell_t **cellp, int nonblock)
+int snd_seq_fifo_cell_out(struct snd_seq_fifo *f,
+ struct snd_seq_event_cell **cellp, int nonblock)
{
{
- s
nd_seq_event_cell_t
*cell;
+ s
truct snd_seq_event_cell
*cell;
unsigned long flags;
wait_queue_t wait;
unsigned long flags;
wait_queue_t wait;
@@
-202,7
+204,8
@@
int snd_seq_fifo_cell_out(fifo_t *f, snd_seq_event_cell_t **cellp, int nonblock)
}
}
-void snd_seq_fifo_cell_putback(fifo_t *f, snd_seq_event_cell_t *cell)
+void snd_seq_fifo_cell_putback(struct snd_seq_fifo *f,
+ struct snd_seq_event_cell *cell)
{
unsigned long flags;
{
unsigned long flags;
@@
-217,18
+220,19
@@
void snd_seq_fifo_cell_putback(fifo_t *f, snd_seq_event_cell_t *cell)
/* polling; return non-zero if queue is available */
/* polling; return non-zero if queue is available */
-int snd_seq_fifo_poll_wait(fifo_t *f, struct file *file, poll_table *wait)
+int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file,
+ poll_table *wait)
{
poll_wait(file, &f->input_sleep, wait);
return (f->cells > 0);
}
/* change the size of pool; all old events are removed */
{
poll_wait(file, &f->input_sleep, wait);
return (f->cells > 0);
}
/* change the size of pool; all old events are removed */
-int snd_seq_fifo_resize(
fifo_t
*f, int poolsize)
+int snd_seq_fifo_resize(
struct snd_seq_fifo
*f, int poolsize)
{
unsigned long flags;
{
unsigned long flags;
-
pool_t
*newpool, *oldpool;
- s
nd_seq_event_cell_t
*cell, *next, *oldhead;
+
struct snd_seq_pool
*newpool, *oldpool;
+ s
truct snd_seq_event_cell
*cell, *next, *oldhead;
snd_assert(f != NULL && f->pool != NULL, return -EINVAL);
snd_assert(f != NULL && f->pool != NULL, return -EINVAL);