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

Timestamp:

Aug 27, 2007, 7:41:50 PM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.5

Location:

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

Files:

• cs4281.c (modified) (7 diffs)
• es1968.c (modified) (1 diff)
• ice1712/ak4xxx.c (modified) (3 diffs)
• ice1712/aureon.c (added)
• ice1712/aureon.h (added)
• ice1712/ews.c (modified) (4 diffs)
• ice1712/ice1712.c (modified) (12 diffs)
• ice1712/ice1712.h (modified) (1 diff)
• ice1712/ice1724.c (modified) (17 diffs)
• ice1712/makefile.os2 (modified) (1 diff)
• ice1712/revo.c (modified) (4 diffs)
• korg1212/korg1212.c (modified) (2 diffs)
• maestro3.c (modified) (2 diffs)
• rme96.c (modified) (5 diffs)
• rme9652/hammerfall_mem.c (deleted)
• rme9652/hdsp.c (modified) (48 diffs)
• rme9652/makefile.os2 (modified) (1 diff)
• rme9652/rme9652.c (modified) (3 diffs)
• sonicvibes.c (modified) (3 diffs)
• ymfpci/ymfpci_main.c (modified) (1 diff)

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

@@ -27 +27 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
+#ifndef TARGET_OS2 //TODO: Implement linux/gameport.h
+#include <linux/gameport.h>
+#endif /* TARGET_OS2 */
 #include <sound/core.h>
 #include <sound/control.h>
@@ -36 +39 @@
 #include <sound/initval.h>
 
-#ifndef LINUX_2_2
-#include <linux/gameport.h>
-#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -1247 +1247 @@
  */
 
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
 
 typedef struct snd_cs4281_gameport {
@@ -1342 +1342 @@
 static int snd_cs4281_free(cs4281_t *chip)
 {
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
     if (chip->gameport) {
         gameport_unregister_port(&chip->gameport->info);
@@ -1730 +1730 @@
     chip->uartm |= CS4281_MODE_OUTPUT;
     chip->midcr |= BA0_MIDCR_TXE;
-    chip->midi_input = substream;
+        chip->midi_output = substream;
     if (!(chip->uartm & CS4281_MODE_INPUT)) {
         snd_cs4281_midi_reset(chip);
@@ -1913 +1913 @@
     /* EOI to the PCI part... reenables interrupts */
     snd_cs4281_pokeBA0(chip, BA0_HICR, BA0_HICR_EOI);
+
     return IRQ_HANDLED;
 
@@ -1991 +1992 @@
         return err;
     }
-#ifndef LINUX_2_2
+#ifndef TARGET_OS2
     snd_cs4281_gameport(chip);
-#endif
+#endif /* !TARGET_OS2 */
     strcpy(card->driver, "CS4281");
     strcpy(card->shortname, "Cirrus Logic CS4281");

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

@@ -667 +667 @@
 }
 
+#define big_mdelay(msec) do {\
+        set_current_state(TASK_UNINTERRUPTIBLE);\
+        schedule_timeout(((msec) * HZ + 999) / 1000);\
+} while (0)
+        
 /* Wait for the codec bus to be free */
 static int snd_es1968_ac97_wait(es1968_t *chip)

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

@@ -28 +28 @@
 #include <linux/init.h>
 #include <sound/core.h>
+#include <sound/initval.h>
 #include "ice1712.h"
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_DESCRIPTION("ICEnsemble ICE17xx <-> AK4xxx AD/DA chip interface");
+MODULE_LICENSE("GPL");
+MODULE_CLASSES("{sound}");
 
 static void snd_ice1712_akm4xxx_lock(akm4xxx_t *ak, int chip)
@@ -98 +104 @@
         }
 
-        /* save the data */
-        if (ak->type == SND_AK4524 || ak->type == SND_AK4528) {
-                if ((addr != 0x04 && addr != 0x05) || (data & 0x80) == 0)
-                        ak->images[chip][addr] = data;
-                else
-                        ak->ipga_gain[chip][addr-4] = data;
-        } else {
-                /* AK4529, or else */
-                ak->images[chip][addr] = data;
-        }
-        
         if (priv->cs_mask == priv->cs_addr) {
                 if (priv->cif) {
@@ -180 +175 @@
         return 0;
 }
+
+EXPORT_SYMBOL(snd_ice1712_akm4xxx_init);
+EXPORT_SYMBOL(snd_ice1712_akm4xxx_free);
+EXPORT_SYMBOL(snd_ice1712_akm4xxx_build_controls);

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

@@ -390 +390 @@
  */
 
+/* 6fire specific */
+#define PCF9554_REG_INPUT      0
+#define PCF9554_REG_OUTPUT     1
+#define PCF9554_REG_POLARITY   2
+#define PCF9554_REG_CONFIG     3
+
+static int snd_ice1712_6fire_write_pca(ice1712_t *ice, unsigned char reg, unsigned char data);
+
 static int __devinit snd_ice1712_ews_init(ice1712_t *ice)
 {
@@ -426 +434 @@
                         return err;
                 }
+                snd_ice1712_6fire_write_pca(ice, PCF9554_REG_CONFIG, 0x80);
                 break;
         case ICE1712_SUBDEVICE_EWS88MT:
@@ -450 +459 @@
                 if ((err = snd_ice1712_init_cs8427(ice, CS8427_BASE_ADDR)) < 0)
                         return err;
+                snd_cs8427_reg_write(ice->cs8427, CS8427_REG_RECVERRMASK, CS8427_UNLOCK | CS8427_CONF | CS8427_BIP | CS8427_PAR);
                 break;
         case ICE1712_SUBDEVICE_DMX6FIRE:
                 if ((err = snd_ice1712_init_cs8427(ice, ICE1712_6FIRE_CS8427_ADDR)) < 0)
                         return err;
+                snd_cs8427_reg_write(ice->cs8427, CS8427_REG_RECVERRMASK, CS8427_UNLOCK | CS8427_CONF | CS8427_BIP | CS8427_PAR);
                 break;
         case ICE1712_SUBDEVICE_EWS88MT:
@@ -750 +761 @@
  * DMX 6Fire specific controls
  */
-
-#define PCF9554_REG_INPUT       0
-#define PCF9554_REG_OUTPUT      1
-#define PCF9554_REG_POLARITY    2
-#define PCF9554_REG_CONFIG      3
 
 static int snd_ice1712_6fire_read_pca(ice1712_t *ice, unsigned char reg)

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

@@ -119 +119 @@
 
 /*
- *  AK4xxx stuff
- */
-
-#include "ak4xxx.c"
-
-/*
  *  Basic I/O
  */
@@ -305 +299 @@
 {
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_DIRECTION, data);
+        inb(ICEREG(ice, DATA)); /* dummy read for pci-posting */
 }
 
@@ -310 +305 @@
 {
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, data);
+        inb(ICEREG(ice, DATA)); /* dummy read for pci-posting */
 }
 
@@ -320 +316 @@
 {
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, val);
+        inb(ICEREG(ice, DATA)); /* dummy read for pci-posting */
 }
 
