mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-23 21:19:04 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
This commit is contained in:
Linus Torvalds
commit
8f0cb147b2
165 changed files with 3682 additions and 3019 deletions
|
|
@ -387,15 +387,6 @@
|
|||
#define AC97_RATES_MIC_ADC 4
|
||||
#define AC97_RATES_SPDIF 5
|
||||
|
||||
/* shared controllers */
|
||||
enum {
|
||||
AC97_SHARED_TYPE_NONE,
|
||||
AC97_SHARED_TYPE_ICH,
|
||||
AC97_SHARED_TYPE_ATIIXP,
|
||||
AC97_SHARED_TYPE_VIA,
|
||||
AC97_SHARED_TYPES
|
||||
};
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
|
@ -468,7 +459,6 @@ struct _snd_ac97_bus {
|
|||
unsigned short used_slots[2][4]; /* actually used PCM slots */
|
||||
unsigned short pcms_count; /* count of PCMs */
|
||||
struct ac97_pcm *pcms;
|
||||
unsigned int shared_type; /* type of shared controller betwen audio and modem */
|
||||
ac97_t *codec[4];
|
||||
snd_info_entry_t *proc;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <linux/pm.h> /* pm_message_t */
|
||||
|
||||
/* Typedef's */
|
||||
typedef struct timespec snd_timestamp_t;
|
||||
typedef struct sndrv_interval snd_interval_t;
|
||||
typedef enum sndrv_card_type snd_card_type;
|
||||
typedef struct sndrv_xferi snd_xferi_t;
|
||||
|
|
@ -256,6 +255,7 @@ typedef struct _snd_minor snd_minor_t;
|
|||
|
||||
/* sound.c */
|
||||
|
||||
extern int snd_major;
|
||||
extern int snd_ecards_limit;
|
||||
|
||||
void snd_request_card(int card);
|
||||
|
|
@ -285,39 +285,6 @@ int snd_oss_init_module(void);
|
|||
|
||||
/* memory.c */
|
||||
|
||||
#ifdef CONFIG_SND_DEBUG_MEMORY
|
||||
void snd_memory_init(void);
|
||||
void snd_memory_done(void);
|
||||
int snd_memory_info_init(void);
|
||||
int snd_memory_info_done(void);
|
||||
void *snd_hidden_kmalloc(size_t size, gfp_t flags);
|
||||
void *snd_hidden_kzalloc(size_t size, gfp_t flags);
|
||||
void *snd_hidden_kcalloc(size_t n, size_t size, gfp_t flags);
|
||||
void snd_hidden_kfree(const void *obj);
|
||||
void *snd_hidden_vmalloc(unsigned long size);
|
||||
void snd_hidden_vfree(void *obj);
|
||||
char *snd_hidden_kstrdup(const char *s, gfp_t flags);
|
||||
#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)
|
||||
#define kzalloc(size, flags) snd_hidden_kzalloc(size, flags)
|
||||
#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)
|
||||
#define kfree(obj) snd_hidden_kfree(obj)
|
||||
#define vmalloc(size) snd_hidden_vmalloc(size)
|
||||
#define vfree(obj) snd_hidden_vfree(obj)
|
||||
#define kmalloc_nocheck(size, flags) snd_wrapper_kmalloc(size, flags)
|
||||
#define vmalloc_nocheck(size) snd_wrapper_vmalloc(size)
|
||||
#define kfree_nocheck(obj) snd_wrapper_kfree(obj)
|
||||
#define vfree_nocheck(obj) snd_wrapper_vfree(obj)
|
||||
#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)
|
||||
#define kfree_nocheck(obj) kfree(obj)
|
||||
#define vfree_nocheck(obj) vfree(obj)
|
||||
#endif
|
||||
int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
|
||||
int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);
|
||||
|
||||
|
|
@ -373,8 +340,9 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
|
|||
#endif
|
||||
|
||||
/* misc.c */
|
||||
struct resource;
|
||||
void release_and_free_resource(struct resource *res);
|
||||
|
||||
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, ...)
|
||||
__attribute__ ((format (printf, 3, 4)));
|
||||
|
|
@ -429,34 +397,24 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
|
|||
* When CONFIG_SND_DEBUG is not set, the expression is executed but
|
||||
* not checked.
|
||||
*/
|
||||
#define snd_assert(expr, args...) do {\
|
||||
if (unlikely(!(expr))) { \
|
||||
snd_printk(KERN_ERR "BUG? (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
|
||||
args;\
|
||||
}\
|
||||
#define snd_assert(expr, args...) do { \
|
||||
if (unlikely(!(expr))) { \
|
||||
snd_printk(KERN_ERR "BUG? (%s)\n", __ASTRING__(expr)); \
|
||||
dump_stack(); \
|
||||
args; \
|
||||
} \
|
||||
} while (0)
|
||||
/**
|
||||
* snd_runtime_check - run-time assertion macro
|
||||
* @expr: expression
|
||||
* @args...: the action
|
||||
*
|
||||
* This macro checks the expression in run-time and invokes the commands
|
||||
* given in the rest arguments if the assertion is failed.
|
||||
* Unlike snd_assert(), the action commands are executed even if
|
||||
* CONFIG_SND_DEBUG is not set but without any error messages.
|
||||
*/
|
||||
#define snd_runtime_check(expr, args...) do {\
|
||||
if (unlikely(!(expr))) { \
|
||||
snd_printk(KERN_ERR "ERROR (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
|
||||
args;\
|
||||
}\
|
||||
|
||||
#define snd_BUG() do { \
|
||||
snd_printk(KERN_ERR "BUG?\n"); \
|
||||
dump_stack(); \
|
||||
} while (0)
|
||||
|
||||
#else /* !CONFIG_SND_DEBUG */
|
||||
|
||||
#define snd_printd(fmt, args...) /* nothing */
|
||||
#define snd_assert(expr, args...) (void)(expr)
|
||||
#define snd_runtime_check(expr, args...) do { if (!(expr)) { args; } } while (0)
|
||||
#define snd_BUG() /* nothing */
|
||||
|
||||
#endif /* CONFIG_SND_DEBUG */
|
||||
|
||||
|
|
@ -473,30 +431,6 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
|
|||
#define snd_printdd(format, args...) /* nothing */
|
||||
#endif
|
||||
|
||||
#define snd_BUG() snd_assert(0, )
|
||||
|
||||
|
||||
static inline void snd_timestamp_now(struct timespec *tstamp, int timespec)
|
||||
{
|
||||
struct timeval val;
|
||||
/* FIXME: use a linear time source */
|
||||
do_gettimeofday(&val);
|
||||
tstamp->tv_sec = val.tv_sec;
|
||||
tstamp->tv_nsec = val.tv_usec;
|
||||
if (timespec)
|
||||
tstamp->tv_nsec *= 1000L;
|
||||
}
|
||||
|
||||
static inline void snd_timestamp_zero(struct timespec *tstamp)
|
||||
{
|
||||
tstamp->tv_sec = 0;
|
||||
tstamp->tv_nsec = 0;
|
||||
}
|
||||
|
||||
static inline int snd_timestamp_null(struct timespec *tstamp)
|
||||
{
|
||||
return tstamp->tv_sec == 0 && tstamp->tv_nsec == 0;
|
||||
}
|
||||
|
||||
#define SNDRV_OSS_VERSION ((3<<16)|(8<<8)|(1<<4)|(0)) /* 3.8.1a */
|
||||
|
||||
|
|
|
|||
|
|
@ -44,21 +44,4 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
|
||||
/*
|
||||
* ==========================================================================
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_SND_DEBUG_MEMORY
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
void *snd_wrapper_kmalloc(size_t, gfp_t);
|
||||
#undef kmalloc
|
||||
void snd_wrapper_kfree(const void *);
|
||||
#undef kfree
|
||||
void *snd_wrapper_vmalloc(size_t);
|
||||
#undef vmalloc
|
||||
void snd_wrapper_vfree(void *);
|
||||
#undef vfree
|
||||
#endif
|
||||
|
||||
#endif /* __SOUND_DRIVER_H */
|
||||
|
|
|
|||
|
|
@ -48,7 +48,8 @@
|
|||
|
||||
/* FIXME? - according to the OSS driver the EMU10K1 needs a 29 bit DMA mask */
|
||||
#define EMU10K1_DMA_MASK 0x7fffffffUL /* 31bit */
|
||||
#define AUDIGY_DMA_MASK 0xffffffffUL /* 32bit */
|
||||
#define AUDIGY_DMA_MASK 0x7fffffffUL /* 31bit FIXME - 32 should work? */
|
||||
/* See ALSA bug #1276 - rlrevell */
|
||||
|
||||
#define TMEMSIZE 256*1024
|
||||
#define TMEMSIZEREG 4
|
||||
|
|
|
|||
|
|
@ -27,8 +27,9 @@
|
|||
#define SNDRV_MINOR(card, dev) (((card) << 5) | (dev))
|
||||
|
||||
#define SNDRV_MINOR_CONTROL 0 /* 0 - 0 */
|
||||
#define SNDRV_MINOR_SEQUENCER 1
|
||||
#define SNDRV_MINOR_TIMER (1+32)
|
||||
#define SNDRV_MINOR_GLOBAL 1 /* 1 */
|
||||
#define SNDRV_MINOR_SEQUENCER (SNDRV_MINOR_GLOBAL + 0 * 32)
|
||||
#define SNDRV_MINOR_TIMER (SNDRV_MINOR_GLOBAL + 1 * 32)
|
||||
#define SNDRV_MINOR_HWDEP 4 /* 4 - 7 */
|
||||
#define SNDRV_MINOR_HWDEPS 4
|
||||
#define SNDRV_MINOR_RAWMIDI 8 /* 8 - 15 */
|
||||
|
|
@ -39,12 +40,9 @@
|
|||
|
||||
#define SNDRV_DEVICE_TYPE_CONTROL SNDRV_MINOR_CONTROL
|
||||
#define SNDRV_DEVICE_TYPE_HWDEP SNDRV_MINOR_HWDEP
|
||||
#define SNDRV_DEVICE_TYPE_MIXER SNDRV_MINOR_MIXER
|
||||
#define SNDRV_DEVICE_TYPE_RAWMIDI SNDRV_MINOR_RAWMIDI
|
||||
#define SNDRV_DEVICE_TYPE_PCM_PLAYBACK SNDRV_MINOR_PCM_PLAYBACK
|
||||
#define SNDRV_DEVICE_TYPE_PCM_PLOOP SNDRV_MINOR_PCM_PLOOP
|
||||
#define SNDRV_DEVICE_TYPE_PCM_CAPTURE SNDRV_MINOR_PCM_CAPTURE
|
||||
#define SNDRV_DEVICE_TYPE_PCM_CLOOP SNDRV_MINOR_PCM_CLOOP
|
||||
#define SNDRV_DEVICE_TYPE_SEQUENCER SNDRV_MINOR_SEQUENCER
|
||||
#define SNDRV_DEVICE_TYPE_TIMER SNDRV_MINOR_TIMER
|
||||
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ typedef struct {
|
|||
struct _snd_pcm_runtime {
|
||||
/* -- Status -- */
|
||||
snd_pcm_substream_t *trigger_master;
|
||||
snd_timestamp_t trigger_tstamp; /* trigger timestamp */
|
||||
struct timespec trigger_tstamp; /* trigger timestamp */
|
||||
int overrange;
|
||||
snd_pcm_uframes_t avail_max;
|
||||
snd_pcm_uframes_t hw_ptr_base; /* Position at buffer restart */
|
||||
|
|
@ -306,7 +306,6 @@ struct _snd_pcm_runtime {
|
|||
unsigned int rate_den;
|
||||
|
||||
/* -- SW params -- */
|
||||
int tstamp_timespec; /* use timeval (0) or timespec (1) */
|
||||
snd_pcm_tstamp_t tstamp_mode; /* mmap timestamp is updated */
|
||||
unsigned int period_step;
|
||||
unsigned int sleep_min; /* min ticks to sleep */
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ struct _snd_timer_hardware {
|
|||
struct _snd_timer {
|
||||
snd_timer_class_t tmr_class;
|
||||
snd_card_t *card;
|
||||
struct module *module;
|
||||
int tmr_device;
|
||||
int tmr_subdevice;
|
||||
char id[64];
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
/* include/version.h. Generated by configure. */
|
||||
#define CONFIG_SND_VERSION "1.0.10rc1"
|
||||
#define CONFIG_SND_DATE " (Mon Sep 12 08:13:09 2005 UTC)"
|
||||
#define CONFIG_SND_VERSION "1.0.10rc3"
|
||||
#define CONFIG_SND_DATE " (Mon Nov 07 13:30:21 2005 UTC)"
|
||||
|
|
|
|||
Loading…
Reference in a new issue