Changeset 290 for GPL/branches/alsa-resync1/alsa-kernel/include

Timestamp:

Feb 16, 2008, 7:40:20 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.2

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• adriver.h (modified) (4 diffs)
• compat_22.h (modified) (1 diff)
• config.h (modified) (1 diff)
• core.h (modified) (2 diffs)
• emu8000.h (modified) (1 diff)
• pcm.h (modified) (1 diff)
• version.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/adriver.h

@@ -87 +87 @@
 #include <asm/page.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 3)
-#define pci_set_dma_mask(pci, mask) pci->dma_mask = mask
+#define pci_set_dma_mask(pci, mask) (pci->dma_mask = mask, 0)
 #endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7)
@@ -157 +157 @@
 #endif
 
-#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
-#ifdef TARGET_OS2
-#include "isapnp.h"
-#else /* !TARGET_OS2 */
-#include <linux/isapnp.h>
-#endif /* !TARGET_OS2 */
-#ifndef CONFIG_PNP
-#define CONFIG_PNP
-#endif
-#if (defined(CONFIG_ISAPNP_KERNEL) && defined(ALSA_BUILD)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 30) && !defined(ALSA_BUILD))
-#define isapnp_dev pci_dev
-#define isapnp_card pci_bus
-#endif
-#undef __ISAPNP__
-#define __ISAPNP__
-#else
+/* isapnp support for 2.2 kernels */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
+#undef CONFIG_ISAPNP
+#ifdef CONFIG_SND_ISAPNP
+#define CONFIG_ISAPNP
+#endif
+#endif
+
+/* support of pnp compatible layer for 2.2/2.4 kernels */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
 #undef CONFIG_PNP
+#ifdef CONFIG_SND_PNP
+#define CONFIG_PNP
 #endif
 #endif
@@ -288 +283 @@
 
 #ifndef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
-#define pci_set_consistent_dma_mask(p,x) pci_set_dma_mask(p,x)
+#define pci_set_consistent_dma_mask(p,x) 0 /* success */
+#endif
+
+/* sysfs */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
+struct class_simple;
+static inline void class_simple_device_add(struct class_simple *class, int devnum, ...) { return; }
+static inline void class_simple_device_remove(int devnum) { return; }
 #endif
 
@@ -298 +300 @@
 #define ssleep(x) msleep((unsigned int)(x) * 1000)
 #endif
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#define snd_card_set_dev(card,dev) /* no struct device */
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/include/sound/compat_22.h

@@ -506 +506 @@
         { restore_flags(flags); }
 
-#ifndef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
-#define pci_set_consistent_dma_mask(p,x) pci_set_dma_mask(p,x)
-#endif
-
 struct completion {
         unsigned int done;

GPL/branches/alsa-resync1/alsa-kernel/include/sound/config.h

@@ -175 +175 @@
 #endif
 
-#ifndef snd_card_set_dev
-#define snd_card_set_dev(card,devptr) ((card)->dev = (devptr))
-#endif
-
 /* for easier backward-porting */
 #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/core.h

@@ -310 +310 @@
 int snd_card_file_remove(struct snd_card *card, struct file *file);
 
+#ifndef snd_card_set_dev
+#define snd_card_set_dev(card,devptr) ((card)->dev = (devptr))
+#endif
+
 /* device.c */
 
@@ -333 +337 @@
 int snd_task_name(struct task_struct *task, char *name, size_t size);
 #ifdef CONFIG_SND_VERBOSE_PRINTK
-void snd_verbose_printk(const char *file, int line, const char *format, ...);
+void snd_verbose_printk(const char *file, int line, const char *format, ...)
+     __attribute__ ((format (printf, 3, 4)));
 #endif
 #if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK)
-void snd_verbose_printd(const char *file, int line, const char *format, ...);
+void snd_verbose_printd(const char *file, int line, const char *format, ...)
+     __attribute__ ((format (printf, 3, 4)));
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/include/sound/emu8000.h

@@ -114 +114 @@
 void snd_emu8000_update_reverb_mode(emu8000_t *emu);
 void snd_emu8000_update_equalizer(emu8000_t *emu);
-int snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void *buf, long len);
-int snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void *buf, long len);
+int snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void __user *buf, long len);
+int snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void __user *buf, long len);
 
 #endif /* __SOUND_EMU8000_H */

GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm.h

@@ -411 +411 @@
         struct snd_info_entry *proc_xrun_debug_entry;
 #endif
+#ifdef CONFIG_SND_DEBUG
+        unsigned int xrun_debug: 1;
+        snd_info_entry_t *proc_xrun_debug_entry;
+#endif
 };
 

GPL/branches/alsa-resync1/alsa-kernel/include/sound/version.h

@@ -1 +1 @@
 /* include/version.h.  Generated by configure.  */
-#define CONFIG_SND_VERSION "1.0.1"
+#define CONFIG_SND_VERSION "1.0.2"
 #define CONFIG_SND_DATE ""