@@ -667 +664 @@
                 return 0;
         ptr = runtime->buffer_size - inw(ice->ddma_port + 4);
+        if (ptr == runtime->buffer_size)
+                ptr = 0;
         return bytes_to_frames(substream->runtime, ptr);
 }
@@ -684 +683 @@
         ptr = snd_ice1712_ds_read(ice, substream->number * 2, addr) -
                 ice->playback_con_virt_addr[substream->number];
+        if (ptr == substream->runtime->buffer_size)
+                ptr = 0;
         return bytes_to_frames(substream->runtime, ptr);
 }
@@ -695 +696 @@
                 return 0;
         ptr = inl(ICEREG(ice, CONCAP_ADDR)) - ice->capture_con_virt_addr;
+        if (ptr == substream->runtime->buffer_size)
+                ptr = 0;
         return bytes_to_frames(substream->runtime, ptr);
 }
@@ -1105 +1108 @@
                 return 0;
         ptr = ice->playback_pro_size - (inw(ICEMT(ice, PLAYBACK_SIZE)) << 2);
+        if (ptr == substream->runtime->buffer_size)
+                ptr = 0;
         return bytes_to_frames(substream->runtime, ptr);
 }
@@ -1116 +1121 @@
                 return 0;
         ptr = ice->capture_pro_size - (inw(ICEMT(ice, CAPTURE_SIZE)) << 2);
+        if (ptr == substream->runtime->buffer_size)
+                ptr = 0;
         return bytes_to_frames(substream->runtime, ptr);
 }
@@ -2152 +2159 @@
 {
         int dev = 0xa0;         /* EEPROM device address */
-        unsigned int i;
+        unsigned int i, size;
 
         if ((inb(ICEREG(ice, I2C_CTRL)) & ICE1712_I2C_EEPROM) == 0) {
@@ -2163 +2170 @@
                                 (snd_ice1712_read_i2c(ice, dev, 0x03) << 24);
         ice->eeprom.size = snd_ice1712_read_i2c(ice, dev, 0x04);
-        if (ice->eeprom.size > 32) {
+        if (ice->eeprom.size < 6)
+                ice->eeprom.size = 32; /* FIXME: any cards without the correct size? */
+        else if (ice->eeprom.size > 32) {
                 snd_printk("invalid EEPROM (size = %i)\n", ice->eeprom.size);
                 return -EIO;
@@ -2172 +2181 @@
                 /* return -EIO; */
         }
-        for (i = 0; i < ice->eeprom.size; i++)
+        size = ice->eeprom.size - 6;
+        for (i = 0; i < size; i++)
                 ice->eeprom.data[i] = snd_ice1712_read_i2c(ice, dev, i + 6);
 

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

@@ -457 +457 @@
         int (*build_controls)(ice1712_t *);
         int no_mpu401: 1;
+        unsigned int eeprom_size;
+        unsigned char *eeprom_data;
 };
 

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

@@ -43 +43 @@
 #include "amp.h"
 #include "revo.h"
+#include "aureon.h"
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -51 +52 @@
                REVO_DEVICE_DESC
                AMP_AUDIO2000_DEVICE_DESC
+               AUREON_DEVICE_DESC
                 "{VIA,VT1724},"
                 "{ICEnsemble,Generic ICE1724},"
@@ -89 +91 @@
 
 /*
- *  AK4xxx stuff
- */
-
-#include "ak4xxx.c"
-
-/*
  *  Basic I/O
  */
@@ -123 +119 @@
                 if (!(old_cmd & VT1724_AC97_READY))
                         continue;
-                return 0;
-        }
+                return old_cmd;
+        }
+        snd_printd(KERN_ERR "snd_vt1724_ac97_ready: timeout\n");
         return old_cmd;
 }
@@ -134 +131 @@
                 if ((inb(ICEMT1724(ice, AC97_CMD)) & bit) == 0)
                         return 0;
+        snd_printd(KERN_ERR "snd_vt1724_ac97_wait_bit: timeout\n");
         return -EIO;
 }
@@ -145 +143 @@
 
         old_cmd = snd_vt1724_ac97_ready(ice);
+        old_cmd &= ~VT1724_AC97_ID_MASK;
+        old_cmd |= ac97->num;
         outb(reg, ICEMT1724(ice, AC97_INDEX));
         outw(val, ICEMT1724(ice, AC97_DATA));
-        old_cmd &= ~(VT1724_AC97_PBK_VSR | VT1724_AC97_CAP_VSR);
         outb(old_cmd | VT1724_AC97_WRITE, ICEMT1724(ice, AC97_CMD));
         snd_vt1724_ac97_wait_bit(ice, VT1724_AC97_WRITE);
@@ -158 +157 @@
 
         old_cmd = snd_vt1724_ac97_ready(ice);
+        old_cmd &= ~VT1724_AC97_ID_MASK;
+        old_cmd |= ac97->num;
         outb(reg, ICEMT1724(ice, AC97_INDEX));
         outb(old_cmd | VT1724_AC97_READ, ICEMT1724(ice, AC97_CMD));
@@ -174 +175 @@
 {
         outl(data, ICEREG1724(ice, GPIO_DIRECTION));
+        inw(ICEREG1724(ice, GPIO_DIRECTION)); /* dummy read for pci-posting */
 }
 
@@ -181 +183 @@
         outw(data, ICEREG1724(ice, GPIO_WRITE_MASK));
         outb((data >> 16) & 0xff, ICEREG1724(ice, GPIO_WRITE_MASK_22));
+        inw(ICEREG1724(ice, GPIO_WRITE_MASK)); /* dummy read for pci-posting */
 }
 
@@ -187 +190 @@
         outw(data, ICEREG1724(ice, GPIO_DATA));
         outb(data >> 16, ICEREG1724(ice, GPIO_DATA_22));
+        inw(ICEREG1724(ice, GPIO_DATA)); /* dummy read for pci-posting */
 }
 
@@ -417 +421 @@
                 if (val != old) {
                         outb(val, ICEMT1724(ice, I2S_FORMAT));
-                        /* FIXME: is this revo only? */
-                        /* assert PRST# to converters; MT05 bit 7 */
-                        outb(inb(ICEMT1724(ice, AC97_CMD)) | 0x80, ICEMT1724(ice, AC97_CMD));
-                        spin_unlock_irqrestore(&ice->reg_lock, flags);
-                        mdelay(5);
-                        spin_lock_irqsave(&ice->reg_lock, flags);
-                        /* deassert PRST# */
-                        outb(inb(ICEMT1724(ice, AC97_CMD)) & ~0x80, ICEMT1724(ice, AC97_CMD));
+                        if (ice->eeprom.subvendor == VT1724_SUBDEVICE_REVOLUTION71) {
+                                /* FIXME: is this revo only? */
+                                /* assert PRST# to converters; MT05 bit 7 */
+                                outb(inb(ICEMT1724(ice, AC97_CMD)) | 0x80, ICEMT1724(ice, AC97_CMD));
+                                spin_unlock_irqrestore(&ice->reg_lock, flags);
+                                mdelay(5);
+                                spin_lock_irqsave(&ice->reg_lock, flags);
+                                /* deassert PRST# */
+                                outb(inb(ICEMT1724(ice, AC97_CMD)) & ~0x80, ICEMT1724(ice, AC97_CMD));
+                        }
                 }
         }
