Ignore:
Timestamp:
Dec 11, 2005, 5:57:39 PM (20 years ago)
Author:
vladest
Message:

Latest update from ALSA. some intial > 15 interrupts support

File:
1 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/alsa-kernel/pci/emu10k1/emumixer.c

    r33 r34  
    4646                                 snd_ctl_elem_value_t * ucontrol)
    4747{
    48     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     48    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    4949    unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
    5050    unsigned long flags;
    … …  
    8585                                            snd_ctl_elem_value_t * ucontrol)
    8686{
    87     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     87    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    8888    unsigned int tmp;
    8989    unsigned long flags;
    … …  
    112112                                            snd_ctl_elem_value_t * ucontrol)
    113113{
    114     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     114    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    115115    int change;
    116116    unsigned int reg, val, tmp;
    … …  
    157157                                 snd_ctl_elem_value_t * ucontrol)
    158158{
    159     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     159    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    160160    unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
    161161    int change;
    … …  
    195195};
    196196
    197 static void update_emu10k1_fxrt(emu10k1_t *emu, int voice, unsigned char *route)
     197static void update_emu10k1_fxrt(struct snd_emu10k1 *emu, int voice, unsigned char *route)
    198198{
    199199    if (emu->audigy) {
    … …  
    208208}
    209209
    210 static void update_emu10k1_send_volume(emu10k1_t *emu, int voice, unsigned char *volume)
     210static void update_emu10k1_send_volume(struct snd_emu10k1 *emu, int voice, unsigned char *volume)
    211211{
    212212    snd_emu10k1_ptr_write(emu, PTRX_FXSENDAMOUNT_A, voice, volume[0]);
    … …  
    227227static int snd_emu10k1_send_routing_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
    228228{
    229     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     229    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    230230    uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
    231231    uinfo->count = emu->audigy ? 3*8 : 3*4;
    … …  
    239239{
    240240    unsigned long flags;
    241     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    242     emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     241    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     242    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    243243    int voice, idx;
    244244    int num_efx = emu->audigy ? 8 : 4;
    … …  
    258258{
    259259    unsigned long flags;
    260     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    261     emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     260    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     261    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    262262    int change = 0, voice, idx, val;
    263263    int num_efx = emu->audigy ? 8 : 4;
    … …  
    300300static int snd_emu10k1_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
    301301{
    302     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     302    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    303303    uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
    304304    uinfo->count = emu->audigy ? 3*8 : 3*4;
    … …  
    312312{
    313313    unsigned long flags;
    314     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    315     emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     314    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     315    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    316316    int idx;
    317317    int num_efx = emu->audigy ? 8 : 4;
    … …  
    328328{
    329329    unsigned long flags;
    330     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    331     emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     330    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     331    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    332332    int change = 0, idx, val;
    333333    int num_efx = emu->audigy ? 8 : 4;
    … …  
    378378                                snd_ctl_elem_value_t * ucontrol)
    379379{
    380     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    381     emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     380    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     381    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    382382    unsigned long flags;
    383383    int idx;
    … …  
    394394{
    395395    unsigned long flags;
    396     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    397     emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     396    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     397    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    398398    int change = 0, idx, val;
    399399
    … …  
    432432static int snd_emu10k1_efx_send_routing_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
    433433{
    434     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     434    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    435435    uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
    436436    uinfo->count = emu->audigy ? 8 : 4;
    … …  
    444444{
    445445    unsigned long flags;
    446     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    447     emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     446    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     447    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    448448    int idx;
    449449    int num_efx = emu->audigy ? 8 : 4;
    … …  
    462462{
    463463    unsigned long flags;
    464     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     464    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    465465    int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
    466     emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[ch];
     466    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[ch];
    467467    int change = 0, idx, val;
    468468    int num_efx = emu->audigy ? 8 : 4;
    … …  
    500500static int snd_emu10k1_efx_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
    501501{
    502     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     502    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    503503    uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
    504504    uinfo->count = emu->audigy ? 8 : 4;
    … …  
    512512{
    513513    unsigned long flags;
    514     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    515     emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     514    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     515    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    516516    int idx;
    517517    int num_efx = emu->audigy ? 8 : 4;
    … …  
    528528{
    529529    unsigned long flags;
    530     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     530    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    531531    int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
    532     emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[ch];
     532    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[ch];
    533533    int change = 0, idx, val;
    534534    int num_efx = emu->audigy ? 8 : 4;
    … …  
    576576                                    snd_ctl_elem_value_t * ucontrol)
    577577{
    578     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
    579     emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     578    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     579    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
    580580    unsigned long flags;
    581581
    … …  
    590590{
    591591    unsigned long flags;
    592     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     592    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    593593    int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
    594     emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[ch];
     594    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[ch];
    595595    int change = 0, val;
    596596
    … …  
    633633                                        snd_ctl_elem_value_t * ucontrol)
    634634{
    635     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     635    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    636636
    637637    if (emu->audigy)
    … …  
    646646{
    647647    unsigned long flags;
    648     emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
     648    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
    649649    unsigned int reg, val;
    650650    int change = 0;
    … …  
    695695static void snd_emu10k1_mixer_free_ac97(ac97_t *ac97)
    696696{
    697     emu10k1_t *emu = ac97->private_data;
     697    struct snd_emu10k1 *emu = ac97->private_data;
    698698    emu->ac97 = NULL;
    699699}
    … …  
    729729}
    730730
    731 int __devinit snd_emu10k1_mixer(emu10k1_t *emu,
     731int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
    732732                                int pcm_device, int multi_device)
    733733{
    … …  
    881881    /* initialize the routing and volume table for each pcm playback stream */
    882882    for (pcm = 0; pcm < 32; pcm++) {
    883         emu10k1_pcm_mixer_t *mix;
     883        struct snd_emu10k1_pcm_mixer *mix;
    884884        int v;
    885885
    … …  
    901901    /* initialize the routing and volume table for the multichannel playback stream */
    902902    for (pcm = 0; pcm < NUM_EFX_PLAYBACK; pcm++) {
    903         emu10k1_pcm_mixer_t *mix;
     903        struct snd_emu10k1_pcm_mixer *mix;
    904904        int v;
    905905
Note: See TracChangeset for help on using the changeset viewer.