xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ALSA] Remove xxx_t typedefs: Mixer OSS-emulation

Browse Source 
Modules: ALSA<-OSS emulation

Remove xxx_t typedefs from the core mixer OSS-emulation codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2005-11-17 14:01:22 +01:00
committed by Jaroslav Kysela
parent 174c1f65e5
commit f956b4a3ae
2 changed files with 148 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
include/sound/mixer_oss.h
View File

@@ -24,51 +24,53 @@
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
typedef struct _snd_oss_mixer_slot snd_mixer_oss_slot_t;
typedef struct _snd_oss_file snd_mixer_oss_file_t;
typedef int (*snd_mixer_oss_get_volume_t)(snd_mixer_oss_file_t *fmixer, snd_mixer_oss_slot_t *chn, int *left, int *right);
typedef int (*snd_mixer_oss_put_volume_t)(snd_mixer_oss_file_t *fmixer, snd_mixer_oss_slot_t *chn, int left, int right);
typedef int (*snd_mixer_oss_get_recsrc_t)(snd_mixer_oss_file_t *fmixer, snd_mixer_oss_slot_t *chn, int *active);
typedef int (*snd_mixer_oss_put_recsrc_t)(snd_mixer_oss_file_t *fmixer, snd_mixer_oss_slot_t *chn, int active);
typedef int (*snd_mixer_oss_get_recsrce_t)(snd_mixer_oss_file_t *fmixer, unsigned int *active_index);
typedef int (*snd_mixer_oss_put_recsrce_t)(snd_mixer_oss_file_t *fmixer, unsigned int active_index);
#define SNDRV_OSS_MAX_MIXERS 32
struct _snd_oss_mixer_slot {
struct snd_mixer_oss_file;
struct snd_mixer_oss_slot {
int number;
unsigned int stereo: 1;
snd_mixer_oss_get_volume_t get_volume;
snd_mixer_oss_put_volume_t put_volume;
snd_mixer_oss_get_recsrc_t get_recsrc;
snd_mixer_oss_put_recsrc_t put_recsrc;
int (*get_volume)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int *left, int *right);
int (*put_volume)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int left, int right);
int (*get_recsrc)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int *active);
int (*put_recsrc)(struct snd_mixer_oss_file *fmixer,
struct snd_mixer_oss_slot *chn,
int active);
unsigned long private_value;
void *private_data;
void (*private_free)(snd_mixer_oss_slot_t *slot);
void (*private_free)(struct snd_mixer_oss_slot *slot);
int volume[2];
};
struct _snd_oss_mixer {
snd_card_t *card;
struct snd_mixer_oss {
struct snd_card *card;
char id[16];
char name[32];
snd_mixer_oss_slot_t slots[SNDRV_OSS_MAX_MIXERS]; /* OSS mixer slots */
struct snd_mixer_oss_slot slots[SNDRV_OSS_MAX_MIXERS]; /* OSS mixer slots */
unsigned int mask_recsrc; /* exclusive recsrc mask */
snd_mixer_oss_get_recsrce_t get_recsrc;
snd_mixer_oss_put_recsrce_t put_recsrc;
int (*get_recsrc)(struct snd_mixer_oss_file *fmixer,
unsigned int *active_index);
int (*put_recsrc)(struct snd_mixer_oss_file *fmixer,
unsigned int active_index);
void *private_data_recsrc;
void (*private_free_recsrc)(snd_mixer_oss_t *mixer);
void (*private_free_recsrc)(struct snd_mixer_oss *mixer);
struct semaphore reg_mutex;
snd_info_entry_t *proc_entry;
struct snd_info_entry *proc_entry;
int oss_dev_alloc;
/* --- */
int oss_recsrc;
};
struct _snd_oss_file {
snd_card_t *card;
snd_mixer_oss_t *mixer;
struct snd_mixer_oss_file {
struct snd_card *card;
struct snd_mixer_oss *mixer;
};
#endif /* CONFIG_SND_MIXER_OSS */