@@ -885 +891 @@
         if (! (ice->eeprom.data[ICE_EEP2_ACLINK] & VT1724_CFG_PRO_I2S)) {
                 ac97_t ac97;
+                /* cold reset */
+                outb(inb(ICEMT1724(ice, AC97_CMD)) | 0x80, ICEMT1724(ice, AC97_CMD));
+                mdelay(5); /* FIXME */
+                outb(inb(ICEMT1724(ice, AC97_CMD)) & ~0x80, ICEMT1724(ice, AC97_CMD));
+
                 memset(&ac97, 0, sizeof(ac97));
                 ac97.write = snd_vt1724_ac97_write;
@@ -1541 +1552 @@
  */
 
+static struct snd_ice1712_card_info no_matched __devinitdata;
+
+static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
+        snd_vt1724_revo_cards,
+        snd_vt1724_amp_cards, 
+        snd_vt1724_aureon_cards,
+        0,
+};
+
+
+/*
+ */
+
 static unsigned char __devinit snd_vt1724_read_i2c(ice1712_t *ice,
                                                  unsigned char dev,
@@ -1556 +1580 @@
 {
         int dev = 0xa0;         /* EEPROM device address */
-        unsigned int i;
+        unsigned int i, size;
+        struct snd_ice1712_card_info **tbl, *c;
 
         if ((inb(ICEREG1724(ice, I2C_CTRL)) & VT1724_I2C_EEPROM) == 0) {
@@ -1566 +1591 @@
                                 (snd_vt1724_read_i2c(ice, dev, 0x02) << 16) | 
                                 (snd_vt1724_read_i2c(ice, dev, 0x03) << 24);
+
+        /* if the EEPROM is given by the driver, use it */
+        for (tbl = card_tables; *tbl; tbl++) {
+                for (c = *tbl; c->subvendor; c++) {
+                        if (c->subvendor == ice->eeprom.subvendor) {
+                                if (! c->eeprom_size || ! c->eeprom_data)
+                                        goto found;
+                                snd_printdd("using the defined eeprom..\n");
+                                ice->eeprom.version = 2;
+                                ice->eeprom.size = c->eeprom_size + 6;
+                                memcpy(ice->eeprom.data, c->eeprom_data, c->eeprom_size);
+                                goto read_skipped;
+                        }
+                }
+        }
+
+ found:
         ice->eeprom.size = snd_vt1724_read_i2c(ice, dev, 0x04);
-        if (ice->eeprom.size > 32) {
+        if (ice->eeprom.size < 6)
+                ice->eeprom.size = 32;
+        else if (ice->eeprom.size > 32) {
                 snd_printk("invalid EEPROM (size = %i)\n", ice->eeprom.size);
                 return -EIO;
@@ -1576 +1620 @@
                 // return -EIO;
         }
-        for (i = 0; i < ice->eeprom.size; i++)
+        size = ice->eeprom.size - 6;
+        for (i = 0; i < size; i++)
                 ice->eeprom.data[i] = snd_vt1724_read_i2c(ice, dev, i + 6);
 
+ read_skipped:
         ice->eeprom.gpiomask = eeprom_triple(ice, ICE_EEP2_GPIO_MASK);
         ice->eeprom.gpiostate = eeprom_triple(ice, ICE_EEP2_GPIO_STATE);
@@ -1804 +1850 @@
  */
 
-static struct snd_ice1712_card_info no_matched __devinitdata;
-
-static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
-        snd_vt1724_revo_cards,
-        snd_vt1724_amp_cards, 
-        0,
-};
-
-
 static int __devinit snd_vt1724_probe(struct pci_dev *pci,
                                       const struct pci_device_id *pci_id)

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/makefile.os2

@@ -15 +15 @@
 FILE1    = ak4xxx.obj delta.obj ews.obj hoontech.obj ice1712.obj
 FILE2    = ice1724.obj revo.obj
-FILE3    = 
+FILE3    = aureon.obj
 FILE4    = 
 FILE5    = 

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

@@ -60 +60 @@
                 shift = 3;
         }
-        tmp = ak->images[0][reg];
+        tmp = snd_akm4xxx_get(ak, 0, reg);
         old = (tmp >> shift) & 0x03;
         if (old == dfs)
@@ -67 +67 @@
         /* reset DFS */
         snd_akm4xxx_reset(ak, 1);
-        tmp = ak->images[0][reg];
+        tmp = snd_akm4xxx_get(ak, 0, reg);
         tmp &= ~(0x03 << shift);
         tmp |= dfs << shift;
@@ -122 +122 @@
 {
         akm4xxx_t *ak;
+        int err;
 
         /* determine I2C, DACs and ADCs */
@@ -140 +141 @@
         switch (ice->eeprom.subvendor) {
         case VT1724_SUBDEVICE_REVOLUTION71:
-                snd_ice1712_akm4xxx_init(ak, &akm_revo_front, &akm_revo_front_priv, ice);
-                snd_ice1712_akm4xxx_init(ak + 1, &akm_revo_surround, &akm_revo_surround_priv, ice);
+                if ((err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front, &akm_revo_front_priv, ice)) < 0)
+                        return err;
+                if ((err = snd_ice1712_akm4xxx_init(ak + 1, &akm_revo_surround, &akm_revo_surround_priv, ice)) < 0)
+                        return err;
                 /* unmute all codecs */
                 snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE, VT1724_REVO_MUTE);

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

@@ -1145 +1145 @@
 
         if (!doorbellValue)
-                return IRQ_HANDLED;
+                return IRQ_NONE;
 
         spin_lock(&korg1212->lock);
@@ -1219 +1219 @@
 
         spin_unlock(&korg1212->lock);
+
         return IRQ_HANDLED;
 }

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

@@ -44 +44 @@
 #include <sound/control.h>
 #include <sound/pcm.h>
+#include <sound/mpu401.h>
 #include <sound/ac97_codec.h>
 #define SNDRV_GET_ID
@@ -1055 +1056 @@
  */
 
+#define big_mdelay(msec) do {\
+        set_current_state(TASK_UNINTERRUPTIBLE);\
+        schedule_timeout(((msec) * HZ) / 1000);\
+} while (0)
+        
 inline static void snd_m3_outw(m3_t *chip, u16 value, unsigned long reg)
 {

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

@@ -807 +807 @@
         switch (mode) {
         case RME96_CLOCKMODE_SLAVE:
+                /* AutoSync */ 
                 rme96->wcreg &= ~RME96_WCR_MASTER;
                 rme96->areg &= ~RME96_AR_WSEL;
                 break;
         case RME96_CLOCKMODE_MASTER:
+                /* Internal */
                 rme96->wcreg |= RME96_WCR_MASTER;
                 rme96->areg &= ~RME96_AR_WSEL;
@@ -1319 +1321 @@
 
         runtime->hw = snd_rme96_capture_adat_info;
-        if (snd_rme96_getinputtype(rme96) != RME96_INPUT_ANALOG) {
+        if (snd_rme96_getinputtype(rme96) == RME96_INPUT_ANALOG) {
                 /* makes no sense to use analog input. Note that analog
                    expension cards AEB4/8-I are RME96_INPUT_INTERNAL */
@@ -1863 +1865 @@
         }
         if (rme96->areg & RME96_AR_WSEL) {
-                snd_iprintf(buffer, "  clock mode: word clock\n");
+                snd_iprintf(buffer, "  sample clock source: word clock\n");
         } else if (rme96->wcreg & RME96_WCR_MASTER) {
-                snd_iprintf(buffer, "  clock mode: master\n");
+                snd_iprintf(buffer, "  sample clock source: internal\n");
         } else if (snd_rme96_getinputtype(rme96) == RME96_INPUT_ANALOG) {
-                snd_iprintf(buffer, "  clock mode: slave (master anyway due to analog input setting)\n");
+                snd_iprintf(buffer, "  sample clock source: autosync (internal anyway due to analog input setting)\n");
         } else if (snd_rme96_capture_getrate(rme96, &n) < 0) {
-                snd_iprintf(buffer, "  clock mode: slave (master anyway due to no valid signal)\n");
+                snd_iprintf(buffer, "  sample clock source: autosync (internal anyway due to no valid signal)\n");
         } else {
-                snd_iprintf(buffer, "  clock mode: slave\n");
+                snd_iprintf(buffer, "  sample clock source: autosync\n");
         }
         if (rme96->wcreg & RME96_WCR_PRO) {
@@ -2102 +2104 @@
 snd_rme96_info_clockmode_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-        static char *texts[3] = { "Slave", "Master", "Wordclock" };
+        static char *texts[3] = { "AutoSync", "Internal", "Word" };
         
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -2425 +2427 @@
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
-        .name =         "Clock Mode",
+        .name =         "Sample Clock Source",
         .info =         snd_rme96_info_clockmode_control, 
         .get =          snd_rme96_get_clockmode_control,

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

@@ -23 +23 @@
 
 #include <sound/driver.h>
+#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -76 +77 @@
 #define MULTIFACE_SS_CHANNELS    18
 #define MULTIFACE_DS_CHANNELS    14
+#define H9652_DS_CHANNELS        26
+#define H9652_SS_CHANNELS        14
 
 /* Write registers. These are defined as byte-offsets from the iobase value.
@@ -85 +88 @@
 #define HDSP_interruptConfirmation      96
 #define HDSP_outputEnable               128
-#define HDSP_jtagReg                    256
+#define HDSP_control2Reg                256
 #define HDSP_midiDataOut0               352
 #define HDSP_midiDataOut1               356
@@ -121 +124 @@
 #define HDSP_IO_EXTENT     5192
 
-/* jtag register bits */
+/* control2 register bits */
 
 #define HDSP_TMS                0x01
@@ -134 +137 @@
 #define HDSP_BIGENDIAN_MODE     0x200
 #define HDSP_RD_MULTIPLE        0x400
+#define HDSP_9652_ENABLE_MIXER  0x800
 
 #define HDSP_S_PROGRAM          (HDSP_PROGRAM|HDSP_CONFIG_MODE_0)
@@ -359 +363 @@
         struct tasklet_struct midi_tasklet;
         int                   precise_ptr;
-        u32                   control_register;          /* cached value */
+        u32                   control_register;      /* cached value */
+        u32                   control2_register;     /* cached value */
         u32                   creg_spdif;
         u32                   creg_spdif_stream;
-        char                 *card_name;                    /* digiface/multiface */
+        char                 *card_name;             /* digiface/multiface */
         HDSP_IO_Type          io_type;               /* ditto, but for code use */
         unsigned short        firmware_rev;
         unsigned short        state;                 /* stores state bits */
         u32                   firmware_cache[24413]; /* this helps recover from accidental iobox power failure */
-        size_t                period_bytes;         /* guess what this is */
+        size_t                period_bytes;          /* guess what this is */
         unsigned char         ds_channels;
         unsigned char         ss_channels;          /* different for multiface/digiface */
@@ -434 +439 @@
 
 #ifdef HDSP_PREALLOCATE_MEMORY
-extern void *snd_hammerfall_get_buffer(struct pci_dev *, dma_addr_t *dmaaddr);
-extern void snd_hammerfall_free_buffer(struct pci_dev *, void *ptr);
+static void *snd_hammerfall_get_buffer(struct pci_dev *pci, size_t size, dma_addr_t *addrp, int capture)
+{
+        struct snd_dma_device pdev;
+        struct snd_dma_buffer dmbuf;
+
+        snd_dma_device_pci(&pdev, pci, capture);
+        dmbuf.bytes = 0;
+        if (! snd_dma_get_reserved(&pdev, &dmbuf)) {
+                if (snd_dma_alloc_pages(&pdev, size, &dmbuf) < 0)
+                        return NULL;
+                snd_dma_set_reserved(&pdev, &dmbuf);
+        }
+        *addrp = dmbuf.addr;
+        return dmbuf.area;
+}
+
+static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr, dma_addr_t addr, int capture)
+{
+        struct snd_dma_device dev;
+        snd_dma_device_pci(&dev, pci, capture);
+        snd_dma_free_reserved(&dev);
+}
+
+#else
+static void *snd_hammerfall_get_buffer(struct pci_dev *pci, size_t size, dma_addr_t *addrp, int capture)
+{
+        return snd_malloc_pci_pages(pci, size, addrp);
+}
+
+static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr, dma_addr_t addr, int capture)
+{
+        snd_free_pci_pages(pci, size, ptr, addr);
+}
 #endif
 
@@ -453 +489 @@
 static int __devinit snd_hdsp_create_alsa_devices(snd_card_t *card, hdsp_t *hdsp);
 static int __devinit snd_hdsp_create_pcm(snd_card_t *card, hdsp_t *hdsp);
-static inline int snd_hdsp_initialize_input_enable (hdsp_t *hdsp);
+static inline int snd_hdsp_enable_io (hdsp_t *hdsp);
 static inline void snd_hdsp_initialize_midi_flush (hdsp_t *hdsp);
 static inline void snd_hdsp_initialize_channels (hdsp_t *hdsp);
@@ -461 +497 @@
 static int snd_hdsp_set_defaults(hdsp_t *hdsp);
 
-static inline int hdsp_is_9652 (hdsp_t *hdsp)
-{
-        switch (hdsp->firmware_rev) {
-        case 0x64:
-        case 0x65:
-        case 0x68:
-                return 1;
-        default:
-                return 0;
-        }
-}
-
 static inline int hdsp_playback_to_output_key (hdsp_t *hdsp, int in, int out)
 {
@@ -505 +529 @@
 static inline int hdsp_check_for_iobox (hdsp_t *hdsp)
 {
+
+        if (hdsp->io_type == H9652) return 0;
         if (hdsp_read (hdsp, HDSP_statusRegister) & HDSP_ConfigError) {
                 snd_printk ("Hammerfall-DSP: no Digiface or Multiface connected!\n");
@@ -511 +537 @@
         }
         return 0;
+
 }
 
@@ -522 +549 @@
                 snd_printk ("loading firmware\n");
 
-                hdsp_write (hdsp, HDSP_jtagReg, HDSP_S_PROGRAM);
+                hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_PROGRAM);
                 hdsp_write (hdsp, HDSP_fifoData, 0);
                 
@@ -530 +557 @@
                 }
                 
-                hdsp_write (hdsp, HDSP_jtagReg, HDSP_S_LOAD);
+                hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_LOAD);
                 
                 for (i = 0; i < 24413; ++i) {
@@ -545 +572 @@
                 }
 
