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

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/include/sound

Files:

• ad1848.h (modified) (2 diffs)
• adriver.h (modified) (5 diffs)
• ak4xxx-adda.h (modified) (2 diffs)
• compat_22.h (modified) (1 diff)
• core.h (modified) (4 diffs)
• hdsp.h (modified) (1 diff)
• initval.h (modified) (1 diff)
• mpu401.h (modified) (1 diff)
• ymfpci.h (modified) (1 diff)

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

@@ -121 +121 @@
 #define AD1848_HW_CS4248        0x0003  /* CS4248 chip */
 #define AD1848_HW_CMI8330       0x0004  /* CMI8330 chip */
+#define AD1848_HW_THINKPAD      0x0005  /* Thinkpad 360/750/755 */
+
+/* IBM Thinkpad specific stuff */
+#define AD1848_THINKPAD_CTL_PORT1               0x15e8
+#define AD1848_THINKPAD_CTL_PORT2               0x15e9
+#define AD1848_THINKPAD_CS4248_ENABLE_BIT       0x02
 
 struct _snd_ad1848 {
@@ -142 +148 @@
         int dma_size;
         int thinkpad_flag;              /* Thinkpad CS4248 needs some extra help */
+        int thinkpad_flag;              /* Thinkpad CS4248 needs some extra help */
+#ifdef CONFIG_PM
+        struct pm_dev *thinkpad_pmstate;
+#endif
 
         spinlock_t reg_lock;

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

@@ -51 +51 @@
 #include <linux/module.h>
 
+#ifdef CONFIG_HAVE_OLD_REQUEST_MODULE
+#include <linux/kmod.h>
+#undef request_module
+void snd_compat_request_module(const char *name, ...);
+#define request_module(name, args...) snd_compat_request_module(name, ##args)
+#endif
+
+#ifndef TARGET_OS2
+#include <linux/compiler.h>
+#endif /* !TARGET_OS2 */
+#ifndef __user
+#define __user
+#endif
+
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
@@ -71 +85 @@
 #include <linux/init.h>
 #include <linux/pm.h>
+#include <asm/page.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 3)
 #define pci_set_dma_mask(pci, mask) pci->dma_mask = mask
@@ -109 +124 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 3)
+#include <linux/sched.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 3) && !defined(need_resched)
 #define need_resched() (current->need_resched)
 #endif
@@ -136 +152 @@
 
 #if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
-#if (defined(CONFIG_ISAPNP_KERNEL) && defined(ALSA_BUILD)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 30) && !defined(ALSA_BUILD))
-#include <linux/isapnp.h>
-#define isapnp_dev pci_dev
-#define isapnp_card pci_bus
-#else
 #ifdef TARGET_OS2
 #include "isapnp.h"
 #else /* !TARGET_OS2 */
 #include <linux/isapnp.h>
-#endif /* TARGET_OS2 */
+#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
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
+#undef CONFIG_PNP
+#endif
 #endif
 
@@ -159 +180 @@
 #endif
 
-/* no vsnprintf yet? */
-/* FIXME: the version number is not sure.. at least it exists already on 2.4.10 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 10) && !TARGET_OS2
-#define snprintf(buf,size,fmt,args...) sprintf(buf,fmt,##args)
-#define vsnprintf(buf,size,fmt,args) vsprintf(buf,fmt,args)
+#if !defined CONFIG_HAVE_STRLCPY && !defined TARGET_OS2
+size_t snd_compat_strlcpy(char *dest, const char *src, size_t size);
+#define strlcpy(dest, src, size) snd_compat_strlcpy(dest, src, size)
+size_t snd_compat_strlcat(char *dest, const char *src, size_t size);
+#define strlcat(dest, src, size) snd_compat_strlcat(dest, src, size)
+#endif
+
+#if !defined CONFIG_HAVE_SNPRINTF && !defined TARGET_OS2
+#include <stdarg.h>
+int snd_compat_snprintf(char * buf, size_t size, const char * fmt, ...);
+int snd_compat_vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
+#define snprintf(buf,size,fmt,args...) snd_compat_snprintf(buf,size,fmt,##args)
+#define vsnprintf(buf,size,fmt,args) snd_compat_vsnprintf(buf,size,fmt,args)
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/include/sound/ak4xxx-adda.h

@@ -38 +38 @@
 };
 
+#define AK4XXX_IMAGE_SIZE       (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
+
 struct snd_akm4xxx {
         snd_card_t *card;
         unsigned int num_adcs;                          /* AK4524 or AK4528 ADCs */
         unsigned int num_dacs;                          /* AK4524 or AK4528 DACs */
