[Commit-gnuradio] r8061 - in gnuradio/branches/developers/eb/trunk-with-gcell: . config gcell/src gcell/src/ibm gcell/src/include gcell/src/include/spu

[eb]

Author: eb
Date: 2008-03-20 00:56:44 -0600 (Thu, 20 Mar 2008)
New Revision: 8061

Added:
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/ibm/Makefile.am
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_delay.h
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_jd_queue.h
Removed:
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_delay.h
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_jd_queue.h
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/spu-include/
Modified:
   gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common
   gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/Makefile.am
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/ibm/
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/Makefile.am
Log:
work-in-progress: moved spu-include to include/spu.  Makefile fixes
for headers, etc.


Modified: gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common    
2008-03-20 06:22:35 UTC (rev 8060)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common    
2008-03-20 06:56:44 UTC (rev 8061)
@@ -28,6 +28,10 @@
 # swig includes
 swigincludedir = $(grincludedir)/swig
 
+# gcell includes
+gcellincludedir = $(includedir)/gcell
+gcellspuincludedir = $(includedir)/gcell/spu
+
 # Install the gnuradio stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4        
2008-03-20 06:22:35 UTC (rev 8060)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4        
2008-03-20 06:56:44 UTC (rev 8061)
@@ -49,7 +49,7 @@
        gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include \
                        -I\${abs_top_srcdir}/gcell/src/lib"
         gcell_LA="\${abs_top_builddir}/gcell/src/lib/libgcell.la"
-       gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/src/spu-include \
+       gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include/spu \
                        -I\${abs_top_srcdir}/gcell/src/include \
                        -I\${abs_top_srcdir}/gcell/src/lib"
        gcell_spu_LA="\${abs_top_builddir}/gcell/src/lib/spu/libgcell_spu.a"
@@ -63,10 +63,11 @@
         gcell/src/Makefile \
         gcell/src/apps/Makefile \
        gcell/src/apps/spu/Makefile \
+       gcell/src/ibm/Makefile \
         gcell/src/include/Makefile \
+        gcell/src/include/spu/Makefile \
         gcell/src/lib/Makefile \
         gcell/src/lib/spu/Makefile \
-        gcell/src/spu-include/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gcell)

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/Makefile.am      
2008-03-20 06:22:35 UTC (rev 8060)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/Makefile.am      
2008-03-20 06:56:44 UTC (rev 8061)
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -18,4 +18,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-SUBDIRS = include lib apps
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = include lib apps ibm


Property changes on: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/ibm
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo



Added: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/ibm/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/ibm/Makefile.am  
                        (rev 0)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/ibm/Makefile.am  
2008-03-20 06:56:44 UTC (rev 8061)
@@ -0,0 +1,98 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+EXTRA_DIST = \
+       ./README \
+       ./sync/ppu_source/atomic_add.h \
+       ./sync/ppu_source/atomic_add_return.h \
+       ./sync/ppu_source/atomic_dec_and_test.h \
+       ./sync/ppu_source/atomic_dec.h \
+       ./sync/ppu_source/atomic_dec_if_positive.h \
+       ./sync/ppu_source/atomic_dec_return.h \
+       ./sync/ppu_source/atomic.h \
+       ./sync/ppu_source/atomic_inc.h \
+       ./sync/ppu_source/atomic_inc_return.h \
+       ./sync/ppu_source/atomic_read.h \
+       ./sync/ppu_source/atomic_set.h \
+       ./sync/ppu_source/atomic_sub_and_test.h \
+       ./sync/ppu_source/atomic_sub.h \
+       ./sync/ppu_source/atomic_sub_return.h \
+       ./sync/ppu_source/complete_all.h \
+       ./sync/ppu_source/complete.h \
+       ./sync/ppu_source/completion.h \
+       ./sync/ppu_source/cond_broadcast.h \
+       ./sync/ppu_source/cond.h \
+       ./sync/ppu_source/cond_init.h \
+       ./sync/ppu_source/cond_signal.h \
+       ./sync/ppu_source/cond_wait.h \
+       ./sync/ppu_source/init_completion.h \
+       ./sync/ppu_source/libsync.h \
+       ./sync/ppu_source/mutex.h \
+       ./sync/ppu_source/mutex_init.h \
+       ./sync/ppu_source/mutex_lock.h \
+       ./sync/ppu_source/mutex_trylock.h \
+       ./sync/ppu_source/mutex_unlock.h \
+       ./sync/ppu_source/pdt_libsync_config.xml \
+       ./sync/ppu_source/pdt_libsync.xml \
+       ./sync/ppu_source/sync_utils.h \
+       ./sync/ppu_source/trace_libsync.h \
+       ./sync/ppu_source/wait_for_completion.h \
+       ./sync/spu_source/atomic_add.h \
+       ./sync/spu_source/atomic_add_return.h \
+       ./sync/spu_source/atomic_dec_and_test.h \
+       ./sync/spu_source/atomic_dec.h \
+       ./sync/spu_source/atomic_dec_if_positive.h \
+       ./sync/spu_source/atomic_dec_return.h \
+       ./sync/spu_source/atomic.h \
+       ./sync/spu_source/atomic_inc.h \
+       ./sync/spu_source/atomic_inc_return.h \
+       ./sync/spu_source/atomic_read.h \
+       ./sync/spu_source/atomic_set.h \
+       ./sync/spu_source/atomic_sub_and_test.h \
+       ./sync/spu_source/atomic_sub.h \
+       ./sync/spu_source/atomic_sub_return.h \
+       ./sync/spu_source/complete_all.h \
+       ./sync/spu_source/complete.h \
+       ./sync/spu_source/completion.h \
+       ./sync/spu_source/cond_broadcast.h \
+       ./sync/spu_source/cond.h \
+       ./sync/spu_source/cond_init.h \
+       ./sync/spu_source/cond_signal.h \
+       ./sync/spu_source/cond_wait.h \
+       ./sync/spu_source/init_completion.h \
+       ./sync/spu_source/libsync.h \
+       ./sync/spu_source/mutex.h \
+       ./sync/spu_source/mutex_init.h \
+       ./sync/spu_source/mutex_lock.h \
+       ./sync/spu_source/mutex_trylock.h \
+       ./sync/spu_source/mutex_unlock.h \
+       ./sync/spu_source/read_lock.h \
+       ./sync/spu_source/read_trylock.h \
+       ./sync/spu_source/read_unlock.h \
+       ./sync/spu_source/rwlock_init.h \
+       ./sync/spu_source/sync_irq.h \
+       ./sync/spu_source/sync_utils.h \
+       ./sync/spu_source/trace_libsync.h \
+       ./sync/spu_source/wait_for_completion.h \
+       ./sync/spu_source/write_lock.h \
+       ./sync/spu_source/write_trylock.h \
+       ./sync/spu_source/write_unlock.h