-                hdsp_write (hdsp, HDSP_jtagReg, 0);
+#ifdef SNDRV_BIG_ENDIAN
+                hdsp->control2_register = HDSP_BIGENDIAN_MODE;
+#else
+                hdsp->control2_register = 0;
+#endif
+                hdsp_write (hdsp, HDSP_control2Reg, hdsp->control2_register);
                 snd_printk ("finished firmware loading\n");
                 
@@ -575 +607 @@
         }
 
-        if ((err = snd_hdsp_initialize_input_enable(hdsp)) < 0) {
+        if ((err = snd_hdsp_enable_io(hdsp)) < 0) {
                 return err;
         }
@@ -581 +613 @@
         if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
         
-                hdsp_write (hdsp, HDSP_jtagReg, HDSP_PROGRAM);
+                hdsp_write (hdsp, HDSP_control2Reg, HDSP_PROGRAM);
                 hdsp_write (hdsp, HDSP_fifoData, 0);
                 if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) < 0) {
@@ -587 +619 @@
                 }
 
-                hdsp_write (hdsp, HDSP_jtagReg, HDSP_S_LOAD);
+                hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_LOAD);
                 hdsp_write (hdsp, HDSP_fifoData, 0);
 
                 if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT)) {
                         hdsp->io_type = Multiface;
-                        hdsp_write (hdsp, HDSP_jtagReg, HDSP_VERSION_BIT);
-                        hdsp_write (hdsp, HDSP_jtagReg, HDSP_S_LOAD);
+                        hdsp_write (hdsp, HDSP_control2Reg, HDSP_VERSION_BIT);
+                        hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_LOAD);
                         hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT);
                 } else {
@@ -658 +690 @@
         unsigned int ad;
 
-        if (hdsp_is_9652 (hdsp)) {
-
-                if ((ad = addr/2) < 676) {
-
-                        /* from martin björnsen:
-
-                           "You can only write dwords to the
-                           mixer memory which contain two
-                           mixer values in the low and high
-                           word. So if you want to change
-                           value 0 you have to read value 1
-                           from the cache and write both to
-                           the first dword in the mixer
-                           memory."
-                        */
-
-                        hdsp->mixer_matrix[addr] = data;
-                        hdsp_write (hdsp, 1024 + ad, 
-                                    (hdsp->mixer_matrix[(addr&0x7fe)+1] << 16) + 
-                                    hdsp->mixer_matrix[addr&0x7fe]);
-                        return 0;
-                } else {
-                        return -1;
-                }
+        if (addr >= HDSP_MATRIX_MIXER_SIZE)
+                return -1;
                 
+        if (hdsp->io_type == H9652) {
+
+                /* from martin björnsen:
+                   
+                   "You can only write dwords to the
+                   mixer memory which contain two
+                   mixer values in the low and high
+                   word. So if you want to change
+                   value 0 you have to read value 1
+                   from the cache and write both to
+                   the first dword in the mixer
+                   memory."
+                */
+
+                hdsp->mixer_matrix[addr] = data;
+
+                /* `addr' addresses a 16-bit wide address, but
+                   the address space accessed via hdsp_write
+                   uses byte offsets. put another way, addr
+                   varies from 0 to 1351, but to access the
+                   corresponding memory location, we need
+                   to access 0 to 2703 ...
+                */
+
+                hdsp_write (hdsp, 4096 + (addr*2), 
+                            (hdsp->mixer_matrix[(addr&0x7fe)+1] << 16) + 
+                            hdsp->mixer_matrix[addr&0x7fe]);
+                
+                return 0;
 
         } else {
-                if (addr >= HDSP_MATRIX_MIXER_SIZE)
-                        return -1;
-                
+
                 ad = (addr << 16) + data;
                 
@@ -830 +867 @@
         int rate_bits;
 
+        /* ASSUMPTION: hdsp->lock is either help, or
+           there is no need for it (e.g. during module
+           initialization).
+        */
+        
         if (!(hdsp->control_register & HDSP_ClockModeMaster)) { 
                 if (called_internally) {
@@ -861 +903 @@
            is to flag rate changes in the read/write routines.  */
 
-        spin_lock_irq(&hdsp->lock);
-
         switch (rate) {
         case 32000:
@@ -901 +941 @@
                 break;
         default:
-                spin_unlock_irq(&hdsp->lock);
                 return -EINVAL;
         }
@@ -909 +948 @@
                             hdsp->capture_pid,
                             hdsp->playback_pid);
-                spin_unlock_irq(&hdsp->lock);
                 return -EBUSY;
         }
@@ -925 +963 @@
                         break;
                 case Digiface:
+                case H9652:
                         hdsp->channel_map = channel_map_df_ss;
                         break;
@@ -939 +978 @@
         }
 
-        spin_unlock_irq(&hdsp->lock);
         return 0;
 }
@@ -1132 +1170 @@
         hdsp_midi_t *hmidi;
         unsigned long flags;
+        u32 ie;
 
         hmidi = (hdsp_midi_t *) substream->rmidi->private_data;
         hdsp = hmidi->hdsp;
+        ie = hmidi->id ? HDSP_Midi1InterruptEnable : HDSP_Midi0InterruptEnable;
         spin_lock_irqsave (&hdsp->lock, flags);
         if (up) {
-                snd_hdsp_flush_midi_input (hdsp, hmidi->id);
-                if (hmidi->id) 
-                        hdsp->control_register |= HDSP_Midi1InterruptEnable;
-                else 
-                        hdsp->control_register |= HDSP_Midi0InterruptEnable;
+                if (!(hdsp->control_register & ie)) {
+                        snd_hdsp_flush_midi_input (hdsp, hmidi->id);
+                        hdsp->control_register |= ie;
+                }
         } else {
-                if (hmidi->id) 
-                        hdsp->control_register &= ~HDSP_Midi1InterruptEnable;
-                else 
-                        hdsp->control_register &= ~HDSP_Midi0InterruptEnable;
+                hdsp->control_register &= ~ie;
         }
 
@@ -2005 +2041 @@
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = (hdsp->io_type == Digiface) ? 6 : 4;
+
+        switch (hdsp->io_type) {
+        case Digiface:
+        case H9652:
+                uinfo->value.enumerated.items = 6;
+                break;
+        case Multiface:
+                uinfo->value.enumerated.items = 4;
+        default:
+                uinfo->value.enumerated.items = 0;
+                break;
+        }
+                
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
                 uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
@@ -2029 +2077 @@
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
-        max = (hdsp->io_type == Digiface) ? 6 : 4;
+
+        switch (hdsp->io_type) {
+        case Digiface:
+        case H9652:
+                max = 6;
+                break;
+        case Multiface:
+                max = 4;
+                break;
+        default:
+                return -EIO;
+        }
+
         val = ucontrol->value.enumerated.item[0] % max;
         spin_lock_irqsave(&hdsp->lock, flags);
@@ -2497 +2557 @@
 
         offset = ucontrol->id.index - 1;
-        snd_assert(offset >= 0 || offset < ((hdsp->io_type == Digiface) ? 3 : 1), return -EINVAL);
+        snd_assert(offset >= 0);
+
+        switch (hdsp->io_type) {
+        case Digiface:
+        case H9652:
+                if (offset >= 3)
+                        return -EINVAL;
+                break;
+        case Multiface:
+                if (offset >= 1) 
+                        return -EINVAL;
+                break;
+        default:
+                return -EIO;
+        }
+
         ucontrol->value.enumerated.item[0] = hdsp_adat_sync_check(hdsp, offset);
         return 0;
@@ -2594 +2669 @@
 
         for (idx = 0; idx < HDSP_CONTROLS; idx++) {
-                if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_hdsp_controls[idx], hdsp))) < 0)
+                if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_hdsp_controls[idx], hdsp))) < 0) {
                         return err;
+                }
                 if (idx == 1)   /* IEC958 (S/PDIF) Stream */
                         hdsp->spdif_ctl = kctl;
