Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[pandora-kernel.git] / include / sound / seq_virmidi.h

diff --git a/include/sound/seq_virmidi.h b/include/sound/seq_virmidi.h
index 1ad27e8..d888433 100644 (file)
--- a/include/sound/seq_virmidi.h
+++ b/include/sound/seq_virmidi.h
@@ -4,7 +4,7 @@
 /*
  *  Virtual Raw MIDI client on Sequencer
  *  Copyright (c) 2000 by Takashi Iwai <tiwai@suse.de>,
- *                        Jaroslav Kysela <perex@suse.cz>
+ *                        Jaroslav Kysela <perex@perex.cz>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -25,25 +25,23 @@
 #include "rawmidi.h"
 #include "seq_midi_event.h"
 
-typedef struct _snd_virmidi_dev snd_virmidi_dev_t;
-
 /*
  * device file instance:
  * This instance is created at each time the midi device file is
  * opened.  Each instance has its own input buffer and MIDI parser
  * (buffer), and is associated with the device instance.
  */
-typedef struct _snd_virmidi {
+struct snd_virmidi {
        struct list_head list;
        int seq_mode;
        int client;
        int port;
        unsigned int trigger: 1;
-       snd_midi_event_t *parser;
-       snd_seq_event_t event;
-       snd_virmidi_dev_t *rdev;
-       snd_rawmidi_substream_t *substream;
-} snd_virmidi_t;
+       struct snd_midi_event *parser;
+       struct snd_seq_event event;
+       struct snd_virmidi_dev *rdev;
+       struct snd_rawmidi_substream *substream;
+};
 
 #define SNDRV_VIRMIDI_SUBSCRIBE                (1<<0)
 #define SNDRV_VIRMIDI_USE              (1<<1)
@@ -53,9 +51,9 @@ typedef struct _snd_virmidi {
  * Each virtual midi device has one device instance.  It contains
  * common information and the linked-list of opened files, 
  */
-struct _snd_virmidi_dev {
-       snd_card_t *card;               /* associated card */
-       snd_rawmidi_t *rmidi;           /* rawmidi device */
+struct snd_virmidi_dev {
+       struct snd_card *card;          /* associated card */
+       struct snd_rawmidi *rmidi;              /* rawmidi device */
        int seq_mode;                   /* SNDRV_VIRMIDI_XXX */
        int device;                     /* sequencer device */
        int client;                     /* created/attached client */
@@ -78,6 +76,6 @@ struct _snd_virmidi_dev {
 #define SNDRV_VIRMIDI_SEQ_ATTACH       1
 #define SNDRV_VIRMIDI_SEQ_DISPATCH     2
 
-int snd_virmidi_new(snd_card_t *card, int device, snd_rawmidi_t **rrmidi);
+int snd_virmidi_new(struct snd_card *card, int device, struct snd_rawmidi **rrmidi);
 
 #endif /* __SOUND_SEQ_VIRMIDI */