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

[eb]

Author: eb
Date: 2009-01-22 19:12:04 -0700 (Thu, 22 Jan 2009)
New Revision: 10294

Removed:
   gnuradio/trunk/usrp2/firmware/lib/buffer_state.c
   gnuradio/trunk/usrp2/firmware/lib/buffer_state.h
Modified:
   gnuradio/trunk/usrp2/firmware/lib/Makefile.am
   gnuradio/trunk/usrp2/firmware/lib/bsm12.c
   gnuradio/trunk/usrp2/firmware/lib/dbsm.c
Log:
revert extraction of buffer_state

Modified: gnuradio/trunk/usrp2/firmware/lib/Makefile.am
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/Makefile.am       2009-01-23 01:48:58 UTC 
(rev 10293)
+++ gnuradio/trunk/usrp2/firmware/lib/Makefile.am       2009-01-23 02:12:04 UTC 
(rev 10294)
@@ -27,7 +27,6 @@
        ad9777.c \
        bsm12.c \
        buffer_pool.c \
-       buffer_state.c \
        clocks.c \
        db_basic.c \
        db_init.c \
@@ -66,7 +65,6 @@
        bool.h \
        bsm12.h \
        buffer_pool.h \
-       buffer_state.h \
        clocks.h \
        db.h \
        db_base.h \

Modified: gnuradio/trunk/usrp2/firmware/lib/bsm12.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/bsm12.c   2009-01-23 01:48:58 UTC (rev 
10293)
+++ gnuradio/trunk/usrp2/firmware/lib/bsm12.c   2009-01-23 02:12:04 UTC (rev 
10294)
@@ -25,9 +25,17 @@
 #include "buffer_pool.h"
 #include "bool.h"
 #include "nonstdio.h"
-#include "buffer_state.h"
 #include <stdlib.h>
 
+typedef enum {
+  BS_EMPTY,
+  BS_FILLING,
+  BS_FULL,
+  BS_EMPTYING,
+} buffer_state_t;
+
+static buffer_state_t buffer_state[NBUFFERS];
+static unsigned char  buffer_dst[NBUFFERS];    // 0 or 1
 static uint32_t last_send_ctrl[NBUFFERS];
 
 void

Deleted: gnuradio/trunk/usrp2/firmware/lib/buffer_state.c

Deleted: gnuradio/trunk/usrp2/firmware/lib/buffer_state.h

Modified: gnuradio/trunk/usrp2/firmware/lib/dbsm.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/dbsm.c    2009-01-23 01:48:58 UTC (rev 
10293)
+++ gnuradio/trunk/usrp2/firmware/lib/dbsm.c    2009-01-23 02:12:04 UTC (rev 
10294)
@@ -25,9 +25,17 @@
 #include "buffer_pool.h"
 #include "bool.h"
 #include "nonstdio.h"
-#include "buffer_state.h"
 #include <stdlib.h>
 
+typedef enum {
+  BS_EMPTY,
+  BS_FILLING,
+  BS_FULL,
+  BS_EMPTYING,
+} buffer_state_t;
+
+static buffer_state_t buffer_state[NBUFFERS];
+
 bool
 dbsm_nop_inspector(dbsm_t *sm, int buf_this)
 {