Changeset 278

Timestamp:

Dec 24, 2007, 9:21:51 PM (18 years ago)

Author:

Brendan Oakley

Message:

Merge latest trunk development to alsa-resync branch

Location:

GPL/branches/alsa-resync1/alsa-kernel

Files:

• core/seq/seq_clientmgr.c (modified) (1 diff)
• pci/hda/hda_intel.c (modified) (7 diffs)
• pci/intel8x0.c (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/core/seq/seq_clientmgr.c

@@ -2180 +2180 @@
 }
 
-
-static int snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+//PS++ static int snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static int snd_seq_ioctl(struct inode *inode, struct file *file,  unsigned int cmd, unsigned long arg)
 {
         struct snd_seq_client *client = file->private_data;

GPL/branches/alsa-resync1/alsa-kernel/pci/hda/hda_intel.c

@@ -256 +256 @@
 
 struct azx_dev {
-        u32 *bdl;                       /* virtual address of the BDL */
+#ifdef TARGET_OS2
+        volatile u32 *bdl;                      /* virtual address of the BDL */
         dma_addr_t bdl_addr;            /* physical address of the BDL */
-        u32 *posbuf;                    /* position buffer pointer */
+        volatile u32 *posbuf;                   /* position buffer pointer */
+#else
+        u32 *bdl;               /* virtual address of the BDL */
+        dma_addr_t bdl_addr;    /* physical address of the BDL */
+        u32 *posbuf;            /* position buffer pointer */
+#endif
 
         unsigned int bufsize;           /* size of the play buffer in bytes */
@@ -265 +271 @@
         unsigned int fifo_size;         /* FIFO size */
 
-        void __iomem *sd_addr;          /* stream descriptor pointer */
+#ifdef TARGET_OS2
+        volatile void __iomem *sd_addr;         /* stream descriptor pointer */
+#else /* !TARGET_OS2 */
+        void __iomem *sd_addr;  /* stream descriptor pointer */
+#endif /* !TARGET_OS2 */
 
         u32 sd_int_sta_mask;            /* stream int status mask */
@@ -283 +293 @@
 /* CORB/RIRB */
 struct azx_rb {
-        u32 *buf;               /* CORB/RIRB buffer
+        volatile u32 *buf;      /* CORB/RIRB buffer
                                  * Each CORB entry is 4byte, RIRB is 8byte
                                  */
@@ -307 +317 @@
         /* pci resources */
         unsigned long addr;
+#ifdef TARGET_OS2
+        volatile void __iomem *remap_addr;
+#else /* !TARGET_OS2 */
         void __iomem *remap_addr;
+#endif /* !TARGET_OS2 */
         int irq;
 
@@ -880 +894 @@
 static void azx_setup_periods(struct azx_dev *azx_dev)
 {
+#ifdef TARGET_OS2
+        volatile u32 *bdl = azx_dev->bdl;
+#else /* !TARGET_OS2 */
         u32 *bdl = azx_dev->bdl;
+#endif /* !TARGET_OS2 */
         dma_addr_t dma_addr = azx_dev->substream->runtime->dma_addr;
         int idx;
@@ -1196 +1214 @@
             cmd == SNDRV_PCM_TRIGGER_SUSPEND ||
             cmd == SNDRV_PCM_TRIGGER_STOP) {
+#ifndef TARGET_OS2
                 int timeout = 5000;
+#else /* TARGET_OS2 */
+                int timeout = 100000;
+#endif /* TARGET_OS2 */
                 while (azx_sd_readb(azx_dev, SD_CTL) & SD_CTL_DMA_START && --timeout)
                         ;
@@ -1482 +1504 @@
                 pci_disable_msi(chip->pci);
         if (chip->remap_addr)
+#ifdef TARGET_OS2
+                iounmap((void *)chip->remap_addr);
+#else /* !TARGET_OS2 */
                 iounmap(chip->remap_addr);
+#endif /* !TARGET_OS2 */
 
         if (chip->bdl.area)

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

@@ -2659 +2659 @@
     iputbyte(chip, port + ICH_REG_OFF_CR, ICH_RESETREGS);
     spin_unlock_irq(&chip->reg_lock);
-#if 0
+
     t = stop_time.tv_sec - start_time.tv_sec;
     t *= 1000000;
     t += stop_time.tv_usec - start_time.tv_usec;
-#else
-    t = 50000; /* patch, suggested by r.ihle */
-#endif
     printk(KERN_INFO "%s: measured %lu usecs\n", __FUNCTION__, t);
     if (t == 0) {