fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / core / seq / seq_dummy.c

diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index 6380acf..e55488d 100644 (file)
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -63,21 +63,22 @@
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("ALSA sequencer MIDI-through client");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("snd-seq-client-" __stringify(SNDRV_SEQ_CLIENT_DUMMY));
 
 static int ports = 1;
-static int duplex = 0;
+static int duplex;
 
 module_param(ports, int, 0444);
 MODULE_PARM_DESC(ports, "number of ports to be created");
 module_param(duplex, bool, 0444);
 MODULE_PARM_DESC(duplex, "create DUPLEX ports");
 
-typedef struct snd_seq_dummy_port {
+struct snd_seq_dummy_port {
        int client;
        int port;
        int duplex;
        int connect;
-} snd_seq_dummy_port_t;
+};
 
 static int my_client = -1;
 
@@ -87,11 +88,11 @@ static int my_client = -1;
  * Note: this callback is called only after all subscribers are removed.
  */
 static int
-dummy_unuse(void *private_data, snd_seq_port_subscribe_t *info)
+dummy_unuse(void *private_data, struct snd_seq_port_subscribe *info)
 {
-       snd_seq_dummy_port_t *p;
+       struct snd_seq_dummy_port *p;
        int i;
-       snd_seq_event_t ev;
+       struct snd_seq_event ev;
 
        p = private_data;
        memset(&ev, 0, sizeof(ev));
@@ -115,10 +116,11 @@ dummy_unuse(void *private_data, snd_seq_port_subscribe_t *info)
  * event input callback - just redirect events to subscribers
  */
 static int
-dummy_input(snd_seq_event_t *ev, int direct, void *private_data, int atomic, int hop)
+dummy_input(struct snd_seq_event *ev, int direct, void *private_data,
+           int atomic, int hop)
 {
-       snd_seq_dummy_port_t *p;
-       snd_seq_event_t tmpev;
+       struct snd_seq_dummy_port *p;
+       struct snd_seq_event tmpev;
 
        p = private_data;
        if (ev->source.client == SNDRV_SEQ_CLIENT_SYSTEM ||
@@ -139,23 +141,20 @@ dummy_input(snd_seq_event_t *ev, int direct, void *private_data, int atomic, int
 static void
 dummy_free(void *private_data)
 {
-       snd_seq_dummy_port_t *p;
-
-       p = private_data;
-       kfree(p);
+       kfree(private_data);
 }
 
 /*
  * create a port
  */
-static snd_seq_dummy_port_t __init *
+static struct snd_seq_dummy_port __init *
 create_port(int idx, int type)
 {
-       snd_seq_port_info_t pinfo;
-       snd_seq_port_callback_t pcb;
-       snd_seq_dummy_port_t *rec;
+       struct snd_seq_port_info pinfo;
+       struct snd_seq_port_callback pcb;
+       struct snd_seq_dummy_port *rec;
 
-       if ((rec = kcalloc(1, sizeof(*rec), GFP_KERNEL)) == NULL)
+       if ((rec = kzalloc(sizeof(*rec), GFP_KERNEL)) == NULL)
                return NULL;
 
        rec->client = my_client;
@@ -172,7 +171,9 @@ create_port(int idx, int type)
        pinfo.capability |= SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE;
        if (duplex)
                pinfo.capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;
-       pinfo.type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC;
+       pinfo.type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC
+               | SNDRV_SEQ_PORT_TYPE_SOFTWARE
+               | SNDRV_SEQ_PORT_TYPE_PORT;
        memset(&pcb, 0, sizeof(pcb));
        pcb.owner = THIS_MODULE;
        pcb.unuse = dummy_unuse;
@@ -194,9 +195,7 @@ create_port(int idx, int type)
 static int __init
 register_client(void)
 {
-       snd_seq_client_callback_t cb;
-       snd_seq_client_info_t cinfo;
-       snd_seq_dummy_port_t *rec1, *rec2;
+       struct snd_seq_dummy_port *rec1, *rec2;
        int i;
 
        if (ports < 1) {
@@ -205,20 +204,11 @@ register_client(void)
        }
 
        /* create client */
-       memset(&cb, 0, sizeof(cb));
-       cb.allow_input = 1;
-       cb.allow_output = 1;
-       my_client = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_DUMMY, &cb);
+       my_client = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_DUMMY,
+                                                "Midi Through");
        if (my_client < 0)
                return my_client;
 
-       /* set client name */
-       memset(&cinfo, 0, sizeof(cinfo));
-       cinfo.client = my_client;
-       cinfo.type = KERNEL_CLIENT;
-       strcpy(cinfo.name, "Midi Through");
-       snd_seq_kernel_client_ctl(my_client, SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, &cinfo);
-
        /* create ports */
        for (i = 0; i < ports; i++) {
                rec1 = create_port(i, 0);