Changeset 262 for GPL/branches/alsa-resync1/alsa-kernel/pci

Timestamp:

Oct 18, 2007, 6:38:12 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.6

Location:

GPL/branches/alsa-resync1/alsa-kernel/pci

Files:

• cmipci.c (modified) (1 diff)
• es1968.c (modified) (7 diffs)
• ice1712/aureon.c (modified) (2 diffs)
• ice1712/ice1712.c (modified) (3 diffs)
• ice1712/ice1724.c (modified) (12 diffs)
• ice1712/revo.c (modified) (2 diffs)
• korg1212/korg1212.c (modified) (1 diff)
• rme96.c (modified) (1 diff)
• rme9652/hdsp.c (modified) (9 diffs)
• rme9652/rme9652.c (modified) (1 diff)
• sonicvibes.c (modified) (2 diffs)
• trident/trident.c (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

@@ -2645 +2645 @@
 }
 
-static struct pci_device_id snd_cmipci_ids[] __devinitdata = {
+static struct pci_device_id snd_cmipci_ids[] = {
     {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
     {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

GPL/branches/alsa-resync1/alsa-kernel/pci/es1968.c

@@ -1598 +1598 @@
     esschan_t *es;
     int apu1;
+        unsigned long flags;
 
     /* search 2 APUs */
@@ -1617 +1618 @@
     es->substream = substream;
     es->mode = ESM_MODE_PLAY;
-        INIT_LIST_HEAD(&es->list);
 
     runtime->private_data = es;
@@ -1640 +1640 @@
     esschan_t *es;
     int apu1, apu2;
+        unsigned long flags;
 
     apu1 = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_CAPTURE);
@@ -1669 +1670 @@
     es->substream = substream;
     es->mode = ESM_MODE_CAPTURE;
-        INIT_LIST_HEAD(&es->list);
 
     /* get mixbuffer */
@@ -1699 +1699 @@
     es1968_t *chip = snd_pcm_substream_chip(substream);
     esschan_t *es;
+        unsigned long flags;
 
     if (substream->runtime->private_data == NULL)
@@ -1716 +1717 @@
     es1968_t *chip = snd_pcm_substream_chip(substream);
     esschan_t *es;
+        unsigned long flags;
 
     if (substream->runtime->private_data == NULL)
@@ -2016 +2018 @@
 
     if (event & ESM_SOUND_IRQ) {
-                struct list_head *p, *n;
+                struct list_head *p;
         spin_lock(&chip->substream_lock);
-                /* we need to use list_for_each_safe here since the substream
-                 * can be deleted in period_elapsed().
-                 */
-                list_for_each_safe(p, n, &chip->substream_list) {
+                list_for_each(p, &chip->substream_list) {
             esschan_t *es = list_entry(p, esschan_t, list);
             if (es->running)

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/aureon.c

@@ -458 +458 @@
         0x80,   /* ACLINK: I2S */
         0xf8,   /* I2S: vol, 96k, 24bit, 192k */
-        0xc2,   /* SPDIF: out-en, out-int, spdif-in */
+        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
         0xff,   /* GPIO_DIR */
         0xff,   /* GPIO_DIR1 */
@@ -474 +474 @@
         0x80,   /* ACLINK: I2S */
         0xf8,   /* I2S: vol, 96k, 24bit, 192k */
-        0xc2,   /* SPDIF: out-en, out-int, spdif-in */
+        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
         0xff,   /* GPIO_DIR */
         0xff,   /* GPIO_DIR1 */

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1712.c

@@ -104 +104 @@
 #endif
 
-static struct pci_device_id snd_ice1712_ids[] __devinitdata = {
+static struct pci_device_id snd_ice1712_ids[] = {
         { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },   /* ICE1712 */
         { 0, }
@@ -114 +114 @@
 static int snd_ice1712_build_controls(ice1712_t *ice);
 
-static int PRO_RATE_LOCKED = 0;
+static int PRO_RATE_LOCKED;
 static int PRO_RATE_RESET = 1;
 static unsigned int PRO_RATE_DEFAULT = 44100;
@@ -2388 +2388 @@
 
         if ((ice->res_port = request_region(ice->port, 32, "ICE1712 - Controller")) == NULL) {
+                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->port, ice->port + 32 - 1);
                 snd_ice1712_free(ice);
-                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->port, ice->port + 32 - 1);
                 return -EIO;
         }
         if ((ice->res_ddma_port = request_region(ice->ddma_port, 16, "ICE1712 - DDMA")) == NULL) {
+                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->ddma_port, ice->ddma_port + 16 - 1);
                 snd_ice1712_free(ice);
-                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->ddma_port, ice->ddma_port + 16 - 1);
                 return -EIO;
         }
         if ((ice->res_dmapath_port = request_region(ice->dmapath_port, 16, "ICE1712 - DMA path")) == NULL) {
+                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->dmapath_port, ice->dmapath_port + 16 - 1);
                 snd_ice1712_free(ice);
-                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->dmapath_port, ice->dmapath_port + 16 - 1);
                 return -EIO;
         }
         if ((ice->res_profi_port = request_region(ice->profi_port, 64, "ICE1712 - Professional")) == NULL) {
+                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->profi_port, ice->profi_port + 16 - 1);
                 snd_ice1712_free(ice);
-                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->profi_port, ice->profi_port + 16 - 1);
                 return -EIO;
         }
         if (request_irq(pci->irq, snd_ice1712_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1712", (void *) ice)) {
+                snd_printk("unable to grab IRQ %d\n", pci->irq);
                 snd_ice1712_free(ice);
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
                 return -EIO;
         }

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1724.c

@@ -78 +78 @@
 #endif
 
-static struct pci_device_id snd_vt1724_ids[] __devinitdata = {
+static struct pci_device_id snd_vt1724_ids[] = {
         { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_VT1724, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { 0, }
@@ -86 +86 @@
 
 
-static int PRO_RATE_LOCKED = 0;
+static int PRO_RATE_LOCKED;
 static int PRO_RATE_RESET = 1;
 static unsigned int PRO_RATE_DEFAULT = 44100;
@@ -383 +383 @@
         }
 
-        if (rate == ice->cur_rate) {
-                spin_unlock_irqrestore(&ice->reg_lock, flags);
-                return;
-        }
-
         switch (rate) {
         case 8000: val = 6; break;
@@ -410 +405 @@
         }
         outb(val, ICEMT1724(ice, RATE));
+        if (rate == ice->cur_rate) {
+                spin_unlock_irqrestore(&ice->reg_lock, flags);
+                return;
+        }
+
         ice->cur_rate = rate;
 
@@ -483 +483 @@
 }
 
-#define CHECK_INVALID_PTR
-
 static snd_pcm_uframes_t snd_vt1724_playback_pro_pointer(snd_pcm_substream_t * substream)
 {
@@ -492 +490 @@
         if (!(inl(ICEMT1724(ice, DMA_CONTROL)) & VT1724_PDMA0_START))
                 return 0;
+#if 0 /* read PLAYBACK_ADDR */
         ptr = inl(ICEMT1724(ice, PLAYBACK_ADDR));
-#ifdef CHECK_INVALID_PTR
         if (ptr < substream->runtime->dma_addr) {
                 snd_printd("ice1724: invalid negative ptr\n");
                 return 0;
         }
-#endif
         ptr -= substream->runtime->dma_addr;
         ptr = bytes_to_frames(substream->runtime, ptr);
-#ifdef CHECK_INVALID_PTR
         if (ptr >= substream->runtime->buffer_size) {
                 snd_printd("ice1724: invalid ptr %d (size=%d)\n", (int)ptr, (int)substream->runtime->period_size);
                 return 0;
+        }
+#else /* read PLAYBACK_SIZE */
+        ptr = inl(ICEMT1724(ice, PLAYBACK_SIZE)) & 0xffffff;
+        ptr = (ptr + 1) << 2;
+        ptr = bytes_to_frames(substream->runtime, ptr);
+        if (ptr <= substream->runtime->buffer_size)
+                ptr = substream->runtime->buffer_size - ptr;
+        else {
+                snd_printd("ice1724: invalid ptr %d (size=%d)\n", (int)ptr, (int)substream->runtime->buffer_size);
+                ptr = 0;
         }
 #endif
@@ -537 +543 @@
         if (!(inl(ICEMT1724(ice, DMA_CONTROL)) & reg->start))
                 return 0;
+#if 0 /* use ADDR register */
         ptr = inl(ice->profi_port + reg->addr);
         ptr -= substream->runtime->dma_addr;
         return bytes_to_frames(substream->runtime, ptr);
+#else /* use SIZE register */
+        ptr = inw(ice->profi_port + reg->size);
+        ptr = (ptr + 1) << 2;
+        ptr = bytes_to_frames(substream->runtime, ptr);
+        if (ptr <= substream->runtime->buffer_size)
+                ptr = substream->runtime->buffer_size - ptr;
+        else {
+                snd_printd("ice1724: invalid ptr %d (size=%d)\n", (int)ptr, (int)substream->runtime->buffer_size);
+                ptr = 0;
+        }
+        return ptr;
+#endif
 }
 
@@ -567 +586 @@
                                  SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START),
         .formats =              SNDRV_PCM_FMTBIT_S32_LE,
-        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000,
+        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_192000,
         .rate_min =             4000,
         .rate_max =             192000,
@@ -586 +605 @@
                                  SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START),
         .formats =              SNDRV_PCM_FMTBIT_S32_LE,
