[Commit-gnuradio] r7889 - gnuradio/branches/developers/eb/gcell-wip/src/lib/spu

[eb]

Author: eb
Date: 2008-02-28 21:11:35 -0700 (Thu, 28 Feb 2008)
New Revision: 7889

Removed:
   gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/sys_tags.c
   gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/sys_tags.h
Modified:
   gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/Makefile.am
   gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_spu_jd_queue.c
   gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gcell_spu_main.c
Log:
work-in-progress on supporting user SPU code

Modified: gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/Makefile.am   
2008-02-29 04:00:13 UTC (rev 7888)
+++ gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/Makefile.am   
2008-02-29 04:11:35 UTC (rev 7889)
@@ -31,8 +31,7 @@
        gc_delay.c \
        gc_spu_jd_queue.c \
        gc_spu_procs.c \
-       spu_buffers.c \
-       sys_tags.c
+       spu_buffers.c
 
 
 # SPU executables

Modified: 
gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_spu_jd_queue.c
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_spu_jd_queue.c     
2008-02-29 04:00:13 UTC (rev 7888)
+++ gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gc_spu_jd_queue.c     
2008-02-29 04:11:35 UTC (rev 7889)
@@ -22,8 +22,9 @@
 #include "gc_jd_queue.h"
 #include "mutex_lock.h"
 #include "mutex_unlock.h"
-#include "sys_tags.h"
 
+extern int gc_sys_tag;
+
 bool
 gc_jd_queue_dequeue(gc_eaddr_t q, gc_eaddr_t *item_ea, gc_job_desc_t *item)
 {
@@ -35,8 +36,8 @@
   // the lock unless there is something in the queue.
 
   // copy in the queue structure
-  mfc_get(&local_q, q, sizeof(gc_jd_queue_t), sys_tag, 0, 0);
-  mfc_write_tag_mask(1 << sys_tag);    // the tag we're interested in
+  mfc_get(&local_q, q, sizeof(gc_jd_queue_t), gc_sys_tag, 0, 0);
+  mfc_write_tag_mask(1 << gc_sys_tag); // the tag we're interested in
   mfc_read_tag_status_all();           // wait for DMA to complete
 
   if (local_q.head == 0){              // empty
@@ -49,8 +50,8 @@
   _mutex_lock(q + offsetof(gc_jd_queue_t, mutex));
 
   // copy in the queue structure
-  mfc_get(&local_q, q, sizeof(gc_jd_queue_t), sys_tag, 0, 0);
-  mfc_write_tag_mask(1 << sys_tag);    // the tag we're interested in
+  mfc_get(&local_q, q, sizeof(gc_jd_queue_t), gc_sys_tag, 0, 0);
+  mfc_write_tag_mask(1 << gc_sys_tag); // the tag we're interested in
   mfc_read_tag_status_all();           // wait for DMA to complete
 
   if (local_q.head == 0){              // empty
@@ -60,7 +61,7 @@
 
   // copy in job descriptor at head of queue
   *item_ea = local_q.head;
-  mfc_get(item, local_q.head, sizeof(gc_job_desc_t), sys_tag, 0, 0);
+  mfc_get(item, local_q.head, sizeof(gc_job_desc_t), gc_sys_tag, 0, 0);
   mfc_read_tag_status_all();           // wait for DMA to complete
 
   local_q.head = item->sys.next;
@@ -70,7 +71,7 @@
 
 
   // copy the queue structure back out
-  mfc_put(&local_q, q, sizeof(gc_jd_queue_t), sys_tag, 0, 0);
+  mfc_put(&local_q, q, sizeof(gc_jd_queue_t), gc_sys_tag, 0, 0);
   mfc_read_tag_status_all();           // wait for DMA to complete
 
   // FIXME do we need to order stores in EA or can we just clear the

Modified: gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gcell_spu_main.c
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gcell_spu_main.c      
2008-02-29 04:00:13 UTC (rev 7888)
+++ gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/gcell_spu_main.c      
2008-02-29 04:11:35 UTC (rev 7889)
@@ -26,7 +26,6 @@
 #include "gc_spu_args.h"
 #include "gc_job_desc.h"
 #include "gc_mbox.h"
-#include "sys_tags.h"
 #include "gc_jd_queue.h"
 #include "gc_delay.h"
 #include "gc_spu_procs.h"
@@ -48,6 +47,7 @@
 
 #define USE_LLR_LOST_EVENT     0       // define to 0 or 1
 
+int                    gc_sys_tag;     // tag for misc DMA operations
 static gc_spu_args_t   spu_args;
 
 // ------------------------------------------------------------------------
@@ -630,14 +630,14 @@
      unsigned long long argp,
      unsigned long long envp __attribute__((unused)))
 {
-  sys_tags_init();
+  gc_sys_tag = mfc_tag_reserve();      // allocate a tag for our misc DMA 
operations
   ci_tags  = mfc_multi_tag_reserve(2);
   put_tags = mfc_multi_tag_reserve(2);
   get_tag  = mfc_tag_reserve();
 
   // dma the args in
-  mfc_get(&spu_args, argp, sizeof(spu_args), sys_tag, 0, 0);
-  mfc_write_tag_mask(1 << sys_tag);    // the tag we're interested in
+  mfc_get(&spu_args, argp, sizeof(spu_args), gc_sys_tag, 0, 0);
+  mfc_write_tag_mask(1 << gc_sys_tag); // the tag we're interested in
   mfc_read_tag_status_all();           // wait for DMA to complete
 
   backoff_init();              // initialize backoff parameters

Deleted: gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/sys_tags.c

Deleted: gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/sys_tags.h