[Commit-gnuradio] r8595 - usrp2/trunk/host-ng/lib

[eb]

Author: eb
Date: 2008-06-16 17:09:30 -0600 (Mon, 16 Jun 2008)
New Revision: 8595

Modified:
   usrp2/trunk/host-ng/lib/eth_buffer.cc
Log:
removed 3 warnings

Modified: usrp2/trunk/host-ng/lib/eth_buffer.cc
===================================================================
--- usrp2/trunk/host-ng/lib/eth_buffer.cc       2008-06-16 20:52:28 UTC (rev 
8594)
+++ usrp2/trunk/host-ng/lib/eth_buffer.cc       2008-06-16 23:09:30 UTC (rev 
8595)
@@ -60,9 +60,9 @@
       std::cerr << "eth_buffer: constructor" << std::endl;
     
     if (rx_bufsize == 0)
-       d_buflen = MAX_MEM_SIZE;
+      d_buflen = (size_t)MAX_MEM_SIZE;
     else
-       d_buflen = std::min((size_t)MAX_MEM_SIZE, rx_bufsize);
+      d_buflen = std::min((size_t)MAX_MEM_SIZE, rx_bufsize);
        
     memset(d_mac, 0, sizeof(d_mac));
   }
@@ -95,10 +95,11 @@
     size_t page_size = getpagesize();
 
     // Calculate minimum power-of-two aligned size for frames
-    req.tp_frame_size = pow(2, 
ceil(log2(TPACKET_ALIGN(TPACKET_HDRLEN)+TPACKET_ALIGN(MAX_PKT_SIZE))));
+    req.tp_frame_size =
+      (unsigned int)rint(pow(2, 
ceil(log2(TPACKET_ALIGN(TPACKET_HDRLEN)+TPACKET_ALIGN(MAX_PKT_SIZE)))));
 
     // Calculate minimum contiguous pages needed to enclose a frame
-    int npages = (page_size > req.tp_frame_size) ? 1 : 
ceil(req.tp_frame_size/page_size);
+    int npages = (page_size > req.tp_frame_size) ? 1 : 
((req.tp_frame_size+page_size-1)/page_size);
     req.tp_block_size = page_size << (int)ceil(log2(npages));
 
     // Calculate number of blocks