Changeset 305 for GPL/branches/uniaud-2.0/lib32/ioctl.c

Timestamp:

Mar 24, 2008, 2:43:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.16 level

File:

• GPL/branches/uniaud-2.0/lib32/ioctl.c (modified) (25 diffs)

GPL/branches/uniaud-2.0/lib32/ioctl.c

@@ -6 +6 @@
  */
 
-#include <sound/driver.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/info.h>
@@ -29 +29 @@
  * set by snd_ctl_notify()
  */
-snd_pcm_substream_t *substream_int[8*256] = {0}; // interrupted substream
+struct snd_pcm_substream *substream_int[8*256] = {0}; // interrupted substream
 int control_id_changed = 0;
 int card_id_changed = 0;
@@ -71 +71 @@
     int i = 0;
     int j = 0;
-    snd_pcm_file_t *pcm_file = NULL;
-    snd_pcm_substream_t *substream;
-    snd_pcm_runtime_t *runtime;
+    struct snd_pcm_file *pcm_file = NULL;
+    struct snd_pcm_substream *substream;
+    struct snd_pcm_runtime *runtime;
     soundhandle        *pHandle = (soundhandle *)handle;
     struct file *pfile;
@@ -85 +85 @@
         return -ENXIO;
 
-    pcm_file = (snd_pcm_file_t *)pfile->private_data;
+    pcm_file = (struct snd_pcm_file *)pfile->private_data;
 
     if (pcm_file == NULL)
@@ -284 +284 @@
     OSSSTREAMID          streamid = 0;
     soundhandle         *pHandle;
-    snd_pcm_info_t      *pcminfo = NULL;
-    snd_pcm_hw_params_t *params;
+    struct snd_pcm_info      *pcminfo = NULL;
+    struct snd_pcm_hw_params *params;
     int                  ret, fmt, j;
     ULONG                format_mask;
-    snd_mask_t           *mask;
+    struct snd_mask           *mask;
     int pcms = 0;
 
@@ -297 +297 @@
     
     //these structures are too big to put on the stack
-    pcminfo = (snd_pcm_info_t *)kmalloc(sizeof(snd_pcm_info_t)+sizeof(snd_pcm_hw_params_t), GFP_KERNEL);
+    pcminfo = (struct snd_pcm_info *)kmalloc(sizeof(struct snd_pcm_info)+sizeof(struct snd_pcm_hw_params), GFP_KERNEL);
     if(pcminfo == NULL) {
         DebugInt3();
@@ -303 +303 @@
         return OSSERR_OUT_OF_MEMORY;
     }
-    params = (snd_pcm_hw_params_t *)(pcminfo+1);
+    params = (struct snd_pcm_hw_params *)(pcminfo+1);
 
     for (i=0; i<pcms;i++)
@@ -383 +383 @@
             pWaveCaps->ulMaxRate     = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max;
 
-            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
+//            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
+            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
             pWaveCaps->ulRateFlags   = mask->bits[0];
 
@@ -525 +526 @@
     mixerhandle *pHandle = NULL;
     int          ret, i, j;