@@ -2603 +2679 @@
         snd_hdsp_adat_sync_check.name = "ADAT Lock Status";
 
-        if (hdsp->io_type == Digiface) {
+        switch (hdsp->io_type) {
+        case Digiface:
                 limit = DIGIFACE_SS_CHANNELS;
-        } else {
+                break;
+        case H9652:
+                limit = H9652_SS_CHANNELS;
+                break;
+        case Multiface:
                 limit = MULTIFACE_SS_CHANNELS;
+                break;
+        default:
+                return -EIO;
         }
         
@@ -2628 +2712 @@
                 return err;
         }       
-        if (hdsp->io_type == Digiface) {
+        if (hdsp->io_type == Digiface || hdsp->io_type == H9652) {
                 for (idx = 1; idx < 3; ++idx) {
                         snd_hdsp_adat_sync_check.index = idx+1;
@@ -2682 +2766 @@
                     hdsp->irq, hdsp->port, hdsp->iobase);
         snd_iprintf(buffer, "Control register: 0x%x\n", hdsp->control_register);
+        snd_iprintf(buffer, "Control2 register: 0x%x\n", hdsp->control2_register);
         snd_iprintf(buffer, "Status register: 0x%x\n", status);
         snd_iprintf(buffer, "Status2 register: 0x%x\n", status2);
@@ -2855 +2940 @@
         switch (hdsp->io_type) {
         case Digiface:
+        case H9652:
                 x = status & HDSP_Sync1;
                 if (status & HDSP_Lock1) {
@@ -2914 +3000 @@
 {
         if (hdsp->capture_buffer_unaligned) {
-#ifndef HDSP_PREALLOCATE_MEMORY
-                snd_free_pci_pages(hdsp->pci,
-                                   HDSP_DMA_AREA_BYTES,
-                                   hdsp->capture_buffer_unaligned,
-                                   hdsp->capture_buffer_addr);
-#else
-                snd_hammerfall_free_buffer(hdsp->pci, hdsp->capture_buffer_unaligned);
-#endif
+                snd_hammerfall_free_buffer(hdsp->pci, HDSP_DMA_AREA_BYTES,
+                                           hdsp->capture_buffer_unaligned,
+                                           hdsp->capture_buffer_addr, 1);
         }
 
         if (hdsp->playback_buffer_unaligned) {
-#ifndef HDSP_PREALLOCATE_MEMORY
-                snd_free_pci_pages(hdsp->pci,
-                                   HDSP_DMA_AREA_BYTES,
-                                   hdsp->playback_buffer_unaligned,
-                                   hdsp->playback_buffer_addr);
-#else
-                snd_hammerfall_free_buffer(hdsp->pci, hdsp->playback_buffer_unaligned);
-#endif
+                snd_hammerfall_free_buffer(hdsp->pci, HDSP_DMA_AREA_BYTES,
+                                           hdsp->playback_buffer_unaligned,
+                                           hdsp->playback_buffer_addr, 0);
         }
 }
@@ -2942 +3018 @@
         unsigned long pb_bus, cb_bus;
 
-#ifndef HDSP_PREALLOCATE_MEMORY
-        cb = snd_malloc_pci_pages(hdsp->pci, HDSP_DMA_AREA_BYTES, &cb_addr);
-        pb = snd_malloc_pci_pages(hdsp->pci, HDSP_DMA_AREA_BYTES, &pb_addr);
-#else
-        cb = snd_hammerfall_get_buffer(hdsp->pci, &cb_addr);
-        pb = snd_hammerfall_get_buffer(hdsp->pci, &pb_addr);
-#endif
+        cb = snd_hammerfall_get_buffer(hdsp->pci, HDSP_DMA_AREA_BYTES, &cb_addr, 1);
+        pb = snd_hammerfall_get_buffer(hdsp->pci, HDSP_DMA_AREA_BYTES, &pb_addr, 0);
 
         if (cb == 0 || pb == 0) {
                 if (cb) {
-#ifdef HDSP_PREALLOCATE_MEMORY
-                        snd_hammerfall_free_buffer(hdsp->pci, cb);
-#else
-                        snd_free_pci_pages(hdsp->pci, HDSP_DMA_AREA_BYTES, cb, cb_addr);
-#endif
+                        snd_hammerfall_free_buffer(hdsp->pci, HDSP_DMA_AREA_BYTES, cb, cb_addr, 1);
                 }
                 if (pb) {
-#ifdef HDSP_PREALLOCATE_MEMORY
-                        snd_hammerfall_free_buffer(hdsp->pci, pb);
-#else
-                        snd_free_pci_pages(hdsp->pci, HDSP_DMA_AREA_BYTES, pb, pb_addr);
-#endif
+                        snd_hammerfall_free_buffer(hdsp->pci, HDSP_DMA_AREA_BYTES, pb, pb_addr, 0);
                 }
 
@@ -3026 +3089 @@
         }
 
-        for (i = 0; i < (hdsp_is_9652(hdsp) ? 1352 : HDSP_MATRIX_MIXER_SIZE); i++) {
+        for (i = 0; i < (hdsp->io_type == H9652 ? 1352 : HDSP_MATRIX_MIXER_SIZE); i++) {
                 if (hdsp_write_gain (hdsp, i, MINUS_INFINITY_GAIN)) {
                         return -EIO;
@@ -3032 +3095 @@
         }
         
-        if (!hdsp_is_9652(hdsp) && line_outs_monitor[hdsp->dev]) {
+        if ((hdsp->io_type != H9652) && line_outs_monitor[hdsp->dev]) {
                 
                 snd_printk ("sending all inputs and playback streams to line outs.\n");
@@ -3292 +3355 @@
          */
 
+        spin_lock_irq(&hdsp->lock);
         if ((err = hdsp_set_rate(hdsp, params_rate(params), 0)) < 0) {
+                spin_unlock_irq(&hdsp->lock);
                 _snd_pcm_hw_param_setempty(params, SNDRV_PCM_HW_PARAM_RATE);
                 return err;
+        } else {
+                spin_unlock_irq(&hdsp->lock);
         }
 
@@ -3784 +3851 @@
                 break;
         case SNDRV_HDSP_IOCTL_GET_VERSION:
-                if (hdsp_is_9652(hdsp)) return -EINVAL;
+                if (hdsp->io_type == H9652) return -EINVAL;
                 if (hdsp->io_type == Undefined) {
                         if ((err = hdsp_get_iobox_version(hdsp)) < 0) {
@@ -3797 +3864 @@
                 break;
         case SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE:
-                if (hdsp_is_9652(hdsp)) return -EINVAL;
+                if (hdsp->io_type == H9652) return -EINVAL;
                 /* SNDRV_HDSP_IOCTL_GET_VERSION must have been called */
                 if (hdsp->io_type == Undefined) return -EINVAL;
@@ -3905 +3972 @@
 }
 
-static inline int snd_hdsp_initialize_input_enable (hdsp_t *hdsp)
+static inline void snd_hdsp_9652_enable_mixer (hdsp_t *hdsp)
+{
+        hdsp->control2_register |= HDSP_9652_ENABLE_MIXER;
+        hdsp_write (hdsp, HDSP_control2Reg, hdsp->control2_register);
+}
+
+static inline void snd_hdsp_9652_disable_mixer (hdsp_t *hdsp)
+{
+        hdsp->control2_register &= ~HDSP_9652_ENABLE_MIXER;
+        hdsp_write (hdsp, HDSP_control2Reg, hdsp->control2_register);
+}
+
+static inline int snd_hdsp_enable_io (hdsp_t *hdsp)
 {
         int i;
@@ -3923 +4002 @@
 static inline void snd_hdsp_initialize_channels(hdsp_t *hdsp)
 {
-        if (hdsp->io_type == Digiface) {
+        switch (hdsp->io_type) {
+        case Digiface:
                 hdsp->card_name = "RME Hammerfall DSP + Digiface";
                 hdsp->ss_channels = DIGIFACE_SS_CHANNELS;
                 hdsp->ds_channels = DIGIFACE_DS_CHANNELS;
-        } else {
+                break;
+
+        case H9652:
+                hdsp->card_name = "RME Hammerfall HDSP 9652";
+                hdsp->ss_channels = H9652_SS_CHANNELS;
+                hdsp->ds_channels = H9652_DS_CHANNELS;
+                break;
+
+        case Multiface:
                 hdsp->card_name = "RME Hammerfall DSP + Multiface";
                 hdsp->ss_channels = MULTIFACE_SS_CHANNELS;
                 hdsp->ds_channels = MULTIFACE_DS_CHANNELS;
+
+        default:
+                /* should never get here */
+                break;
         }
 }
@@ -3938 +4030 @@
         snd_hdsp_flush_midi_input (hdsp, 0);
         snd_hdsp_flush_midi_input (hdsp, 1);
-
-#ifdef SNDRV_BIG_ENDIAN
-        hdsp_write(hdsp, HDSP_jtagReg, HDSP_BIGENDIAN_MODE);
-#endif
 }
 
@@ -4002 +4090 @@
         int err;
         int i;
+        int is_9652 = 0;
 
         hdsp->irq = -1;
@@ -4028 +4117 @@
         strcpy(card->driver, "H-DSP");
         strcpy(card->mixername, "Xilinx FPGA");
-        
+
         switch (hdsp->firmware_rev & 0xff) {
         case 0xa:
@@ -4034 +4123 @@
                 hdsp->card_name = "RME Hammerfall DSP";
                 break;
+
         case 0x64:
         case 0x65:
         case 0x68:
                 hdsp->card_name = "RME HDSP 9652";
-                break;
+                is_9652 = 1;
+                break;
+
         default:
                 return -ENODEV;
         }
 
-        if ((err = pci_enable_device(pci)) < 0)
+        if ((err = pci_enable_device(pci)) < 0) {
                 return err;
+        }
 
         pci_set_master(hdsp->pci);
@@ -4072 +4165 @@
         }
         
-        if (hdsp_is_9652(hdsp)) {
-                
-                if ((err = snd_hdsp_initialize_input_enable(hdsp)) != 0) {
-                        return err;
-                }
-
-                hdsp->io_type = Digiface;               
-        
-                hdsp->ss_channels = DIGIFACE_SS_CHANNELS;
-                hdsp->ds_channels = DIGIFACE_DS_CHANNELS;
-        
-                snd_hdsp_initialize_midi_flush(hdsp);
-        
+        if (!is_9652 && hdsp_check_for_iobox (hdsp)) {
+                /* no iobox connected, we defer initialization */
+                snd_printk("card initialization pending : waiting for firmware\n");
                 if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) {
                         return err;
                 }
-
-        } else {
-        
-                if (hdsp_check_for_iobox (hdsp)) {
-                        /* no iobox connected, we defer initialization */
-                        snd_printk("card initialization pending : waiting for firmware\n");
-                        if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) {
-                                return err;
-                        }
-                        return 0;
-                }
-
-                if ((err = snd_hdsp_initialize_input_enable(hdsp)) != 0) {
-                        return err;
-                }
-                
-                if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
-                        snd_printk("card initialization pending : waiting for firmware\n");
-                        if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) {
-                                return err;
-                        }
                 return 0;
-                } 
-                
-                snd_printk("Firmware already loaded, initializing card.\n");
-
-                if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1) {
-                        hdsp->io_type = Multiface;
-                } else {
-                        hdsp->io_type = Digiface;
-                }
-                
+        }
+        
+        if ((err = snd_hdsp_enable_io(hdsp)) != 0) {
+                return err;
+        }
+        
+        if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
+                snd_printk("card initialization pending : waiting for firmware\n");
                 if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) {
                         return err;
                 }
-                
-                snd_hdsp_initialize_channels(hdsp);
-                
-                snd_hdsp_initialize_midi_flush(hdsp);
-                
-        }
-        
+                return 0;
+        } 
+        
+        snd_printk("Firmware already loaded, initializing card.\n");
+        
+        if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1) {
+                hdsp->io_type = Multiface;
+        } else {
+                hdsp->io_type = Digiface;
+        }
+
+        if (is_9652) {
+                hdsp->io_type = H9652;
+                snd_hdsp_9652_enable_mixer (hdsp);
+        }
+
+        if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) {
+                return err;
+        }
+        
+        snd_hdsp_initialize_channels(hdsp);
+        snd_hdsp_initialize_midi_flush(hdsp);
+
         hdsp->state |= HDSP_FirmwareLoaded;     
