Changeset 7882 in vbox for trunk

Timestamp:

Apr 10, 2008 4:04:40 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29506

Message:

warnings

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevSB16.cpp (modified) (4 diffs)
• Network/DevPCNet.cpp (modified) (2 diffs)

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

@@ -388 +388 @@
 
     s->block_size = dma_len + 1;
-    s->block_size <<= (s->fmt_bits == 16);
+    s->block_size <<= ((s->fmt_bits == 16) ? 1 : 0);
     if (!s->dma_auto) {
         /* It is clear that for DOOM and auto-init this value
@@ -421 +421 @@
     s->left_till_irq = s->block_size;
 
-    s->bytes_per_second = (s->freq << s->fmt_stereo) << (s->fmt_bits == 16);
+    s->bytes_per_second = (s->freq << s->fmt_stereo) << ((s->fmt_bits == 16) ? 1 : 0);
     s->highspeed = 0;
     s->align = (1 << (s->fmt_stereo + (s->fmt_bits == 16))) - 1;
@@ -610 +610 @@
         case 0x90:
         case 0x91:
-            dma_cmd8 (s, ((cmd & 1) == 0) | DMA8_HIGH, -1);
+            dma_cmd8 (s, (((cmd & 1) == 0) ? 1 : 0) | DMA8_HIGH, -1);
             break;
 
@@ -853 +853 @@
                 freq = s->freq > 0 ? s->freq : 11025;
                 samples = dsp_get_lohi (s) + 1;
-                bytes = samples << s->fmt_stereo << (s->fmt_bits == 16);
+                bytes = samples << s->fmt_stereo << ((s->fmt_bits == 16) ? 1 : 0);
 #ifndef VBOX
                 ticks = (bytes * ticks_per_sec) / freq;

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -1823 +1823 @@
                 rmd.rmd1.stp = 1;
 
-            int count = RT_MIN(4096 - (int)rmd.rmd1.bcnt, size);
+            size_t count = RT_MIN(4096 - (size_t)rmd.rmd1.bcnt, size);
             RTGCPHYS32 rbadr = PHYSADDR(pData, rmd.rmd0.rbadr);
 #if 0
@@ -1862 +1862 @@
                 rmd  = next_rmd;
 
-                count = RT_MIN(4096 - (int)rmd.rmd1.bcnt, size);
+                count = RT_MIN(4096 - (size_t)rmd.rmd1.bcnt, size);
                 RTGCPHYS32 rbadr = PHYSADDR(pData, rmd.rmd0.rbadr);
 #if 0