Ticket #4463: usb_midi.2.diff

BFS_User/haiku/haiku/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.c

@@ -274 +274 @@
         DPRINTF_ERR((MY_ID "cannot get default configuration\n"));
         return B_ERROR;
     }
+    DPRINTF_INFO(("Interface count = %ld\n", conf->interface_count);)
 
     for (ifno = 0; ifno < conf->interface_count; ifno++) {
         /* This is C; I can use "class" :-> */
@@ -284 +285 @@
             class    = intf->descr->interface_class;
             subclass = intf->descr->interface_subclass;
             protocol = intf->descr->interface_protocol;
-            DPRINTF_INFO((MY_ID "interface %d, alt : %d: class %d, subclass %d, protocol %d\n",
-                            ifno, alt, class, subclass, protocol));
+            DPRINTF_INFO((
+                MY_ID "interface %d, alt : %d: class %d, subclass %d, protocol %d\n",
+                    ifno, alt, class, subclass, protocol));
                             
             if (class == USB_AUDIO_DEVICE_CLASS 
                 && subclass == USB_AUDIO_INTERFACE_MIDISTREAMING_SUBCLASS)
@@ -319 +321 @@
     
     DPRINTF_INFO((MY_ID "my_dev = %p endpoint count = %ld\n",
         my_dev, intf->endpoint_count));
-    DPRINTF_INFO((MY_ID " input endpoint = %p\n",
-        &intf->endpoint[0]));
-    DPRINTF_INFO((MY_ID " output endpoint = %p\n",
-        &intf->endpoint[1]));
+    DPRINTF_INFO((MY_ID "endpoint 0 = %p  %s\n",
+        &intf->endpoint[0],
+        intf->endpoint[0].descr->endpoint_address & 0x80? "IN" : "OUT"));
+    DPRINTF_INFO((MY_ID "endpoint 1 = %p  %s\n",
+        &intf->endpoint[1],
+        intf->endpoint[1].descr->endpoint_address & 0x80? "IN" : "OUT"));
     usb->clear_feature(intf->endpoint[0].handle, USB_FEATURE_ENDPOINT_HALT);
     /* This may need more thought...  */
-    my_dev->ept_in = &intf->endpoint[0];        /* bulk IN */
-    my_dev->ept_out = &intf->endpoint[1];       /* OUT */
+    if (intf->endpoint[0].descr->endpoint_address & 0x80) {
+        /* assume one IN, one OUT */
+        my_dev->ept_in = &intf->endpoint[0];        /* bulk IN*/
+        my_dev->ept_out = &intf->endpoint[1];       /* OUT */
+    } else {
+        my_dev->ept_in = &intf->endpoint[1];        /* Other way round... */
+        my_dev->ept_out = &intf->endpoint[0];
+    }
     
     my_dev->timestamp = system_time();