[Haiku-commits] r31342 - in haiku/trunk: build/jam src/add-ons/kernel/drivers/midi/usb_midi

[korli at BerliOS]

Author: korli
Date: 2009-06-30 21:07:26 +0200 (Tue, 30 Jun 2009)
New Revision: 31342
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31342&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.c
Log:
* fix warnings
* add usb_midi to the image


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-06-30 18:35:32 UTC (rev 31341)
+++ haiku/trunk/build/jam/HaikuImage	2009-06-30 19:07:26 UTC (rev 31342)
@@ -145,7 +145,7 @@
 	$(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
 	$(X86_ONLY)ati
 ;
-SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ;
+SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
 SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
 	$(X86_ONLY)broadcom570x etherpci $(X86_ONLY)ipro1000
 	pegasus $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900

Modified: haiku/trunk/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.c	2009-06-30 18:35:32 UTC (rev 31341)
+++ haiku/trunk/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.c	2009-06-30 19:07:26 UTC (rev 31342)
@@ -146,8 +146,8 @@
 */
 
 static void 
-midi_usb_callback(void *cookie, uint32 status, 
-	void *data, uint32 actual_len)
+midi_usb_callback(void *cookie, status_t status, 
+	void *data, size_t actual_len)
 {
 	status_t st;
 	my_device_info *my_dev = cookie;