-//    snd_ctl_card_info_t *pinfo;
+//    struct snd_ctl_card_info *pinfo;
 
     if(alsa_fops == NULL) {
@@ -556 +557 @@
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
                                     SNDRV_CTL_IOCTL_CARD_INFO, 
-                                    (ULONG)(snd_ctl_card_info_t *)info);
+                                    (ULONG)(struct snd_ctl_card_info *)info);
     if(ret) {
         ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
@@ -692 +693 @@
 
     //allocate memory for all mixer elements
-    pHandle->pids = (snd_ctl_elem_id_t *)pids;
-        //kmalloc(sizeof(snd_ctl_elem_id_t)*pHandle->list.count, GFP_KERNEL);
+    pHandle->pids = (struct snd_ctl_elem_id *)pids;
+        //kmalloc(sizeof(struct snd_ctl_elem_id)*pHandle->list.count, GFP_KERNEL);
     if(pHandle->pids == NULL) {
         ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
@@ -711 +712 @@
 //    if (pids)
 //        memcpy(pids, pHandle->pids,
-//               sizeof(snd_ctl_elem_id_t)*pHandle->list.count);
+//               sizeof(struct snd_ctl_elem_id)*pHandle->list.count);
 
     ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
@@ -730 +731 @@
 int GetUniaudControlInfo(ULONG deviceid, ULONG id, void *info)
 {
-    snd_ctl_elem_value_t *pElem = NULL;
-    snd_ctl_elem_info_t  *pElemInfo = NULL;
+    struct snd_ctl_elem_value *pElem = NULL;
+    struct snd_ctl_elem_info  *pElemInfo = NULL;
     mixerhandle *pHandle = NULL;
     int          ret, i, j, sz;
@@ -764 +765 @@
 
     //allocate memory for info element
-    pElemInfo = (snd_ctl_elem_info_t *)info;
+    pElemInfo = (struct snd_ctl_elem_info *)info;
     if(pElemInfo == NULL) {
         ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
@@ -770 +771 @@
     }
 
-//    printk("sizeof elem_info %i\n",sizeof(snd_ctl_elem_info_t));
+//    printk("sizeof elem_info %i\n",sizeof(struct snd_ctl_elem_info));
 
     pElemInfo->id.numid = id;
@@ -789 +790 @@
 int GetUniaudControlValueGet(ULONG deviceid, ULONG id, void *value)
 {
-    snd_ctl_elem_value_t *pElem = NULL;
-    snd_ctl_elem_info_t  *pElemInfo = NULL;
+    struct snd_ctl_elem_value *pElem = NULL;
+    struct snd_ctl_elem_info  *pElemInfo = NULL;
     mixerhandle *pHandle = NULL;
     int          ret, i, j, sz;
@@ -822 +823 @@
     }
 
-    pElem = (snd_ctl_elem_value_t *)value;
+    pElem = (struct snd_ctl_elem_value *)value;
     if(pElem == NULL) {
         ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
@@ -828 +829 @@
     }
 
-//    printk("sizeof elem_info %i\n",sizeof(snd_ctl_elem_info_t));
+//    printk("sizeof elem_info %i\n",sizeof(struct snd_ctl_elem_info));
 
     pElem->id.numid = id;
@@ -847 +848 @@
 int GetUniaudControlValuePut(ULONG deviceid, ULONG id, void *value)
 {
-    snd_ctl_elem_value_t *pElem = NULL;
-    snd_ctl_elem_info_t  *pElemInfo = NULL;
+    struct snd_ctl_elem_value *pElem = NULL;
+    struct snd_ctl_elem_info  *pElemInfo = NULL;
     mixerhandle *pHandle = NULL;
     int          ret, i, j, sz;
@@ -880 +881 @@
     }
 
-    pElem = (snd_ctl_elem_value_t *)value;
+    pElem = (struct snd_ctl_elem_value *)value;
     if(pElem == NULL) {
         ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
@@ -886 +887 @@
     }
 
-//    printk("sizeof elem_info %i\n",sizeof(snd_ctl_elem_info_t));
+//    printk("sizeof elem_info %i\n",sizeof(struct snd_ctl_elem_info));
 
     pElem->id.numid = id;
@@ -908 +909 @@
     int ret;
     soundhandle        *pHandle = (soundhandle *)streamid;
-    snd_pcm_hw_params_t *params = NULL;
-
-    params = (snd_pcm_hw_params_t *)pHwParams;
+    struct snd_pcm_hw_params *params = NULL;
+
+    params = (struct snd_pcm_hw_params *)pHwParams;
 
     if (!params) return -1001;
@@ -925 +926 @@
     int ret;
     soundhandle        *pHandle = (soundhandle *)streamid;
-    snd_pcm_hw_params_t *params = NULL;
-
-    params = (snd_pcm_hw_params_t *)pHwParams;
+    struct snd_pcm_hw_params *params = NULL;
+
+    params = (struct snd_pcm_hw_params *)pHwParams;
 
     if (!params) return -1001;
@@ -941 +942 @@
     int ret;
     soundhandle        *pHandle = (soundhandle *)streamid;
-    snd_pcm_sw_params_t *params = NULL;
-
-    params = (snd_pcm_sw_params_t *)pSwParams;
+    struct snd_pcm_sw_params *params = NULL;
+
+    params = (struct snd_pcm_sw_params *)pSwParams;
 
     if (!params) return -1001;
@@ -958 +959 @@
     int ret;
     soundhandle        *pHandle = (soundhandle *)streamid;
-    snd_pcm_status_t   *status = (snd_pcm_status_t *)pstatus;
+    struct snd_pcm_status   *status = (struct snd_pcm_status *)pstatus;
 
     if (!status) return -1001;