Fix common misspellings

[deliverable/linux.git] / sound / pci / rme9652 / hdspm.c

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index ced1406d777f3644ba3da58408db8805f9e21e78..949691a876d3635798c6000da1b651d13684b1a6 100644 (file)
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -391,7 +391,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 
 /* Status2 Register bits */ /* MADI ONLY */
 
-#define HDSPM_version0 (1<<0)  /* not realy defined but I guess */
+#define HDSPM_version0 (1<<0)  /* not really defined but I guess */
 #define HDSPM_version1 (1<<1)  /* in former cards it was ??? */
 #define HDSPM_version2 (1<<2)
 
@@ -506,6 +506,8 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define AIO_OUT_DS_CHANNELS        12
 #define AIO_OUT_QS_CHANNELS        10
 
+#define AES32_CHANNELS         16
+
 /* the size of a substream (1 mono data stream) */
 #define HDSPM_CHANNEL_BUFFER_SAMPLES  (16*1024)
 #define HDSPM_CHANNEL_BUFFER_BYTES    (4*HDSPM_CHANNEL_BUFFER_SAMPLES)
@@ -524,6 +526,8 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_AIO_REV          212
 #define HDSPM_MADIFACE_REV     213
 #define HDSPM_AES_REV          240
+#define HDSPM_AES32_REV                234
+#define HDSPM_AES32_OLD_REV    233
 
 /* speed factor modes */
 #define HDSPM_SPEED_SINGLE 0
@@ -932,7 +936,7 @@ struct hdspm {
        struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS];
        /* but input to much, so not used */
        struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS];
-       /* full mixer accessable over mixer ioctl or hwdep-device */
+       /* full mixer accessible over mixer ioctl or hwdep-device */
        struct hdspm_mixer *mixer;
 
        struct hdspm_tco *tco;  /* NULL if no TCO detected */
@@ -3700,8 +3704,8 @@ static int hdspm_sync_in_sync_check(struct hdspm *hdspm)
        case MADI:
        case AES32:
                status = hdspm_read(hdspm, HDSPM_statusRegister2);
-               lock = (status & 0x400000) ? 1 : 0;
-               sync = (status & 0x800000) ? 1 : 0;
+               lock = (status & HDSPM_syncInLock) ? 1 : 0;
+               sync = (status & HDSPM_syncInSync) ? 1 : 0;
                break;
 
        case MADIface:
@@ -6288,8 +6292,10 @@ static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
 
 static inline void snd_hdspm_initialize_midi_flush(struct hdspm * hdspm)
 {
-       snd_hdspm_flush_midi_input(hdspm, 0);
-       snd_hdspm_flush_midi_input(hdspm, 1);
+       int i;
+
+       for (i = 0; i < hdspm->midiPorts; i++)
+               snd_hdspm_flush_midi_input(hdspm, i);
 }
 
 static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
@@ -6391,10 +6397,16 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
                hdspm->midiPorts = 1;
                break;
        case HDSPM_AES_REV:
+       case HDSPM_AES32_REV:
+       case HDSPM_AES32_OLD_REV:
                hdspm->io_type = AES32;
                hdspm->card_name = "RME AES32";
                hdspm->midiPorts = 2;
                break;
+       default:
+               snd_printk(KERN_ERR "HDSPM: unknown firmware revision %x\n",
+                               hdspm->firmware_rev);
+               return -ENODEV;
        }
 
        err = pci_enable_device(pci);
@@ -6449,9 +6461,9 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
 
        switch (hdspm->io_type) {
        case AES32:
-               hdspm->ss_in_channels = hdspm->ss_out_channels = 16;
-               hdspm->ds_in_channels = hdspm->ds_out_channels = 16;
-               hdspm->qs_in_channels = hdspm->qs_out_channels = 16;
+               hdspm->ss_in_channels = hdspm->ss_out_channels = AES32_CHANNELS;
+               hdspm->ds_in_channels = hdspm->ds_out_channels = AES32_CHANNELS;
+               hdspm->qs_in_channels = hdspm->qs_out_channels = AES32_CHANNELS;
 
                hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
                        channel_map_aes32;
@@ -6466,7 +6478,8 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
                hdspm->port_names_in_qs = hdspm->port_names_out_qs =
                        texts_ports_aes32;
 
-               hdspm->max_channels_out = hdspm->max_channels_in = 16;
+               hdspm->max_channels_out = hdspm->max_channels_in =
+                       AES32_CHANNELS;
                hdspm->port_names_in = hdspm->port_names_out =
                        texts_ports_aes32;
                hdspm->channel_map_in = hdspm->channel_map_out =