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_queue.h
diff --git
a/sound/core/seq/seq_queue.h
b/sound/core/seq/seq_queue.h
index
6e0113a
..
30c8111
100644
(file)
--- a/
sound/core/seq/seq_queue.h
+++ b/
sound/core/seq/seq_queue.h
@@
-30,15
+30,15
@@
#define SEQ_QUEUE_NO_OWNER (-1)
#define SEQ_QUEUE_NO_OWNER (-1)
-struct
_
snd_seq_queue {
+struct snd_seq_queue {
int queue; /* queue number */
char name[64]; /* name of this queue */
int queue; /* queue number */
char name[64]; /* name of this queue */
-
prioq_t
*tickq; /* midi tick event queue */
-
prioq_t
*timeq; /* real-time event queue */
+
struct snd_seq_prioq
*tickq; /* midi tick event queue */
+
struct snd_seq_prioq
*timeq; /* real-time event queue */
- s
eq_timer_t *timer;
/* time keeper for this queue */
+ s
truct snd_seq_timer *timer;
/* time keeper for this queue */
int owner; /* client that 'owns' the timer */
unsigned int locked:1, /* timer is only accesibble by owner if set */
klocked:1, /* kernel lock (after START) */
int owner; /* client that 'owns' the timer */
unsigned int locked:1, /* timer is only accesibble by owner if set */
klocked:1, /* kernel lock (after START) */
@@
-54,7
+54,7
@@
struct _snd_seq_queue {
/* clients which uses this queue (bitmap) */
DECLARE_BITMAP(clients_bitmap, SNDRV_SEQ_MAX_CLIENTS);
unsigned int clients; /* users of this queue */
/* clients which uses this queue (bitmap) */
DECLARE_BITMAP(clients_bitmap, SNDRV_SEQ_MAX_CLIENTS);
unsigned int clients; /* users of this queue */
- struct
semaphore
timer_mutex;
+ struct
mutex
timer_mutex;
snd_use_lock_t use_lock;
};
snd_use_lock_t use_lock;
};
@@
-83,26
+83,26
@@
void snd_seq_queue_client_termination(int client);
void snd_seq_queue_client_leave(int client);
/* enqueue a event received from one the clients */
void snd_seq_queue_client_leave(int client);
/* enqueue a event received from one the clients */
-int snd_seq_enqueue_event(s
nd_seq_event_cell_t
*cell, int atomic, int hop);
+int snd_seq_enqueue_event(s
truct snd_seq_event_cell
*cell, int atomic, int hop);
/* Remove events */
void snd_seq_queue_client_leave_cells(int client);
/* Remove events */
void snd_seq_queue_client_leave_cells(int client);
-void snd_seq_queue_remove_cells(int client, s
nd_seq_remove_events_t
*info);
+void snd_seq_queue_remove_cells(int client, s
truct snd_seq_remove_events
*info);
/* return pointer to queue structure for specified id */
/* return pointer to queue structure for specified id */
-
queue_t
*queueptr(int queueid);
+
struct snd_seq_queue
*queueptr(int queueid);
/* unlock */
#define queuefree(q) snd_use_lock_free(&(q)->use_lock)
/* return the (first) queue matching with the specified name */
/* unlock */
#define queuefree(q) snd_use_lock_free(&(q)->use_lock)
/* return the (first) queue matching with the specified name */
-
queue_t
*snd_seq_queue_find_name(char *name);
+
struct snd_seq_queue
*snd_seq_queue_find_name(char *name);
/* check single queue and dispatch events */
/* check single queue and dispatch events */
-void snd_seq_check_queue(
queue_t
*q, int atomic, int hop);
+void snd_seq_check_queue(
struct snd_seq_queue
*q, int atomic, int hop);
/* access to queue's parameters */
int snd_seq_queue_check_access(int queueid, int client);
/* access to queue's parameters */
int snd_seq_queue_check_access(int queueid, int client);
-int snd_seq_queue_timer_set_tempo(int queueid, int client, s
nd_seq_queue_tempo_t
*info);
+int snd_seq_queue_timer_set_tempo(int queueid, int client, s
truct snd_seq_queue_tempo
*info);
int snd_seq_queue_set_owner(int queueid, int client, int locked);
int snd_seq_queue_set_locked(int queueid, int client, int locked);
int snd_seq_queue_timer_open(int queueid);
int snd_seq_queue_set_owner(int queueid, int client, int locked);
int snd_seq_queue_set_locked(int queueid, int client, int locked);
int snd_seq_queue_timer_open(int queueid);
@@
-110,8
+110,7
@@
int snd_seq_queue_timer_close(int queueid);
int snd_seq_queue_use(int queueid, int client, int use);
int snd_seq_queue_is_used(int queueid, int client);
int snd_seq_queue_use(int queueid, int client, int use);
int snd_seq_queue_is_used(int queueid, int client);
-int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop);
-void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int from_timer_port, int atomic, int hop);
+int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop);
/*
* 64bit division - for sync stuff..
/*
* 64bit division - for sync stuff..