-        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000,
+        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_192000,
         .rate_min =             4000,
         .rate_max =             192000,
@@ -721 +740 @@
                                  SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START),
         .formats =              SNDRV_PCM_FMTBIT_S32_LE,
-        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000,
+        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_192000,
         .rate_min =             4000,
         .rate_max =             192000,
@@ -779 +798 @@
         snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
 
-        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates_96);
+        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates_192);
         return 0;
 }
@@ -1797 +1816 @@
 
         if ((ice->res_port = request_region(ice->port, 32, "ICE1724 - Controller")) == NULL) {
+                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->port, ice->port + 32 - 1);
                 snd_vt1724_free(ice);
-                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->port, ice->port + 32 - 1);
                 return -EIO;
         }
 
         if ((ice->res_profi_port = request_region(ice->profi_port, 128, "ICE1724 - Professional")) == NULL) {
+                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->profi_port, ice->profi_port + 16 - 1);
                 snd_vt1724_free(ice);
-                snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->profi_port, ice->profi_port + 16 - 1);
                 return -EIO;
         }
                 
         if (request_irq(pci->irq, snd_vt1724_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1724", (void *) ice)) {
+                snd_printk("unable to grab IRQ %d\n", pci->irq);
                 snd_vt1724_free(ice);
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
                 return -EIO;
         }

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/revo.c

@@ -70 +70 @@
         tmp &= ~(0x03 << shift);
         tmp |= dfs << shift;
-        snd_akm4xxx_write(ak, 0, reg, tmp);
+        // snd_akm4xxx_write(ak, 0, reg, tmp);
+        snd_akm4xxx_set(ak, 0, reg, tmp); /* the value is written in reset(0) */
         snd_akm4xxx_reset(ak, 0);
 }
