Ticket #15562: additional-usb_midi-logs.patch

src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.cpp

@@ -19 +19 @@
 
 /* #define DEBUG 1 */   /* Define this to enable DPRINTF_DEBUG statements */ 
 /* (Other categories of printout set in usb_midi.h) */
+#define DEBUG 1
 
 #include "usb_midi.h"
 
@@ -575 +576 @@
     DPRINTF_DEBUG((MY_ID "usb_midi_read: (%" B_PRIuSIZE " byte buffer at %"
         B_PRIdOFF " cookie %p)\n", *num_bytes, position, cookie));
     while (midiDevice && midiDevice->active) {
-        ZDPRINTF_DEBUG((MY_ID "waiting on acquire_sem_etc\n"));
+        ZDPRINTF_DEBUG((MY_ID "usb_midi_read: waiting on acquire_sem_etc\n"));
         err = acquire_sem_etc(cookie->sem_cb, 1,
              B_RELATIVE_TIMEOUT, 1000000);
         if (err == B_TIMED_OUT) {
-            ZDPRINTF_DEBUG((MY_ID "acquire_sem_etc timed out\n"));
+            ZDPRINTF_DEBUG((MY_ID "usb_midi_read: acquire_sem_etc timed out\n"));
             continue;   /* see if we're still active */
         }
         if (err != B_OK) {
             *num_bytes = 0;
-            DPRINTF_DEBUG((MY_ID "acquire_sem_etc aborted\n"));
+            DPRINTF_DEBUG((MY_ID "usb_midi_read: acquire_sem_etc aborted\n"));
             break;
         }
-        DPRINTF_DEBUG((MY_ID "reading from ringbuffer\n"));
+        DPRINTF_DEBUG((MY_ID "usb_midi_read: reading from ringbuffer\n"));
         acquire_sem(midiDevice->sem_lock);
             /* a global semaphore -- OK, I think */
         ring_buffer_user_read(port->rbuf, (uint8*)buf, 1);
         release_sem(midiDevice->sem_lock);
         *num_bytes = 1;
-        DPRINTF_DEBUG((MY_ID "read byte %x -- cookie %p)\n",
+        DPRINTF_DEBUG((MY_ID "usb_midi_read: read byte %x -- cookie %p)\n",
             *(uint8*)buf, cookie));
         return B_OK;
     }
@@ -638 +639 @@
     usbmidi_port_info* port = cookie->port;
     usbmidi_device_info* midiDevice = cookie->device;
 
+    DPRINTF_DEBUG((MY_ID "usb_midi_write: (%" B_PRIuSIZE " byte buffer at %"
+        B_PRIdOFF " cookie %p)\n", *num_bytes, position, cookie));
+
     if (!midiDevice || !midiDevice->active)
         return B_ERROR;     /* already unplugged */
 
     buff_lim = midiDevice->outMaxPkt * 3 / 4;
         /* max MIDI bytes buffer space */
 
-    DPRINTF_DEBUG((MY_ID "MIDI write (%" B_PRIuSIZE " bytes at %" B_PRIdOFF
+    DPRINTF_DEBUG((MY_ID "usb_midi_write: MIDI write (%" B_PRIuSIZE " bytes at %" B_PRIdOFF
         ")\n", *num_bytes, position));
     if (*num_bytes > 3 && midicode != 0xF0) {
-        DPRINTF_ERR((MY_ID "Non-SysEx packet of %ld bytes"
+        DPRINTF_ERR((MY_ID "usb_midi_write: Non-SysEx packet of %ld bytes"
             " -- too big to handle\n", *num_bytes));
         return B_ERROR;
     }
@@ -663 +667 @@
         if (status != B_OK)
             return status;
 
+        DPRINTF_DEBUG((MY_ID "usb_midi_write: ======== begin xfer of %" B_PRIuSIZE " bytes\n", xfer_bytes));
         while (xfer_bytes) {
             uint8 pkt_bytes = CINbytes[cin];
+            DPRINTF_DEBUG((MY_ID "usb_midi_write: = pointer of pkt is %p\n", pkt));
             memset(pkt, 0, sizeof(usb_midi_event_packet));
             pkt->cin = cin;
             pkt->cn = port->cable;
-            DPRINTF_DEBUG((MY_ID "using packet data (code %x -- %d bytes)"
+            DPRINTF_DEBUG((MY_ID "usb_midi_write: using packet data (code %x -- %d bytes)"
                 " %x %x %x\n", pkt->cin, CINbytes[pkt->cin],
                 midiseq[0], midiseq[1], midiseq[2]));
             memcpy(pkt->midi, midiseq, pkt_bytes);
-            DPRINTF_DEBUG((MY_ID "built packet %p %x:%d %x %x %x\n",
+            DPRINTF_DEBUG((MY_ID "usb_midi_write: built packet %p %x:%d %x %x %x\n",
                 pkt, pkt->cin, pkt->cn,
                 pkt->midi[0], pkt->midi[1], pkt->midi[2]));
             xfer_bytes -= pkt_bytes;
@@ -680 +686 @@
             midiseq += pkt_bytes;
             packet_count++;
             pkt++;
+            DPRINTF_DEBUG((MY_ID "usb_midi_write: === continue xfer of %" B_PRIuSIZE " bytes\n", xfer_bytes));
             if (midicode == 0xF0 && bytes_left < 4) cin = 4 + bytes_left;
                 /* see USB-MIDI Spec */
         }
@@ -688 +695 @@
             * packet_count, (usb_callback_func)midi_usb_write_callback,
             midiDevice);
         if (status != B_OK) {
-            DPRINTF_ERR((MY_ID "midi write queue_bulk() error 0x%" B_PRIx32
+            DPRINTF_ERR((MY_ID "usb_midi_write: midi write queue_bulk() error 0x%" B_PRIx32
                 "\n", status));
             return B_ERROR;
         }