[Commit-gnuradio] r8616 - in usrp2/branches/features/host-ng: firmware/apps host-ng/lib

[eb]

Author: eb
Date: 2008-06-18 17:50:56 -0600 (Wed, 18 Jun 2008)
New Revision: 8616

Modified:
   usrp2/branches/features/host-ng/firmware/apps/app_common_v2.c
   usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc
Log:
firmware now works again

Modified: usrp2/branches/features/host-ng/firmware/apps/app_common_v2.c
===================================================================
--- usrp2/branches/features/host-ng/firmware/apps/app_common_v2.c       
2008-06-18 21:15:39 UTC (rev 8615)
+++ usrp2/branches/features/host-ng/firmware/apps/app_common_v2.c       
2008-06-18 23:50:56 UTC (rev 8616)
@@ -297,7 +297,7 @@
 
     switch(gp->opcode){
     case OP_EOP:               // end of subpackets
-      break;
+      goto end_of_subpackets;
 
     case OP_ID:
       subpktlen = op_id_cmd(gp, reply_payload, reply_payload_space);
@@ -346,6 +346,8 @@
     reply_payload_space -= subpktlen;
   }
 
+ end_of_subpackets:
+
   // add the EOP marker
   subpktlen = add_eop(reply_payload, reply_payload_space);
   subpktlen = (subpktlen + 3) & ~3;    // bump to a multiple of 4

Modified: usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc
===================================================================
--- usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc   2008-06-18 
21:15:39 UTC (rev 8615)
+++ usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc   2008-06-18 
23:50:56 UTC (rev 8616)
@@ -109,7 +109,7 @@
       std::cerr << std::endl
                 << "usrp2 destructor: received " << d_num_rx_frames 
                << " frames, with " << d_num_rx_lost << " lost ("
-               << (int)(100.0*d_num_rx_lost/d_num_rx_frames)
+               << (d_num_rx_frames == 0 ? 0 : 
(int)(100.0*d_num_rx_lost/d_num_rx_frames))
                << "%), totaling " << d_num_rx_bytes
                << " bytes" << std::endl;
     }