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

Timestamp:

Jul 20, 2010, 5:46:55 PM (15 years ago)

Author:

David Azarewicz

Message:

Some of my updates from the 2.1.x branch

File:

• GPL/trunk/lib32/soundmidi.c (modified) (13 diffs)

GPL/trunk/lib32/soundmidi.c

@@ -108 +108 @@
     ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
     if(ret) {
-        dprintf(("Midi Open %d failed with error %d", streamtype, ret));
+        rprintf(("Midi Open %d failed with error %d", streamtype, ret));
         kfree(pHandle);
         return UNIXToOSSError(ret);
@@ -116 +116 @@
 
     pHandle->state |= MIDISTATE_OPENED;
-    printk("Opened MIDI %x\n",(ULONG)pHandle);
-    if(streamtype == OSS32_STREAM_FM_MIDIOUT) 
+    dprintf(("Opened MIDI %x\n",(ULONG)pHandle));
+    if(streamtype == OSS32_STREAM_FM_MIDIOUT)
     {
         //get the client id
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_CLIENT_ID, (ULONG)&pHandle->clientid);
         if(ret) {
-            dprintf(("Get client id failed with error %d", ret));
+            rprintf(("Get client id failed with error %d", ret));
             kfree(pHandle);
             return UNIXToOSSError(ret);
         }
-    
+
         //find the FM device
-        for(i=64;i<64+((deviceid+1)<<3);i++) 
+        for(i=64;i<64+((deviceid+1)<<3);i++)
         {
             memset((PVOID)__Stack32ToFlat(&clientinfo), 0, sizeof(clientinfo));
@@ -143 +143 @@
         }
         if(i == 64+((deviceid+1)<<3)) {
-            dprintf(("Couldn't find OPL3 device"));
+            rprintf(("Couldn't find OPL3 device"));
             ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
             kfree(pHandle);
@@ -159 +159 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_CREATE_PORT, (ULONG)__Stack32ToFlat(&portinfo));
         if(ret) {
-            dprintf(("subscribe error %d", ret));
+            rprintf(("subscribe error %d", ret));
             kfree(pHandle);
             return UNIXToOSSError(ret);
@@ -165 +165 @@
         pHandle->clientport = portinfo.addr.port;
         pHandle->state     |= MIDISTATE_PORTCREATED;
-        
+
         //subscribe to FM device port
         memset(&subs, 0, sizeof(subs));
@@ -174 +174 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
         if(ret) {
-            dprintf(("subscribe error %d", ret));
+            rprintf(("subscribe error %d", ret));
             kfree(pHandle);
             return UNIXToOSSError(ret);
         }
         pHandle->state |= MIDISTATE_SUBSCRIBED;
-        
+
 #if 0
         //Load FM instruments (only done once)
@@ -200 +200 @@
         return OSSERR_INVALID_STREAMID;
     }
-    printk("Closing MIDI %x\n",(ULONG)streamid);
+    dprintf(("Closing MIDI %x\n",(ULONG)streamid));
 
     //set operation to non-blocking
@@ -214 +214 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
         if(ret) {
-            dprintf(("unsubscribe error %d", ret));
+            rprintf(("unsubscribe error %d", ret));
             DebugInt3();
         }
     }
-    
+
     //delete port
     if(pHandle->state & MIDISTATE_SUBSCRIBED) {
         struct snd_seq_port_info       portinfo;
-        
+
         memset(&portinfo, 0, sizeof(portinfo));
         strcpy(portinfo.name, "Unamed port");
@@ -248 +248 @@
 OSSRET OSS32_MidiWrite(OSSSTREAMID streamid, ULONG midiByte)
 {
-    printk("MIDI write %x\n",(ULONG)streamid);
+    dprintf(("MIDI write %x\n",(ULONG)streamid));
     return OSSERR_INVALID_STREAMID;
 }
@@ -269 +269 @@
     if (ret > 0)
     {
-        printk("MIDI read %i bytes from %x. first byte is: %x\n",ret, (ULONG)streamid, (char*)buffer[0]);
+        dprintf(("MIDI read %i bytes from %x. first byte is: %x\n",ret, (ULONG)streamid, (char*)buffer[0]));
         *pTransferred = ret;
         return OSSERR_SUCCESS;
@@ -279 +279 @@
 OSSRET OSS32_MidiQueryCaps(OSSSTREAMID streamid, POSS32_MIDICAPS pCaps)
 {
-    printk("MIDI query caps %x\n",(ULONG)streamid);
+    dprintf(("MIDI query caps %x\n",(ULONG)streamid));
     return OSSERR_INVALID_STREAMID;
 }
@@ -295 +295 @@
         return OSSERR_INVALID_STREAMID;
     }
-    printk("MIDI command %x\n",(ULONG)streamid);
+    dprintf(("MIDI command %x\n",(ULONG)streamid));
 
     //set operation to non-blocking
@@ -334 +334 @@
 
     if(transferred < 0) {
-        dprintf(("OSS32_MidiNoteOn failed!!"));
+        rprintf(("OSS32_MidiNoteOn failed!!"));
         DebugInt3();
         return UNIXToOSSError(transferred);