[Commit-gnuradio] r8489 - usrp2/trunk/firmware/lib

[eb]

Author: eb
Date: 2008-05-25 18:12:52 -0600 (Sun, 25 May 2008)
New Revision: 8489

Modified:
   usrp2/trunk/firmware/lib/dbsm.c
Log:
Fixed erratic "Can't find USRP2" problem, that occurred after multiple runs.
Merged eb/u2-firmware 8487:8488 into trunk.


Modified: usrp2/trunk/firmware/lib/dbsm.c
===================================================================
--- usrp2/trunk/firmware/lib/dbsm.c     2008-05-25 22:40:33 UTC (rev 8488)
+++ usrp2/trunk/firmware/lib/dbsm.c     2008-05-26 00:12:52 UTC (rev 8489)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -284,13 +284,13 @@
 {
   if (buffer_state[sm->buf0] == BS_EMPTYING){
     // wait for xfer to complete
-    int mask = BPS_DONE(sm->buf0) | BPS_ERROR(sm->buf0);
+    int mask = BPS_DONE(sm->buf0) | BPS_ERROR(sm->buf0) | BPS_IDLE(sm->buf0);
     while ((buffer_pool_status->status & mask) == 0)
       ;
   }
   else if (buffer_state[sm->buf0 ^ 1] == BS_EMPTYING){
     // wait for xfer to complete
-    int mask = BPS_DONE(sm->buf0 ^ 1) | BPS_ERROR(sm->buf0 ^ 1);
+    int mask = BPS_DONE(sm->buf0 ^ 1) | BPS_ERROR(sm->buf0 ^ 1) | 
BPS_IDLE(sm->buf0 ^ 1);
     while ((buffer_pool_status->status & mask) == 0)
       ;
   }