Context Navigation

include

Timestamp:

May 31, 2007, 6:45:32 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.0rc1. Builds.

Location:

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

Files:

-              r107
+              r112
 #define need_resched() (current->need_resched)
 #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 5) && !defined TARGET_OS2
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 4) && !defined TARGET_OS2
+#include <linux/fs.h>
 static inline struct proc_dir_entry *PDE(const struct inode *inode)
+{

-              r96
+              r112
 #define MIDI_CTL_MSB_BREATH             0x02
 #define MIDI_CTL_MSB_FOOT               0x04
 #define MIDI_CTL_MSB_PORTNAMENTO_TIME   0x05
+#define MIDI_CTL_MSB_PORTAMENTO_TIME    0x05
 #define MIDI_CTL_MSB_DATA_ENTRY         0x06
 #define MIDI_CTL_MSB_MAIN_VOLUME        0x07
 …
 #define MIDI_CTL_LSB_BREATH             0x22
 #define MIDI_CTL_LSB_FOOT               0x24
 #define MIDI_CTL_LSB_PORTNAMENTO_TIME   0x25
+#define MIDI_CTL_LSB_PORTAMENTO_TIME    0x25
 #define MIDI_CTL_LSB_DATA_ENTRY         0x26
 #define MIDI_CTL_LSB_MAIN_VOLUME        0x27
 …
 #define MIDI_CTL_GENERAL_PURPOSE7       0x52
 #define MIDI_CTL_GENERAL_PURPOSE8       0x53
 #define MIDI_CTL_PORNAMENTO_CONTROL     0x54
+#define MIDI_CTL_PORTAMENTO_CONTROL     0x54
 #define MIDI_CTL_E1_REVERB_DEPTH        0x5b
 #define MIDI_CTL_E2_TREMOLO_DEPTH       0x5c

-              r109
+              r112
 int snd_task_name(struct task_struct *task, char *name, size_t size);
 #ifdef CONFIG_SND_VERBOSE_PRINTK
+int snd_verbose_printk(const char *file, int line, const char *format);
+void snd_verbose_printk(const char *file, int line, const char *format, ...);
+#endif
+#if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK)
+void snd_verbose_printd(const char *file, int line, const char *format, ...);
+#endif
+#if defined(CONFIG_SND_DEBUG) && !defined(CONFIG_SND_VERBOSE_PRINTK)
+void snd_printd(const char *format, ...);
 #endif
 …
 #ifdef CONFIG_SND_VERBOSE_PRINTK
+#define snd_printk(format, args...) do { \
+        printk(snd_verbose_printk(__FILE__, __LINE__, format) ? format + 3 : format, ##args); \
+} while (0)
+#else
+#define snd_printk(format, args...) do { \
+        printk(format, ##args); \
+} while (0)
+#define snd_printk(format, args...) \
+        snd_verbose_printk(__FILE__, __LINE__, format, ##args)
+#else
+#define snd_printk(format, args...) \
+        printk(format, ##args)
 #endif
 …
 #define __ASTRING__(x) #x
+#define snd_printd(format, args...) snd_printk(format, ##args)
+#ifdef CONFIG_SND_VERBOSE_PRINTK
+#define snd_printd(format, args...) \
+        snd_verbose_printd(__FILE__, __LINE__, format, ##args)
+#endif
 #define snd_assert(expr, args...) do {\
         if (!(expr)) {\

-              r109
+              r112
 #endif
-/*
- * Temporary hack, until linux/init.h is fixed.
- */
-#include <linux/init.h>
-#ifndef __devexit_p
-#define __devexit_p(x) x
-#endif
 #endif /* __SOUND_DRIVER_H */

-              r96
+              r112
 #define SNDRV_MINOR_HWDEP               4       /* 4 - 7 */
 #define SNDRV_MINOR_HWDEPS              4
 #define SNDRV_MINOR_RAWMIDI             8       /* 8 - 11 */
 #define SNDRV_MINOR_RAWMIDIS            4
+#define SNDRV_MINOR_RAWMIDI             8       /* 8 - 15 */
+#define SNDRV_MINOR_RAWMIDIS            8
 #define SNDRV_MINOR_PCM_PLAYBACK        16      /* 16 - 23 */
 #define SNDRV_MINOR_PCM_CAPTURE         24      /* 24 - 31 */

r96	r112
22	22	*
23	23	*/
24
25		~~#include <linux/bitops.h>~~
26	24
27	25	extern int snd_pcm_hw_param_mask(snd_pcm_substream_t pcm, snd_pcm_hw_params_t params,

Note: See TracChangeset for help on using the changeset viewer.