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_clientmgr.h

diff --git a/sound/core/seq/seq_clientmgr.h b/sound/core/seq/seq_clientmgr.h
index 3715c36..5e04e20 100644 (file)
--- a/sound/core/seq/seq_clientmgr.h
+++ b/sound/core/seq/seq_clientmgr.h
@@ -30,24 +30,21 @@
 
 /* client manager */
 
-struct _snd_seq_user_client {
+struct snd_seq_user_client {
        struct file *file;      /* file struct of client */
        /* ... */
        
        /* fifo */
-       fifo_t *fifo;   /* queue for incoming events */
+       struct snd_seq_fifo *fifo;      /* queue for incoming events */
        int fifo_pool_size;
 };
 
-struct _snd_seq_kernel_client {
-       snd_card_t *card;
-       /* pointer to client functions */
-       void *private_data;                     /* private data for client */
+struct snd_seq_kernel_client {
        /* ... */
 };
 
 
-struct _snd_seq_client {
+struct snd_seq_client {
        snd_seq_client_type_t type;
        unsigned int accept_input: 1,
                accept_output: 1;
@@ -61,44 +58,44 @@ struct _snd_seq_client {
        int num_ports;          /* number of ports */
        struct list_head ports_list_head;
        rwlock_t ports_lock;
-       struct semaphore ports_mutex;
+       struct mutex ports_mutex;
        int convert32;          /* convert 32->64bit */
 
        /* output pool */
-       pool_t *pool;           /* memory pool for this client */
+       struct snd_seq_pool *pool;              /* memory pool for this client */
 
        union {
-               user_client_t user;
-               kernel_client_t kernel;
+               struct snd_seq_user_client user;
+               struct snd_seq_kernel_client kernel;
        } data;
 };
 
 /* usage statistics */
-typedef struct {
+struct snd_seq_usage {
        int cur;
        int peak;
-} usage_t;
+};
 
 
-extern int client_init_data(void);
-extern int snd_sequencer_device_init(void);
-extern void snd_sequencer_device_done(void);
+int client_init_data(void);
+int snd_sequencer_device_init(void);
+void snd_sequencer_device_done(void);
 
 /* get locked pointer to client */
-extern client_t *snd_seq_client_use_ptr(int clientid);
+struct snd_seq_client *snd_seq_client_use_ptr(int clientid);
 
 /* unlock pointer to client */
 #define snd_seq_client_unlock(client) snd_use_lock_free(&(client)->use_lock)
 
 /* dispatch event to client(s) */
-extern int snd_seq_dispatch_event(snd_seq_event_cell_t *cell, int atomic, int hop);
+int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop);
 
 /* exported to other modules */
-extern int snd_seq_register_kernel_client(snd_seq_client_callback_t *callback, void *private_data);
-extern int snd_seq_unregister_kernel_client(int client);
-extern int snd_seq_kernel_client_enqueue(int client, snd_seq_event_t *ev, int atomic, int hop);
-int snd_seq_kernel_client_enqueue_blocking(int client, snd_seq_event_t * ev, struct file *file, int atomic, int hop);
+int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, int atomic, int hop);
+int snd_seq_kernel_client_enqueue_blocking(int client, struct snd_seq_event * ev,
+                                          struct file *file, int atomic, int hop);
 int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_table *wait);
-int snd_seq_client_notify_subscription(int client, int port, snd_seq_port_subscribe_t *info, int evtype);
+int snd_seq_client_notify_subscription(int client, int port,
+                                      struct snd_seq_port_subscribe *info, int evtype);
 
 #endif