Changeset 305 for GPL/branches/uniaud-2.0/lib32/soundmixer.c
- Timestamp:
- Mar 24, 2008, 2:43:42 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
GPL/branches/uniaud-2.0/lib32/soundmixer.c
r84 r305 23 23 */ 24 24 25 #include <sound/ driver.h>25 #include <sound/core.h> 26 26 #include <sound/control.h> 27 27 #include <sound/info.h> … … 162 162 } 163 163 //allocate memory for all mixer elements 164 pHandle->pids = (s nd_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); 165 165 if(pHandle->pids == NULL) { 166 166 goto failure; … … 255 255 if(pHandle->controls[OSS_MIXER_IGAIN].idxCustom != -1) 256 256 { 257 s nd_ctl_elem_info_t*pElemInfo = NULL;257 struct snd_ctl_elem_info *pElemInfo = NULL; 258 258 int idx, j; 259 259 … … 266 266 267 267 //too big to put on the stack 268 pElemInfo = (s nd_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); 269 269 if(pElemInfo == NULL) { 270 270 DebugInt3(); … … 368 368 { 369 369 mixerhandle *pHandle = (mixerhandle *)streamid; 370 s nd_ctl_elem_value_t*pElem = NULL;371 s nd_ctl_elem_info_t*pElemInfo;370 struct snd_ctl_elem_value *pElem = NULL; 371 struct snd_ctl_elem_info *pElemInfo; 372 372 int ret, idx, lVol, rVol = 0, idxMute, cnt; 373 373 … … 381 381 382 382 //too big to put on the stack 383 pElem = (s nd_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); 384 384 if(pElem == NULL) { 385 385 printk("Out of memory in OSS32_MixSetVolume\n"); … … 387 387 return OSSERR_OUT_OF_MEMORY; 388 388 } 389 pElemInfo = (s nd_ctl_elem_info_t*)(pElem+1);389 pElemInfo = (struct snd_ctl_elem_info *)(pElem+1); 390 390 391 391 switch(line) { … … 549 549 { 550 550 mixerhandle *pHandle = (mixerhandle *)streamid; 551 s nd_ctl_elem_value_t*pElem = NULL;552 s nd_ctl_elem_info_t*pElemInfo;551 struct snd_ctl_elem_value *pElem = NULL; 552 struct snd_ctl_elem_info *pElemInfo; 553 553 int ret, idx = -1, lVol, rVol = 0, j, i; 554 554 … … 561 561 562 562 //too big to put on the stack 563 pElem = (s nd_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); 564 564 if(pElem == NULL) { 565 565 DebugInt3(); 566 566 return OSSERR_OUT_OF_MEMORY; 567 567 } 568 pElemInfo = (s nd_ctl_elem_info_t*)(pElem+1);568 pElemInfo = (struct snd_ctl_elem_info *)(pElem+1); 569 569 570 570 switch(ulLine) { … … 870 870 if(alsa_fops == NULL) { 871 871 ret = OSSERR_NO_DEVICE_AVAILABLE; 872 printk("ret = OSSERR_NO_DEVICE_AVAILABLE\n"); 872 873 goto failure; 873 874 }
Note:
See TracChangeset
for help on using the changeset viewer.