Changeset 679 for GPL/trunk/lib32/soundmidi.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/soundmidi.c (modified) (8 diffs)

GPL/trunk/lib32/soundmidi.c

@@ -120 +120 @@
     {
         //get the client id
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_CLIENT_ID, (ULONG)&pHandle->clientid);
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_CLIENT_ID, (ULONG)&pHandle->clientid);
         if(ret) {
             rprintf(("Get client id failed with error %d", ret));
@@ -130 +130 @@
         for(i=64;i<64+((deviceid+1)<<3);i++)
         {
-            memset((PVOID)__Stack32ToFlat(&clientinfo), 0, sizeof(clientinfo));
+            memset(&clientinfo, 0, sizeof(clientinfo));
             clientinfo.client = i;
             clientinfo.type   = KERNEL_CLIENT;
-            ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_GET_CLIENT_INFO, (ULONG)__Stack32ToFlat(&clientinfo));
+            ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_GET_CLIENT_INFO, (ULONG)&clientinfo);
             if(ret) {
                 continue;
@@ -157 +157 @@
         portinfo.addr.client = pHandle->clientid;
         portinfo.flags       = SNDRV_SEQ_PORT_TYPE_APPLICATION;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_CREATE_PORT, (ULONG)__Stack32ToFlat(&portinfo));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_CREATE_PORT, (ULONG)&portinfo);
         if(ret) {
             rprintf(("subscribe error %d", ret));
@@ -172 +172 @@
         subs.sender.client = pHandle->clientid;
         subs.sender.port   = pHandle->clientport;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, (ULONG)&subs);
         if(ret) {
             rprintf(("subscribe error %d", ret));
@@ -212 +212 @@
         subs.sender.client = pHandle->clientid;
         subs.sender.port   = pHandle->clientport;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT, (ULONG)&subs);
         if(ret) {
             rprintf(("unsubscribe error %d", ret));
@@ -227 +227 @@
         portinfo.addr.client = pHandle->clientid;
         portinfo.addr.port   = pHandle->clientport;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_DELETE_PORT, (ULONG)__Stack32ToFlat(&portinfo));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_DELETE_PORT, (ULONG)&portinfo);
         if(ret) {
             dprintf(("delete port error %d", ret));
@@ -300 +300 @@
     pHandle->file.f_flags = O_NONBLOCK;
 
-    memset((PVOID)__Stack32ToFlat(&fmevent), 0, sizeof(fmevent));
+    memset(&fmevent, 0, sizeof(fmevent));
     switch(Cmd) {
     case IDC32_MIDI_NOTEON:
@@ -331 +331 @@
     fmevent.dest.port     = pHandle->destport;
 
-    transferred = pHandle->file.f_op->write(&pHandle->file, (char *)__Stack32ToFlat(&fmevent), sizeof(fmevent), &pHandle->file.f_pos);
+    transferred = pHandle->file.f_op->write(&pHandle->file, (char *)&fmevent, sizeof(fmevent), &pHandle->file.f_pos);
 
     if(transferred < 0) {