-        
+
         if ((err = snd_hdsp_create_alsa_devices(card, hdsp)) < 0) {
                 return err;
         }
-        
+
         return 0;       
 }
@@ -4202 +4278 @@
         sprintf(card->longname, "%s at 0x%lx, irq %d", hdsp->card_name, 
                 hdsp->port, hdsp->irq);
-        
+
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/makefile.os2

@@ -13 +13 @@
 #
 #===================================================================
-FILE1    = hammerfall_mem.obj rme9652.obj hdsp.obj
+FILE1    = rme9652.obj hdsp.obj
 FILE2    = 
 FILE3    = 

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

@@ -310 +310 @@
 
 #ifdef RME9652_PREALLOCATE_MEMORY
-extern void *snd_hammerfall_get_buffer(struct pci_dev *, dma_addr_t *dmaaddr);
-extern void snd_hammerfall_free_buffer(struct pci_dev *, void *ptr);
+static void *snd_hammerfall_get_buffer(struct pci_dev *pci, size_t size, dma_addr_t *addrp, int capture)
+{
+        struct snd_dma_device pdev;
+        struct snd_dma_buffer dmbuf;
+
+        snd_dma_device_pci(&pdev, pci, capture);
+        dmbuf.bytes = 0;
+        if (! snd_dma_get_reserved(&pdev, &dmbuf)) {
+                if (snd_dma_alloc_pages(&pdev, size, &dmbuf) < 0)
+                        return NULL;
+                snd_dma_set_reserved(&pdev, &dmbuf);
+        }
+        *addrp = dmbuf.addr;
+        return dmbuf.area;
+}
+
+static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr, dma_addr_t addr, int capture)
+{
+        struct snd_dma_device dev;
+        snd_dma_device_pci(&dev, pci, capture);
+        snd_dma_free_reserved(&dev);
+}
+
+#else
+static void *snd_hammerfall_get_buffer(struct pci_dev *pci, size_t size, dma_addr_t *addrp, int capture)
+{
+        return snd_malloc_pci_pages(pci, size, addrp);
+}
+
+static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr, dma_addr_t addr, int capture)
+{
+        snd_free_pci_pages(pci, size, ptr, addr);
+}
 #endif
