Changeset 479 for GPL/trunk/lib32/ioctl.c

Timestamp:

May 1, 2010, 9:49:10 PM (15 years ago)

Author:

David Azarewicz

Message:

Cleanup compiler warnings

File:

• GPL/trunk/lib32/ioctl.c (modified) (12 diffs)

GPL/trunk/lib32/ioctl.c

@@ -38 +38 @@
 int pcm_instances(int card_id);
 
-int uniaud_set_interrupted_substream(struct snd_pcm_substream *substream)
+void uniaud_set_interrupted_substream(struct snd_pcm_substream *substream)
 {
     int i;
@@ -257 +257 @@
     }
     return max_ch;
-}
-
-void FillCaps(ULONG deviceid)
-{
-    int pcms = 0;
-
-    pcms = pcm_instances(deviceid);
-
-    printk("pcms = %i\n", pcms); //uncommented
-    if (!pcmcaps[deviceid])
-    {
-        pcmcaps[deviceid] = (POSS32_DEVCAPS)kmalloc(sizeof(OSS32_DEVCAPS)*pcms, GFP_KERNEL);
-        if (pcmcaps[deviceid])
-        {
-            memset(pcmcaps[deviceid], 0, sizeof(OSS32_DEVCAPS)*pcms);
-            GetUniaudPcmCaps1(deviceid, (void *)pcmcaps[deviceid]);
-        }
-    }
-    return;
-}
-
-int GetUniaudPcmCaps(ULONG deviceid, void *caps)
-{
-    int pcms = 0;
-
-    pcms = pcm_instances(deviceid);
-
-//    printk("pcms = %i\n", pcms);
-    if (pcmcaps[deviceid])
-    {
-        memcpy((unsigned char*)caps,(unsigned char*)pcmcaps[deviceid],sizeof(OSS32_DEVCAPS)*pcms);
-        return 0;
-    }
-    else
-    {
-        return -1;
-    }
 }
 
@@ -316 +279 @@
     if (!pcaps || !pcms) return -1;
 
-    
+
     //these structures are too big to put on the stack
     pcminfo = (struct snd_pcm_info *)kmalloc(sizeof(struct snd_pcm_info)+sizeof(struct snd_pcm_hw_params), GFP_KERNEL);
@@ -434 +397 @@
 }
 
+void FillCaps(ULONG deviceid)
+{
+    int pcms = 0;
+
+    pcms = pcm_instances(deviceid);
+
+    printk("pcms = %i\n", pcms); //uncommented
+    if (!pcmcaps[deviceid])
+    {
+        pcmcaps[deviceid] = (POSS32_DEVCAPS)kmalloc(sizeof(OSS32_DEVCAPS)*pcms, GFP_KERNEL);
+        if (pcmcaps[deviceid])
+        {
+            memset(pcmcaps[deviceid], 0, sizeof(OSS32_DEVCAPS)*pcms);
+            GetUniaudPcmCaps1(deviceid, (void *)pcmcaps[deviceid]);
+        }
+    }
+    return;
+}
+
+int GetUniaudPcmCaps(ULONG deviceid, void *caps)
+{
+    int pcms = 0;
+
+    pcms = pcm_instances(deviceid);
+
+//    printk("pcms = %i\n", pcms);
+    if (pcmcaps[deviceid])
+    {
+        memcpy((unsigned char*)caps,(unsigned char*)pcmcaps[deviceid],sizeof(OSS32_DEVCAPS)*pcms);
+        return 0;
+    }
+    else
+    {
+        return -1;
+    }
+}
+
 /*
  returns power state of given card
@@ -469 +469 @@
     }
     //retrieve mixer information
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_POWER_STATE, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_POWER_STATE,
                                     (ULONG)state);
 
@@ -522 +522 @@
     }
     //retrieve mixer information
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_POWER, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_POWER,
                                     (ULONG)state);
 
@@ -576 +576 @@
     }
     //retrieve mixer information
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_CARD_INFO, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_CARD_INFO,
                                     (ULONG)(struct snd_ctl_card_info *)info);
     if(ret) {
@@ -630 +630 @@
     }
     //retrieve mixer information
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_CARD_INFO, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_CARD_INFO,
                                     (ULONG)&pHandle->info);
     if(ret) {
@@ -640 +640 @@
     pHandle->list.offset = 0;
     pHandle->list.space  = 0;
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_ELEM_LIST, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_ELEM_LIST,
                                     (ULONG)&pHandle->list);
     if(ret) {
@@ -695 +695 @@
     }
     //retrieve mixer information
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_CARD_INFO, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_CARD_INFO,
                                     (ULONG)&pHandle->info);
     if(ret) {
@@ -705 +705 @@
     pHandle->list.offset = 0;
     pHandle->list.space  = 0;
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_ELEM_LIST, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_ELEM_LIST,
                                     (ULONG)&pHandle->list);
     if(ret) {
@@ -724 +724 @@
     pHandle->list.space  = pHandle->list.count;
     pHandle->list.pids   = pHandle->pids;
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, 
-                                    SNDRV_CTL_IOCTL_ELEM_LIST, 
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+                                    SNDRV_CTL_IOCTL_ELEM_LIST,
                                     (ULONG)&pHandle->list);
     if(ret) {