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

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/ioctl.c (modified) (10 diffs)

GPL/trunk/lib32/ioctl.c ¶

@@ -122 +122 @@
                 return -EBADFD;
 
-        //dprintf(("wait for %x. tout %i\n",substream, timeout));
+        //printk("wait for %x. tout %i\n",substream, timeout);
 
         while (1)
@@ -226 +226 @@
         WAVE_CAPS *wc;
         int i;
-        int sel_pcm = -1;
+        //int sel_pcm = -1;
         int max_ch = 0;
 
@@ -439 +439 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int ret;
+        //int i, j;
 
         if(alsa_fops == NULL) {
@@ -492 +493 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int              ret;
+        //int i, j;
 
         if(alsa_fops == NULL) {
@@ -545 +547 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int              ret;
+        //int i, j;
 
         //dprintf(("GetUniaudCardInfo"));
@@ -600 +603 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         //dprintf(("GetUniaudControlNum"));
@@ -667 +671 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         //dprintf(("GetUniaudControls"));
@@ -756 +761 @@
 int GetUniaudControlInfo(ULONG deviceid, ULONG id, void *info)
 {
-        struct snd_ctl_elem_value *pElem = NULL;
+        //struct snd_ctl_elem_value *pElem = NULL;
         struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         //dprintf(("GetUniaudControlInfo"));
@@ -820 +826 @@
         //struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         if(alsa_fops == NULL) {
@@ -878 +885 @@
         //struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         if(alsa_fops == NULL) {