diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2002-10-01 02:18:25 -0700 |
|---|---|---|
| committer | Jaroslav Kysela <perex@pnote.perex-int.cz> | 2002-10-01 02:18:25 -0700 |
| commit | cd5738dcf373543ebd3103eb0818fed33f6c7a1f (patch) | |
| tree | 79e4fc7f2b81643132d9fdc0a4f22544a424d962 /include | |
| parent | a270c7b7e8bc137755b67cb8ffd15dd51dd38d0e (diff) | |
[PATCH] ALSA update [11/12] - 2002/09/17
- changed bitmap_member -> DECLARE_BITMAP
- EMU10K1
- added gpr_list_control* variables to emu10k1_fx8010_code_t
- added snd_emu10k1_list_controls for code_peek() and fixes few typos
- ICE1712
- split ice1712 code to several files for better readability
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ac97_codec.h | 3 | ||||
| -rw-r--r-- | include/sound/emu10k1.h | 9 | ||||
| -rw-r--r-- | include/sound/version.h | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 506fd28800b8..8fbddbf6ba49 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -25,6 +25,7 @@ * */ +#include <linux/bitops.h> #include "control.h" #include "info.h" @@ -246,7 +247,7 @@ struct _snd_ac97 { unsigned int spdif_status; unsigned short regs[0x80]; /* register cache */ unsigned int limited_regs; /* allow limited registers only */ - bitmap_member(reg_accessed,0x80); /* bit flags */ + DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */ union { /* vendor specific code */ struct { unsigned short unchained[3]; // 0 = C34, 1 = C79, 2 = C69 diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 3fbded80ec8c..7d6b34144c0d 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1301,15 +1301,24 @@ typedef struct { typedef struct { char name[128]; + unsigned long gpr_valid[0x100/(sizeof(unsigned long)*8)]; /* bitmask of valid initializers */ unsigned int gpr_map[0x100]; /* initializers */ + unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ emu10k1_fx8010_control_gpr_t *gpr_add_controls; /* GPR controls to add/replace */ + unsigned int gpr_del_control_count; /* count of GPR controls to remove */ snd_ctl_elem_id_t *gpr_del_controls; /* IDs of GPR controls to remove */ + + unsigned int gpr_list_control_count; /* count of GPR controls to list */ + unsigned int gpr_list_control_total; /* total count of GPR controls */ + emu10k1_fx8010_control_gpr_t *gpr_list_controls; /* listed GPR controls */ + unsigned long tram_valid[0xa0/(sizeof(unsigned long)*8)]; /* bitmask of valid initializers */ unsigned int tram_data_map[0xa0]; /* data initializers */ unsigned int tram_addr_map[0xa0]; /* map initializers */ + unsigned long code_valid[512/(sizeof(unsigned long)*8)]; /* bitmask of valid instructions */ unsigned int code[512][2]; /* one instruction - 64 bits */ } emu10k1_fx8010_code_t; diff --git a/include/sound/version.h b/include/sound/version.h index 45ad1d97e03a..797d7d71a8bb 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h. Generated automatically by configure. */ #define CONFIG_SND_VERSION "0.9.0rc3" -#define CONFIG_SND_DATE " (Mon Sep 16 18:05:43 2002 UTC)" +#define CONFIG_SND_DATE " (Tue Sep 17 13:46:32 2002 UTC)" |
