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

Timestamp:

Oct 15, 2007, 1:51:34 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.6

Location:

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

Files:

• ice1712/ak4xxx.c (modified) (3 diffs)
• ice1712/ice1712.h (modified) (2 diffs)
• ice1712/ice1724.c (modified) (1 diff)
• intel8x0.c (modified) (1 diff)
• korg1212/korg1212.c (modified) (3 diffs)
• rme9652/hdsp.c (modified) (3 diffs)

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

@@ -123 +123 @@
  * initialize the akm4xxx_t record with the template
  */
-int __devinit snd_ice1712_akm4xxx_init(akm4xxx_t *ak, const akm4xxx_t *temp,
-                                       const struct snd_ak4xxx_private *_priv, ice1712_t *ice)
+int snd_ice1712_akm4xxx_init(akm4xxx_t *ak, const akm4xxx_t *temp,
+                             const struct snd_ak4xxx_private *_priv, ice1712_t *ice)
 {
         struct snd_ak4xxx_private *priv;
@@ -146 +146 @@
 }
 
-void __devexit snd_ice1712_akm4xxx_free(ice1712_t *ice)
+void snd_ice1712_akm4xxx_free(ice1712_t *ice)
 {
         unsigned int akidx;
@@ -162 +162 @@
  * build AK4xxx controls
  */
-int __devinit snd_ice1712_akm4xxx_build_controls(ice1712_t *ice)
+int snd_ice1712_akm4xxx_build_controls(ice1712_t *ice)
 {
         unsigned int akidx;

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

@@ -87 +87 @@
  */
 
-#define ICE1712_IREG_PBK_COUNT_HI       0x00
-#define ICE1712_IREG_PBK_COUNT_LO       0x01
+#define ICE1712_IREG_PBK_COUNT_LO       0x00
+#define ICE1712_IREG_PBK_COUNT_HI       0x01
 #define ICE1712_IREG_PBK_CTRL           0x02
 #define ICE1712_IREG_PBK_LEFT           0x03    /* left volume */
@@ -96 +96 @@
 #define ICE1712_IREG_PBK_RATE_MID       0x07
 #define ICE1712_IREG_PBK_RATE_HI        0x08
-#define ICE1712_IREG_CAP_COUNT_HI       0x10
-#define ICE1712_IREG_CAP_COUNT_LO       0x11
+#define ICE1712_IREG_CAP_COUNT_LO       0x10
+#define ICE1712_IREG_CAP_COUNT_HI       0x11
 #define ICE1712_IREG_CAP_CTRL           0x12
 #define ICE1712_IREG_GPIO_DATA          0x20

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

@@ -1584 +1584 @@
 
         if ((inb(ICEREG1724(ice, I2C_CTRL)) & VT1724_I2C_EEPROM) == 0) {
-                snd_printk("ICE1724 has not detected EEPROM\n");
-                return -EIO;
+                snd_printk(KERN_WARNING "ICE1724 has not detected EEPROM\n");
+                // return -EIO;
         }
         ice->eeprom.subvendor = (snd_vt1724_read_i2c(ice, dev, 0x00) << 0) |

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

@@ -1162 +1162 @@
         static unsigned int i, rates[] = {
                 /* ATTENTION: these values depend on the definition in pcm.h! */
-                5512, 8000, 11025, 16000, 22050, 32000, 44100, 480000
+                5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000
         };
     int err;

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

@@ -2071 +2071 @@
         snd_iprintf(buffer, " (index #%d)\n", korg1212->card->number + 1);
         snd_iprintf(buffer, "\nGeneral settings\n");
-        snd_iprintf(buffer, "    period size: %d bytes\n", K1212_PERIOD_BYTES);
+        snd_iprintf(buffer, "    period size: %Zd bytes\n", K1212_PERIOD_BYTES);
         snd_iprintf(buffer, "     clock mode: %s\n", clockSourceName[korg1212->clkSrcRate] );
         snd_iprintf(buffer, "  left ADC Sens: %d\n", korg1212->leftADCInSens );
@@ -2337 +2337 @@
 
         if (korg1212->sharedBufferPtr == NULL) {
-                snd_printk(KERN_ERR "can not allocate shared buffer memory (%d bytes)\n", sizeof(KorgSharedBuffer));
+                snd_printk(KERN_ERR "can not allocate shared buffer memory (%Zd bytes)\n", sizeof(KorgSharedBuffer));
                 return -ENOMEM;
         }
@@ -2386 +2386 @@
         korg1212->dspCodeSize = sizeof (dspCode);
 
-        korg1212->VolumeTablePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->volumeData;
-        korg1212->RoutingTablePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->routeData;
-        korg1212->AdatTimeCodePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->AdatTimeCode;
+        korg1212->VolumeTablePhy = korg1212->sharedBufferPhy +
+                offsetof(KorgSharedBuffer, volumeData);
+        korg1212->RoutingTablePhy = korg1212->sharedBufferPhy +
+                offsetof(KorgSharedBuffer, routeData);
+        korg1212->AdatTimeCodePhy = korg1212->sharedBufferPhy +
+                offsetof(KorgSharedBuffer, AdatTimeCode);
 
         korg1212->dspMemPtr = snd_malloc_pci_pages(korg1212->pci, korg1212->dspCodeSize, &phys_addr);

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

@@ -78 +78 @@
 #define MULTIFACE_SS_CHANNELS    18
 #define MULTIFACE_DS_CHANNELS    14
-#define H9652_DS_CHANNELS        26
-#define H9652_SS_CHANNELS        14
+#define H9652_SS_CHANNELS        26
+#define H9652_DS_CHANNELS        14
 
 /* Write registers. These are defined as byte-offsets from the iobase value.
@@ -645 +645 @@
 static inline int hdsp_check_for_firmware (hdsp_t *hdsp)
 {
+        if (hdsp->io_type == H9652) return 0;
         if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
                 snd_printk("firmware not present.\n");
@@ -3802 +3803 @@
         switch (cmd) {
         case SNDRV_HDSP_IOCTL_GET_PEAK_RMS:
+                if (hdsp->io_type == H9652) {
+                    snd_printk("hardware metering isn't supported yet for hdsp9652 cards\n");
+                    return -EINVAL;
+                }
                 if (!(hdsp->state & HDSP_FirmwareLoaded)) {
                         snd_printk("firmware needs to be uploaded to the card.\n");