[Commit-gnuradio] r7947 - in gnuradio/branches/developers/eb/gcell-wip: . src/apps src/lib/spu

[eb]

Author: eb
Date: 2008-03-05 15:02:33 -0700 (Wed, 05 Mar 2008)
New Revision: 7947

Modified:
   gnuradio/branches/developers/eb/gcell-wip/Makefile.common.spu
   gnuradio/branches/developers/eb/gcell-wip/src/apps/Makefile.am
   gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_main.c
Log:
work-in-progress

Modified: gnuradio/branches/developers/eb/gcell-wip/Makefile.common.spu
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/Makefile.common.spu       
2008-03-05 21:50:21 UTC (rev 7946)
+++ gnuradio/branches/developers/eb/gcell-wip/Makefile.common.spu       
2008-03-05 22:02:33 UTC (rev 7947)
@@ -31,7 +31,7 @@
 
 CPPFLAGS=
 LDFLAGS=
-CFLAGS = -O3 --std=gnu99 -fstrict-aliasing $(WARNINGS)
+CFLAGS = -O3 -g --std=gnu99 -fstrict-aliasing $(WARNINGS)
 # -funroll-all-loops
 
 include $(top_srcdir)/Makefile.common

Modified: gnuradio/branches/developers/eb/gcell-wip/src/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/apps/Makefile.am      
2008-03-05 21:50:21 UTC (rev 7946)
+++ gnuradio/branches/developers/eb/gcell-wip/src/apps/Makefile.am      
2008-03-05 22:02:33 UTC (rev 7947)
@@ -30,14 +30,12 @@
 LIBGCELL_QA = $(top_builddir)/src/lib/libgcell-qa.la
 
 
-noinst_PROGRAMS = \
+bin_PROGRAMS = \
+       test_all \
        benchmark_dma \
        benchmark_nop
 
-bin_PROGRAMS = \
-       test_all
 
-
 test_all_SOURCES = test_all.cc
 test_all_LDADD = $(LIBGCELL_QA) $(LIBGCELL)
 

Modified: gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_main.c
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_main.c     
2008-03-05 21:50:21 UTC (rev 7946)
+++ gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_main.c     
2008-03-05 22:02:33 UTC (rev 7947)
@@ -59,7 +59,7 @@
 static int get_tag;            // 1 tag for job arg gets
 static int put_tags;           // 2 tags for job arg puts
 
-static int pbi = 0;            // current put buffer index (0 or 1)
+static int pb_idx = 0;         // current put buffer index (0 or 1)
 
 // bitmask (bit per put buffer): bit is set if DMA is started but not complete
 static int put_in_progress = 0;
@@ -278,20 +278,20 @@
       unsigned char *get_t = get_base;
       unsigned int   total_get_dma_len = 0;
 
-      unsigned char *put_base = _gci_putbuf[pbi];
+      unsigned char *put_base = _gci_putbuf[pb_idx];
       unsigned char *put_t = put_base;
       unsigned int   total_put_alloc = 0;
-      int           put_tag = put_tags + pbi;
+      int           put_tag = put_tags + pb_idx;
 
       // Do we have any "put" args?  If so ensure that previous
       // dma from this buffer is complete
 
       if ((jd->sys.direction_union & GCJD_DMA_PUT)
-         && (put_in_progress & PBI_MASK(pbi))){
+         && (put_in_progress & PBI_MASK(pb_idx))){
 
        mfc_write_tag_mask(1 << put_tag);       // the tag we're interested in
        mfc_read_tag_status_all();              // wait for DMA to complete
-       put_in_progress &= ~(PBI_MASK(pbi));
+       put_in_progress &= ~(PBI_MASK(pb_idx));
       }
 
 
@@ -508,8 +508,8 @@
          }
        }
        if (started_dma){
-         put_in_progress |= PBI_MASK(pbi);             // note it's running
-         pbi ^= 1;                                     // toggle current buffer
+         put_in_progress |= PBI_MASK(pb_idx);          // note it's running
+         pb_idx ^= 1;                                  // toggle current buffer
        }
       }
     }