@@ -135 +136 @@
 
         /* second stage of initialization, analog parts and others */
-        ak = ice->akm = kmalloc(sizeof(akm4xxx_t) * 2, GFP_KERNEL);
+        ak = ice->akm = snd_kcalloc(sizeof(akm4xxx_t) * 2, GFP_KERNEL);
         if (! ak)
                 return -ENOMEM;

GPL/branches/alsa-resync1/alsa-kernel/pci/korg1212/korg1212.c

@@ -424 +424 @@
 MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>");
 
-static struct pci_device_id snd_korg1212_ids[] __devinitdata = {
+static struct pci_device_id snd_korg1212_ids[] = {
         {
                 .vendor    = 0x10b5,

GPL/branches/alsa-resync1/alsa-kernel/pci/rme96.c

@@ -261 +261 @@
 } rme96_t;
 
-static struct pci_device_id snd_rme96_ids[] __devinitdata = {
+static struct pci_device_id snd_rme96_ids[] = {
         { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_DIGI96,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/hdsp.c

@@ -475 +475 @@
 #endif
 
-static struct pci_device_id snd_hdsp_ids[] __devinitdata = {
+static struct pci_device_id snd_hdsp_ids[] = {
         {
                 .vendor = PCI_VENDOR_ID_XILINX,
@@ -3792 +3792 @@
 {
         hdsp_t *hdsp = (hdsp_t *)hw->private_data;      
-        hdsp_peak_rms_t *peak_rms;
-        hdsp_firmware_t *firmware;
-        hdsp_mixer_t    *mixer;
-        hdsp_config_info_t info;
-        hdsp_version_t hdsp_version;
-        int i;
-        int err;
-        unsigned long flags;
         
         switch (cmd) {
-        case SNDRV_HDSP_IOCTL_GET_PEAK_RMS:
+        case SNDRV_HDSP_IOCTL_GET_PEAK_RMS: {
+                hdsp_peak_rms_t *peak_rms;
+
                 if (hdsp->io_type == H9652) {
                     snd_printk("hardware metering isn't supported yet for hdsp9652 cards\n");
@@ -3828 +3822 @@
                 }
                 break;
-        case SNDRV_HDSP_IOCTL_GET_CONFIG_INFO:
+        }
+        case SNDRV_HDSP_IOCTL_GET_CONFIG_INFO: {
+                hdsp_config_info_t info;
+                unsigned long flags;
+                int i;
+
                 if (!(hdsp->state & HDSP_FirmwareLoaded)) {
                         snd_printk("Firmware needs to be uploaded to the card.\n");     
@@ -3858 +3857 @@
                         return -EFAULT;
                 break;
-        case SNDRV_HDSP_IOCTL_GET_VERSION:
+        }
+        case SNDRV_HDSP_IOCTL_GET_VERSION: {
+                hdsp_version_t hdsp_version;
+                int err;
+
                 if (hdsp->io_type == H9652) return -EINVAL;
                 if (hdsp->io_type == Undefined) {
@@ -3871 +3874 @@
                 }
                 break;
-        case SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE:
+        }
+        case SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE: {
+                hdsp_firmware_t *firmware;
+                unsigned long *firmware_data;
+                int err;
+
                 if (hdsp->io_type == H9652) return -EINVAL;
                 /* SNDRV_HDSP_IOCTL_GET_VERSION must have been called */
@@ -3878 +3886 @@
                 snd_printk("initializing firmware upload\n");
                 firmware = (hdsp_firmware_t *)arg;
+                if (get_user(firmware_data, &firmware->firmware_data)) {
+                        return -EFAULT;
+                }
 
                 if (hdsp_check_for_iobox (hdsp)) {
@@ -3883 +3894 @@
                 }
 
-                if (copy_from_user(hdsp->firmware_cache, firmware->firmware_data, sizeof(unsigned long)*24413) != 0) {
+                if (copy_from_user(hdsp->firmware_cache, firmware_data, sizeof(unsigned long)*24413) != 0) {
                         return -EFAULT;
                 }
@@ -3905 +3916 @@
                 }
                 break;
-        case SNDRV_HDSP_IOCTL_GET_MIXER:
+        }
+        case SNDRV_HDSP_IOCTL_GET_MIXER: {
+                hdsp_mixer_t    *mixer;
+
                 mixer = (hdsp_mixer_t *)arg;
                 if (copy_to_user(mixer->matrix, hdsp->mixer_matrix, sizeof(unsigned short)*HDSP_MATRIX_MIXER_SIZE))
                         return -EFAULT;
                 break;
+        }
         default:
                 return -EINVAL;
@@ -4129 +4144 @@
         case 0xa:
         case 0xb:
+        case 0x32:
                 hdsp->card_name = "RME Hammerfall DSP";
                 break;

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/rme9652.c

@@ -345 +345 @@
 #endif
 
-
-static struct pci_device_id snd_rme9652_ids[] __devinitdata = {
+static struct pci_device_id snd_rme9652_ids[] = {
         {
                 .vendor    = 0x10ee,

GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c

@@ -265 +265 @@
 };
 
-static struct pci_device_id snd_sonic_ids[] __devinitdata = {
+static struct pci_device_id snd_sonic_ids[] = {
         { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
         { 0, }
@@ -1269 +1269 @@
         sonic->sb_port = pci_resource_start(pci, 0);
         if ((sonic->res_sb_port = request_region(sonic->sb_port, 0x10, "S3 SonicVibes SB")) == NULL) {
+                snd_printk("unable to grab SB port at 0x%lx-0x%lx\n", sonic->sb_port, sonic->sb_port + 0x10 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab SB port at 0x%lx-0x%lx\n", sonic->sb_port, sonic->sb_port + 0x10 - 1);
                 return -EBUSY;
         }
         sonic->enh_port = pci_resource_start(pci, 1);
         if ((sonic->res_enh_port = request_region(sonic->enh_port, 0x10, "S3 SonicVibes Enhanced")) == NULL) {
+                snd_printk("unable to grab PCM port at 0x%lx-0x%lx\n", sonic->enh_port, sonic->enh_port + 0x10 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab PCM port at 0x%lx-0x%lx\n", sonic->enh_port, sonic->enh_port + 0x10 - 1);
                 return -EBUSY;
         }
         sonic->synth_port = pci_resource_start(pci, 2);
         if ((sonic->res_synth_port = request_region(sonic->synth_port, 4, "S3 SonicVibes Synth")) == NULL) {
+                snd_printk("unable to grab synth port at 0x%lx-0x%lx\n", sonic->synth_port, sonic->synth_port + 4 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab synth port at 0x%lx-0x%lx\n", sonic->synth_port, sonic->synth_port + 4 - 1);
                 return -EBUSY;
         }
         sonic->midi_port = pci_resource_start(pci, 3);
         if ((sonic->res_midi_port = request_region(sonic->midi_port, 4, "S3 SonicVibes Midi")) == NULL) {
+                snd_printk("unable to grab MIDI port at 0x%lx-0x%lx\n", sonic->midi_port, sonic->midi_port + 4 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab MIDI port at 0x%lx-0x%lx\n", sonic->midi_port, sonic->midi_port + 4 - 1);
                 return -EBUSY;
         }
         sonic->game_port = pci_resource_start(pci, 4);
         if (request_irq(pci->irq, snd_sonicvibes_interrupt, SA_INTERRUPT|SA_SHIRQ, "S3 SonicVibes", (void *)sonic)) {
-                snd_magic_kfree(sonic);
                 snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_sonicvibes_free(sonic);
                 return -EBUSY;
         }

GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident.c

@@ -70 +70 @@
 MODULE_PARM_SYNTAX(wavetable_size, SNDRV_ENABLED ",default:8192,skill:advanced");
 
-
-static struct pci_device_id snd_trident_ids[] __devinitdata = {
+static struct pci_device_id snd_trident_ids[] = {
         { 0x1023, 0x2000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* Trident 4DWave DX PCI Audio */
         { 0x1023, 0x2001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* Trident 4DWave NX PCI Audio */