+
 
 static struct pci_device_id snd_rme9652_ids[] __devinitdata = {
@@ -1810 +1842 @@
 {
         if (rme9652->capture_buffer_unaligned) {
-#ifndef RME9652_PREALLOCATE_MEMORY
-                snd_free_pci_pages(rme9652->pci,
-                                   RME9652_DMA_AREA_BYTES,
-                                   rme9652->capture_buffer_unaligned,
-                                   rme9652->capture_buffer_addr);
-#else
-                snd_hammerfall_free_buffer(rme9652->pci, rme9652->capture_buffer_unaligned);
-#endif
+                snd_hammerfall_free_buffer(rme9652->pci, RME9652_DMA_AREA_BYTES,
+                                           rme9652->capture_buffer_unaligned,
+                                           rme9652->capture_buffer_addr, 1);
         }
 
         if (rme9652->playback_buffer_unaligned) {
-#ifndef RME9652_PREALLOCATE_MEMORY
-                snd_free_pci_pages(rme9652->pci,
-                                   RME9652_DMA_AREA_BYTES,
-                                   rme9652->playback_buffer_unaligned,
-                                   rme9652->playback_buffer_addr);
-#else
-                snd_hammerfall_free_buffer(rme9652->pci, rme9652->playback_buffer_unaligned);
-#endif
+                snd_hammerfall_free_buffer(rme9652->pci, RME9652_DMA_AREA_BYTES,
+                                           rme9652->playback_buffer_unaligned,
+                                           rme9652->playback_buffer_addr, 0);
         }
 }
@@ -1855 +1877 @@
         unsigned long pb_bus, cb_bus;
 
-#ifndef RME9652_PREALLOCATE_MEMORY
-        cb = snd_malloc_pci_pages(rme9652->pci, RME9652_DMA_AREA_BYTES, &cb_addr);
-        pb = snd_malloc_pci_pages(rme9652->pci, RME9652_DMA_AREA_BYTES, &pb_addr);
-#else
-        cb = snd_hammerfall_get_buffer(rme9652->pci, &cb_addr);
-        pb = snd_hammerfall_get_buffer(rme9652->pci, &pb_addr);
-#endif
+        cb = snd_hammerfall_get_buffer(rme9652->pci, RME9652_DMA_AREA_BYTES, &cb_addr, 1);
+        pb = snd_hammerfall_get_buffer(rme9652->pci, RME9652_DMA_AREA_BYTES, &pb_addr, 0);
 
         if (cb == 0 || pb == 0) {
                 if (cb) {
-#ifdef RME9652_PREALLOCATE_MEMORY
-                        snd_hammerfall_free_buffer(rme9652->pci, cb);
-#else
-                        snd_free_pci_pages(rme9652->pci, RME9652_DMA_AREA_BYTES, cb, cb_addr);
-#endif
+                        snd_hammerfall_free_buffer(rme9652->pci, RME9652_DMA_AREA_BYTES, cb, cb_addr, 1);
                 }
                 if (pb) {
-#ifdef RME9652_PREALLOCATE_MEMORY
-                        snd_hammerfall_free_buffer(rme9652->pci, pb);
-#else
-                        snd_free_pci_pages(rme9652->pci, RME9652_DMA_AREA_BYTES, pb, pb_addr);
-#endif
+                        snd_hammerfall_free_buffer(rme9652->pci, RME9652_DMA_AREA_BYTES, pb, pb_addr, 0);
                 }
 

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

@@ -260 +260 @@
         snd_kcontrol_t *master_volume;
 
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
         struct gameport gameport;
 #endif
@@ -1194 +1194 @@
 static int snd_sonicvibes_free(sonicvibes_t *sonic)
 {
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
         if (sonic->gameport.io)
                 gameport_unregister_port(&sonic->gameport);
@@ -1498 +1498 @@
                 return err;
         }
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
         sonic->gameport.io = sonic->game_port;
         gameport_register_port(&sonic->gameport);

GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/ymfpci_main.c

@@ -2316 +2316 @@
     init_waitqueue_head(&chip->interrupt_sleep);
     atomic_set(&chip->interrupt_sleep_count, 0);
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+        init_MUTEX(&chip->joystick_mutex);
+#endif
     chip->card = card;
     chip->pci = pci;