[Commit-gnuradio] r9475 - in gnuradio/trunk/gnuradio-core/src/lib: general io

[eb]

Author: eb
Date: 2008-08-31 17:22:43 -0600 (Sun, 31 Aug 2008)
New Revision: 9475

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
   gnuradio/trunk/gnuradio-core/src/lib/io/microtune_4702.cc
Log:
removed some warnings

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
===================================================================
--- 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc    
    2008-08-31 23:00:30 UTC (rev 9474)
+++ 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc    
    2008-08-31 23:22:43 UTC (rev 9475)
@@ -331,7 +331,7 @@
     x_high16bits = uin[d_nchan*2];
     x_low16bits = uin[d_nchan*2+1];
     unsigned int ucounter_begin2 = x_high16bits<<16 | x_low16bits;
-    if((d_state[i].ucounter_begin+1)!=(ucounter_begin2))
+    if((d_state[i].ucounter_begin+1)!=(ucounter_begin2)){
       if(ucounter_begin2==0)
       {
 #ifdef DEBUG_TOCONSUME
@@ -342,6 +342,7 @@
       {
         ePrintf("Error: counter not continuous.\n ucounter_begin[%i]=%i +1 !=  
ucounter_begin2=%i\n",i,d_state[i].ucounter_begin,ucounter_begin2);
       }
+    }
       
     //diff_comp[i]=ucounter[i]-ucounter[0];
     //diff_min=std::min(diff[i],diff_min);

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/microtune_4702.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/microtune_4702.cc   2008-08-31 
23:00:30 UTC (rev 9474)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/microtune_4702.cc   2008-08-31 
23:22:43 UTC (rev 9475)
@@ -151,7 +151,7 @@
   buf[0] = ((divisor & 0x07f00) >> 8) & 0xff;  // DB1
   buf[1] = divisor & 0xff;             // DB2
   buf[2] = control_byte_1 (d_prescaler, d_reference_divider);
-  buf[2] = (buf[2]|(((divisor & 0x18000) >> 10)) & 0xff);
+  buf[2] = buf[2] | (((divisor & 0x18000) >> 10) & 0xff);
   buf[3] = control_byte_2 (target_freq);
 
   printf ("%x\n", PLL_I2C_ADDR);