Changeset 55324 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Apr 17, 2015 12:10:07 PM (10 years ago)

Author:

vboxsync

Message:

SB16: Warning fixes.

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -1470 +1470 @@
 uint32_t lsbindex (uint32_t u)
 {
-    return popcount ((u&-u)-1); /** @todo r=andy Un/signed mismatch? */
+    return popcount ((u & -(int32_t)u) - 1);
 }
 #endif
@@ -1661 +1661 @@
 }
 
-static int sb16WriteAudio(PSB16STATE pThis, int nchan, int dma_pos,
-                          int dma_len, int len)
-{
-    uint8_t tmpbuf[_4K]; /** @todo Have a buffer on the heap. */
-
-    int cbToWrite = len;
-    int cbWrittenTotal = 0;
+static int sb16WriteAudio(PSB16STATE pThis, int nchan, uint32_t dma_pos,
+                          uint32_t dma_len, int len)
+{
+    uint8_t     tmpbuf[_4K]; /** @todo Have a buffer on the heap. */
+    uint32_t    cbToWrite = len;
+    uint32_t    cbWrittenTotal = 0;
 
     while (cbToWrite)
@@ -1676 +1675 @@
 #else
         uint32_t cbWrittenMin = UINT32_MAX;
-        size_t cbToRead;
+        uint32_t cbToRead;
         uint32_t cbRead;
 #endif