Ignore:
Timestamp:
Mar 24, 2008, 2:43:42 AM (17 years ago)
Author:
Paul Smedley
Message:

Update source to ALSA 1.0.16 level

File:
1 edited

Legend:

Unmodified
Added
Removed
  • GPL/branches/uniaud-2.0/lib32/soundmixer.c

    r84 r305  
    2323 */
    2424
    25 #include <sound/driver.h>
     25#include <sound/core.h>
    2626#include <sound/control.h>
    2727#include <sound/info.h>
     
    162162    }
    163163    //allocate memory for all mixer elements
    164     pHandle->pids = (snd_ctl_elem_id_t *)kmalloc(sizeof(snd_ctl_elem_id_t)*pHandle->list.count, GFP_KERNEL);
     164    pHandle->pids = (struct snd_ctl_elem_id *)kmalloc(sizeof(struct snd_ctl_elem_id)*pHandle->list.count, GFP_KERNEL);
    165165    if(pHandle->pids == NULL) {
    166166        goto failure;
     
    255255    if(pHandle->controls[OSS_MIXER_IGAIN].idxCustom != -1)
    256256    {
    257         snd_ctl_elem_info_t  *pElemInfo = NULL; 
     257        struct snd_ctl_elem_info  *pElemInfo = NULL; 
    258258        int                   idx, j;
    259259
     
    266266
    267267        //too big to put on the stack
    268         pElemInfo = (snd_ctl_elem_info_t *)kmalloc(sizeof(snd_ctl_elem_info_t), GFP_KERNEL);
     268        pElemInfo = (struct snd_ctl_elem_info *)kmalloc(sizeof(struct snd_ctl_elem_info), GFP_KERNEL);
    269269        if(pElemInfo == NULL) {
    270270            DebugInt3();
     
    368368{
    369369    mixerhandle          *pHandle = (mixerhandle *)streamid;
    370     snd_ctl_elem_value_t *pElem = NULL;
    371     snd_ctl_elem_info_t  *pElemInfo; 
     370    struct snd_ctl_elem_value *pElem = NULL;
     371    struct snd_ctl_elem_info  *pElemInfo; 
    372372    int                   ret, idx, lVol, rVol = 0, idxMute, cnt;
    373373
     
    381381
    382382    //too big to put on the stack
    383     pElem = (snd_ctl_elem_value_t *)kmalloc(sizeof(snd_ctl_elem_value_t) + sizeof(snd_ctl_elem_info_t), GFP_KERNEL);
     383    pElem = (struct snd_ctl_elem_value *)kmalloc(sizeof(struct snd_ctl_elem_value) + sizeof(struct snd_ctl_elem_info), GFP_KERNEL);
    384384    if(pElem == NULL) {
    385385        printk("Out of memory in OSS32_MixSetVolume\n");
     
    387387        return OSSERR_OUT_OF_MEMORY;
    388388    }
    389     pElemInfo = (snd_ctl_elem_info_t *)(pElem+1);
     389    pElemInfo = (struct snd_ctl_elem_info *)(pElem+1);
    390390
    391391    switch(line) {
     
    549549{
    550550    mixerhandle          *pHandle = (mixerhandle *)streamid;
    551     snd_ctl_elem_value_t *pElem = NULL;
    552     snd_ctl_elem_info_t  *pElemInfo; 
     551    struct snd_ctl_elem_value *pElem = NULL;
     552    struct snd_ctl_elem_info  *pElemInfo; 
    553553    int                   ret, idx = -1, lVol, rVol = 0, j, i;
    554554
     
    561561 
    562562    //too big to put on the stack
    563     pElem = (snd_ctl_elem_value_t *)kmalloc(sizeof(snd_ctl_elem_value_t) + sizeof(snd_ctl_elem_info_t), GFP_KERNEL);
     563    pElem = (struct snd_ctl_elem_value *)kmalloc(sizeof(struct snd_ctl_elem_value) + sizeof(struct snd_ctl_elem_info), GFP_KERNEL);
    564564    if(pElem == NULL) {
    565565        DebugInt3();
    566566        return OSSERR_OUT_OF_MEMORY;
    567567    }
    568     pElemInfo = (snd_ctl_elem_info_t *)(pElem+1);
     568    pElemInfo = (struct snd_ctl_elem_info *)(pElem+1);
    569569
    570570    switch(ulLine) {
     
    870870    if(alsa_fops == NULL) {
    871871        ret = OSSERR_NO_DEVICE_AVAILABLE;
     872        printk("ret = OSSERR_NO_DEVICE_AVAILABLE\n");
    872873        goto failure;
    873874    }
Note: See TracChangeset for help on using the changeset viewer.