Property changes on: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/ibm/Makefile.am
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/Makefile.am  
    2008-03-20 06:22:35 UTC (rev 8060)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/Makefile.am  
    2008-03-20 06:56:44 UTC (rev 8061)
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,3 +17,23 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = spu
+
+gcellinclude_HEADERS = \
+       compiler.h \
+       gc_atomic.h \
+       gc_cdefs.h \
+       gc_declare_proc.h \
+       gc_jd_queue_data.h \
+       gc_jd_queue.h \
+       gc_jd_stack.h \
+       gc_job_desc.h \
+       gc_job_desc_private.h \
+       gc_logging.h \
+       gc_mbox.h \
+       gc_spu_args.h \
+       gc_types.h \
+       memory_barrier.h

Copied: gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu 
(from rev 8058, 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/spu-include)

Deleted: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/Makefile.am

Copied: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/Makefile.am
 (from rev 8060, 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/spu-include/Makefile.am)
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/Makefile.am
                          (rev 0)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/Makefile.am
  2008-03-20 06:56:44 UTC (rev 8061)
@@ -0,0 +1,25 @@
+#
+# Copyright 2007,2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+gcellspuinclude_HEADERS = \
+       gc_delay.h \
+       gc_jd_queue.h

Deleted: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_delay.h

Copied: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_delay.h
 (from rev 8060, 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/spu-include/gc_delay.h)
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_delay.h
                           (rev 0)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_delay.h
   2008-03-20 06:56:44 UTC (rev 8061)
@@ -0,0 +1,27 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_GC_DELAY_H
+#define INCLUDED_GC_DELAY_H
+
+void gc_udelay(unsigned int usecs);
+void gc_cdelay(unsigned int cpu_cycles);
+
+#endif /* INCLUDED_GC_DELAY_H */

Deleted: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_jd_queue.h

Copied: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_jd_queue.h
 (from rev 8060, 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/spu-include/gc_jd_queue.h)
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_jd_queue.h
                                (rev 0)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/include/spu/gc_jd_queue.h
        2008-03-20 06:56:44 UTC (rev 8061)
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_SPU_GC_JD_QUEUE_H
+#define INCLUDED_SPU_GC_JD_QUEUE_H
+
+#include "gc_jd_queue_data.h"
+
+/*
+ * Declarations for SPU side of job queue interface
+ */
+
+__GC_BEGIN_DECLS
+
+/*!
+ * \brief Remove and return item at head of queue.
+ *
+ * \param[in]  q is EA address of queue structure.
+ * \param[out] item_ea is EA address of item at head of queue.
+ * \param[out] item is local store copy of item at head of queue.
+ * \returns false if the queue is empty, otherwise returns true
+ *   and sets \p item_ea and DMA's job descriptor into \p item
+ */
+bool
+gc_jd_queue_dequeue(gc_eaddr_t q, gc_eaddr_t *item_ea, gc_job_desc_t *item);
+
+
+/*!
+ * \brief Get a line reservation on the queue
+ *
+ * \param[in]  q is EA address of queue structure.
+ */
+void
+gc_jd_queue_getllar(gc_eaddr_t q);
+
+__GC_END_DECLS
+
+
+#endif /* INCLUDED_SPU_GC_JD_QUEUE_H */