-        unsigned char images[AK4XXX_MAX_CHIPS][16];     /* saved register image */
+        unsigned char images[AK4XXX_IMAGE_SIZE];        /* saved register image */
         unsigned char ipga_gain[AK4XXX_MAX_CHIPS][2];   /* saved register image for IPGA (AK4528) */
         unsigned long private_value[AK4XXX_MAX_CHIPS];  /* helper for driver */
@@ -59 +61 @@
 int snd_akm4xxx_build_controls(akm4xxx_t *ak);
 
+#define snd_akm4xxx_get(ak,chip,reg) (ak)->images[(chip) * 16 + (reg)]
+#define snd_akm4xxx_set(ak,chip,reg,val) ((ak)->images[(chip) * 16 + (reg)] = (val))
+#define snd_akm4xxx_get_ipga(ak,chip,reg) (ak)->ipga_gain[chip][(reg)-4]
+#define snd_akm4xxx_set_ipga(ak,chip,reg,val) ((ak)->ipga_gain[chip][(reg)-4] = (val))
+
 #endif /* __SOUND_AK4XXX_ADDA_H */

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

@@ -90 +90 @@
 
 /* Some distributions use modified kill_fasync */
+#ifdef CONFIG_OLD_KILL_FASYNC
 #include <linux/fs.h>
 #undef kill_fasync
 #define kill_fasync(fp, sig, band) snd_wrapper_kill_fasync(fp, sig, band)
 void snd_wrapper_kill_fasync(struct fasync_struct **, int, int);
+#endif
 
 /* this is identical with tq_struct but the "routine" field is renamed to "func" */

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

@@ -25 +25 @@
 #include <linux/sched.h>                /* wake_up() */
 #include <asm/semaphore.h>
-#ifndef TARGET_OS2 //TODO: implement linux/rwsem.h
+#ifndef TARGET_OS2 //TODO: implement linux/rwsem.h, workqueue.h
 #include <linux/rwsem.h>                /* struct rw_semaphore */
+#include <linux/workqueue.h>            /* struct workqueue_struct */
 #endif /* !TARGET_OS2 */
 #include <sound/typedefs.h>
@@ -213 +214 @@
         int device;                     /* device number */
         const char *comment;            /* for /proc/asound/devices */
-        snd_info_entry_t *dev;          /* for /proc/asound/dev */
         struct file_operations *f_ops;  /* file operations */
         char name[1];
@@ -241 +241 @@
 
 #ifdef CONFIG_SND_OSSEMUL
-
 int snd_minor_info_oss_init(void);
 int snd_minor_info_oss_done(void);
-
 int snd_oss_init_module(void);
-
+#else
+#define snd_minor_info_oss_init() /*NOP*/
+#define snd_minor_info_oss_done() /*NOP*/
+#define snd_oss_init_module() /*NOP*/
 #endif
 
@@ -269 +270 @@
 #define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)
 #else
+#define snd_memory_init() /*NOP*/
+#define snd_memory_done() /*NOP*/
+#define snd_memory_info_init() /*NOP*/
+#define snd_memory_info_done() /*NOP*/
 #define kmalloc_nocheck(size, flags) kmalloc(size, flags)
 #define vmalloc_nocheck(size) vmalloc(size)

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

@@ -25 +25 @@
         Digiface,
         Multiface,
+        H9652,
         Undefined,
 } HDSP_IO_Type;

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

@@ -87 +87 @@
 #define SNDRV_DEFAULT_ENABLE    { 1, [1 ... (SNDRV_CARDS-1)] = 0 }
 #define SNDRV_DEFAULT_ENABLE_PNP { [0 ... (SNDRV_CARDS-1)] = 1 }
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 #define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
 #else

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

@@ -92 +92 @@
         spinlock_t timer_lock;
         
+        atomic_t rx_loop;
+        atomic_t tx_loop;
+
         struct timer_list timer;
 

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

@@ -26 +26 @@
 #include "rawmidi.h"
 #include "ac97_codec.h"
+#ifndef TARGET_OS2 //TODO: Implement linux/gameport.h
+#include <linux/gameport.h>
+#endif /* !TARGET_OS2 */
 
 #ifndef PCI_VENDOR_ID_YAMAHA