Changeset 522 for GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

Timestamp:

Jul 22, 2010, 7:20:45 PM (15 years ago)

Author:

David Azarewicz

Message:

flush_workqueue hack, compiler warnings

File:

• GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c (modified) (27 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

@@ -108 +108 @@
 /********************************************************************************************************/
 #define PLAYBACK_LIST_ADDR      0x00            /* Base DMA address of a list of pointers to each period/size */
-                                                /* One list entry: 4 bytes for DMA address, 
+                                                /* One list entry: 4 bytes for DMA address,
                                                  * 4 bytes for period_size << 16.
                                                  * One list entry is 8 bytes long.
@@ -187 +187 @@
  *  - channel 2 is the center/lfe chanel
  * Volume is controlled by the AC97 for the front and rear channels by
- * the PCM Playback Volume, Sigmatel Surround Playback Volume and 
+ * the PCM Playback Volume, Sigmatel Surround Playback Volume and
  * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects
  * the front/rear channel mixing in the REAR OUT jack. When using the
@@ -200 +200 @@
         int number;
         int use;
-  
+
         struct emu10k1x_pcm *epcm;
 };
@@ -256 +256 @@
 /* hardware definition */
 static struct snd_pcm_hardware snd_emu10k1x_playback_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP | 
+        .info =                 (SNDRV_PCM_INFO_MMAP |
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -275 +275 @@
 
 static struct snd_pcm_hardware snd_emu10k1x_capture_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP | 
+        .info =                 (SNDRV_PCM_INFO_MMAP |
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -293 +293 @@
 };
 
-static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu, 
-                                          unsigned int reg, 
+static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu,
+                                          unsigned int reg,
                                           unsigned int chn)
 {
         unsigned long flags;
         unsigned int regptr, val;
-  
+
         regptr = (reg << 16) | chn;
 
@@ -309 +309 @@
 }
 
-static void snd_emu10k1x_ptr_write(struct emu10k1x *emu, 
-                                   unsigned int reg, 
-                                   unsigned int chn, 
+static void snd_emu10k1x_ptr_write(struct emu10k1x *emu,
+                                   unsigned int reg,
+                                   unsigned int chn,
                                    unsigned int data)
 {
@@ -397 +397 @@
         epcm->emu = chip;
         epcm->substream = substream;
-  
+
         runtime->private_data = epcm;
         runtime->private_free = snd_emu10k1x_pcm_free_substream;
-  
+
         runtime->hw = snd_emu10k1x_playback_hw;
 
@@ -531 +531 @@
                 return 0;
         
-        if (ptr3 != ptr4) 
+        if (ptr3 != ptr4)
                 ptr1 = snd_emu10k1x_ptr_read(emu, PLAYBACK_POINTER, channel);
         ptr2 = bytes_to_frames(runtime, ptr1);
@@ -653 +653 @@
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                snd_emu10k1x_intr_enable(emu, INTE_CAP_0_LOOP | 
+                snd_emu10k1x_intr_enable(emu, INTE_CAP_0_LOOP |
                                          INTE_CAP_0_HALF_LOOP);
                 snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0)|TRIGGER_CAPTURE);
@@ -660 +660 @@
         case SNDRV_PCM_TRIGGER_STOP:
                 epcm->running = 0;
-                snd_emu10k1x_intr_disable(emu, INTE_CAP_0_LOOP | 
+                snd_emu10k1x_intr_disable(emu, INTE_CAP_0_LOOP |
                                           INTE_CAP_0_HALF_LOOP);
                 snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0) & ~(TRIGGER_CAPTURE));
@@ -707 +707 @@
         unsigned long flags;
         unsigned short val;
-  
+
         spin_lock_irqsave(&emu->emu_lock, flags);
         outb(reg, emu->port + AC97ADDRESS);
@@ -720 +720 @@
         struct emu10k1x *emu = ac97->private_data;
         unsigned long flags;
-  
+
         spin_lock_irqsave(&emu->emu_lock, flags);
         outb(reg, emu->port + AC97ADDRESS);
@@ -736 +736 @@
                 .read = snd_emu10k1x_ac97_read,
         };
-  
+
         if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
                 return err;
@@ -800 +800 @@
                         snd_emu10k1x_pcm_interrupt(chip, cap_voice);
                 else
-                        snd_emu10k1x_intr_disable(chip, 
+                        snd_emu10k1x_intr_disable(chip,
                                                   INTE_CAP_0_LOOP |
                                                   INTE_CAP_0_HALF_LOOP);
@@ -810 +810 @@
                         if (pvoice->use)
                                 snd_emu10k1x_pcm_interrupt(chip, pvoice);
-                        else 
+                        else
                                 snd_emu10k1x_intr_disable(chip, mask);
                 }
@@ -836 +836 @@
         int err;
         int capture = 0;
-  
+
         if (rpcm)
                 *rpcm = NULL;
@@ -844 +844 @@
         if ((err = snd_pcm_new(emu->card, "emu10k1x", device, 1, capture, &pcm)) < 0)
                 return err;
-  
+
         pcm->private_data = emu;
         
@@ -873 +873 @@
 
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(emu->pci), 
+                                              snd_dma_pci_data(emu->pci),
                                               32*1024, 32*1024);
-  
+
         if (rpcm)
                 *rpcm = pcm;
-  
+
         return 0;
 }
@@ -916 +916 @@
         spin_lock_init(&chip->emu_lock);
         spin_lock_init(&chip->voice_lock);
-  
+
         chip->port = pci_resource_start(pci, 0);
         if ((chip->res_port = request_region(chip->port, 8,
-                                             "EMU10K1X")) == NULL) { 
+                                             "EMU10K1X")) == NULL) {
                 snd_printk(KERN_ERR "emu10k1x: cannot allocate the port 0x%lx\n", chip->port);
                 snd_emu10k1x_free(chip);
@@ -932 +932 @@
         }
         chip->irq = pci->irq;
-  
+
         if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                4 * 1024, &chip->dma_buffer) < 0) {
@@ -973 +973 @@
          */
         snd_emu10k1x_ptr_write(chip, SPCS0, 0,
-                               chip->spdif_bits[0] = 
+                               chip->spdif_bits[0] =
                                SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
                                SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
@@ -979 +979 @@
                                0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
         snd_emu10k1x_ptr_write(chip, SPCS1, 0,
-                               chip->spdif_bits[1] = 
+                               chip->spdif_bits[1] =
                                SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
                                SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
@@ -985 +985 @@
                                0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
         snd_emu10k1x_ptr_write(chip, SPCS2, 0,
-                               chip->spdif_bits[2] = 
+                               chip->spdif_bits[2] =
                                SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
                                SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
@@ -1006 +1006 @@
 }
 
-static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry, 
+static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry,
                                        struct snd_info_buffer *buffer)
 {
@@ -1034 +1034 @@
 }
 
-static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry, 
+static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry,
                                         struct snd_info_buffer *buffer)
 {
@@ -1045 +1045 @@
                         continue;
 
-                if ((reg < 0x49) && (reg >= 0) && (val <= 0xffffffff) 
-                    && (channel_id >= 0) && (channel_id <= 2) )
+                if ((reg < 0x49) /* && (reg >= 0) && (val <= 0xffffffff) && (channel_id >= 0) DAZ */ && (channel_id <= 2) )
                         snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
         }