diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2003-06-06 15:59:11 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2003-06-06 15:59:11 +0200 |
| commit | 164882b89b46a54690fed6965af6c8982dd88b20 (patch) | |
| tree | f5c28aa4e5e25441ade61b9d3b2f8f477cdf5552 /include | |
| parent | cb4acf11b7dea9799986130b6955d3dc5984956d (diff) | |
ALSA update
- added AZT3328 driver
- added Terratec Aureon support to ICE1724 driver
- fixed possible PCI posting problems
- ENS1370, ENS1371, FM801, ICE1712, ICE1724, VIA82xx
- AC'97 code
- added new IDs
- fixed typo in S/PDIF code
- C-Media related fixes
- USB driver
- added nrpacks module option
- added hack for AudioTrak Optoplay
- removed OLD_USB stuff
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ak4xxx-adda.h | 9 | ||||
| -rw-r--r-- | include/sound/core.h | 2 | ||||
| -rw-r--r-- | include/sound/version.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h index 877aaeb82910..63fc8c703808 100644 --- a/include/sound/ak4xxx-adda.h +++ b/include/sound/ak4xxx-adda.h @@ -37,11 +37,13 @@ struct snd_ak4xxx_ops { void (*set_rate_val)(akm4xxx_t *ak, unsigned int rate); }; +#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 */ void *private_data[AK4XXX_MAX_CHIPS]; /* helper for driver */ @@ -58,4 +60,9 @@ void snd_akm4xxx_reset(akm4xxx_t *ak, int state); void snd_akm4xxx_init(akm4xxx_t *ak); 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 */ diff --git a/include/sound/core.h b/include/sound/core.h index 1315f11767a5..2ffae50c0ebd 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -25,6 +25,7 @@ #include <linux/sched.h> /* wake_up() */ #include <asm/semaphore.h> /* struct semaphore */ #include <linux/rwsem.h> /* struct rw_semaphore */ +#include <linux/workqueue.h> /* struct workqueue_struct */ /* Typedef's */ typedef struct timespec snd_timestamp_t; @@ -158,6 +159,7 @@ struct _snd_card { spinlock_t files_lock; /* lock the files for this card */ int shutdown; /* this card is going down */ wait_queue_head_t shutdown_sleep; + struct work_struct free_workq; /* for free in workqueue */ #ifdef CONFIG_PM int (*set_power_state) (snd_card_t *card, unsigned int state); diff --git a/include/sound/version.h b/include/sound/version.h index 99cccf883bd6..23b5ee37b824 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h. Generated by configure. */ #define CONFIG_SND_VERSION "0.9.4" -#define CONFIG_SND_DATE " (Sat May 31 13:37:06 2003 UTC)" +#define CONFIG_SND_DATE " (Fri Jun 06 09:23:03 2003 UTC)" |