[haiku-commits] haiku: hrev54136 - src/add-ons/kernel/drivers/midi/usb_midi

  • From: Michael Lotz <mmlr@xxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 5 May 2020 15:25:09 -0400 (EDT)

hrev54136 adds 1 changeset to branch 'master'
old head: 9792465ec1d38080fdd5f741694d9acef18bf23e
new head: 1705082fa24d08321a902c8bf6743ab98413a282
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=1705082fa24d+%5E9792465ec1d3

----------------------------------------------------------------------------

1705082fa24d: usb_midi: Fix 32 bit build.

                                            [ Michael Lotz <mmlr@xxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev54136
Commit:      1705082fa24d08321a902c8bf6743ab98413a282
URL:         https://git.haiku-os.org/haiku/commit/?id=1705082fa24d
Author:      Michael Lotz <mmlr@xxxxxxxx>
Date:        Tue May  5 19:23:44 2020 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 3 deletions(-)
src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.cpp | 7 ++++---

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.cpp 
b/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.cpp
index b6b7aace51..2fac0eec80 100644
--- a/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.cpp
+++ b/src/add-ons/kernel/drivers/midi/usb_midi/usb_midi.cpp
@@ -652,9 +652,10 @@ usb_midi_write(driver_cookie* cookie, off_t position,
        // TODO add a loop to allow writing multiple events in a single write()
        // call if desired.
        if (midicode != 0xF0) {
-               if (*num_bytes < CINbytes[cin]) {
-                       DPRINTF_ERR((MY_ID "Expected %d bytes for MIDI command 
%x but got "
-                               "only %d.\n", CINbytes[cin], cin, *num_bytes));
+               if ((int)*num_bytes < CINbytes[cin]) {
+                       DPRINTF_ERR((MY_ID "Expected %d bytes for MIDI command 
%" B_PRIu8
+                               " but got only %" B_PRIuSIZE ".\n", 
CINbytes[cin], cin,
+                               *num_bytes));
                        return B_BAD_DATA;
                }
                *num_bytes = CINbytes[cin];


Other related posts:

  • » [haiku-commits] haiku: hrev54136 - src/add-ons/kernel/drivers/midi/usb_midi - Michael Lotz