[Commit-gnuradio] r4064 - in gnuradio/branches/developers/jcorgan/hier: . config gnuradio-core/src/lib/general gr-audio-portaudio/src gr-error-correcting-codes/src gr-howto-write-a-block/doc gr-trellis/doc gr-video-sdl/src mblock/doc pmt/doc usrp/doc usrp/firmware/src/usrp2

[jcorgan]

Author: jcorgan
Date: 2006-12-11 22:54:24 -0700 (Mon, 11 Dec 2006)
New Revision: 4064

Added:
   gnuradio/branches/developers/jcorgan/hier/README.organization
Modified:
   gnuradio/branches/developers/jcorgan/hier/README
   gnuradio/branches/developers/jcorgan/hier/config/gr_scripting.m4
   gnuradio/branches/developers/jcorgan/hier/config/grc_gr_wxgui.m4
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_firdes.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_throttle.cc
   gnuradio/branches/developers/jcorgan/hier/gr-audio-portaudio/src/Makefile.am
   
gnuradio/branches/developers/jcorgan/hier/gr-error-correcting-codes/src/Makefile.am
   
gnuradio/branches/developers/jcorgan/hier/gr-howto-write-a-block/doc/Makefile.am
   gnuradio/branches/developers/jcorgan/hier/gr-trellis/doc/Makefile.am
   
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_s.cc
   
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_uc.cc
   gnuradio/branches/developers/jcorgan/hier/mblock/doc/Makefile.am
   gnuradio/branches/developers/jcorgan/hier/pmt/doc/Makefile.am
   gnuradio/branches/developers/jcorgan/hier/run_tests.sh.in
   gnuradio/branches/developers/jcorgan/hier/usrp/doc/Makefile.am
   gnuradio/branches/developers/jcorgan/hier/usrp/firmware/src/usrp2/Makefile.am
Log:
Merged trunk r3910:4063 into developer branch.

Modified: gnuradio/branches/developers/jcorgan/hier/README
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/README    2006-12-11 17:23:53 UTC 
(rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/README    2006-12-12 05:54:24 UTC 
(rev 4064)
@@ -179,8 +179,7 @@
 
 (8) Simple Wrapper Interface Generator.  http://www.swig.org
 
-These versions are known to work:
-  1.3.23, 1.3.24, 1.3.25, 1.3.27, 1.3.28, 1.3.29
+As of repository version 4045, gnuradio requires version 1.3.31 or newer.
 
 
 (9) SDCC: Small Device C Compiler.  http://sdcc.sourceforge.net/
@@ -201,7 +200,11 @@
 As a last resort, build it from source (not recommended!)
 http://www.wxpython.org
 
+(11) xmlto version ? or later.   http://cyberelk.net/tim/xmlto/index.html
 
+Wrapper for XML conversion tools to ease e.g. making html from docbook.
+
+
 ----------------------------------------------------------------
 
 If you've got doxygen installed and provide the --enable-doxygen

Copied: gnuradio/branches/developers/jcorgan/hier/README.organization (from rev 
4063, gnuradio/trunk/README.organization)
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/README.organization               
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/hier/README.organization       
2006-12-12 05:54:24 UTC (rev 4064)
@@ -0,0 +1,34 @@
+[This file is currently not baked and does not claim to represent
+consensus.]
+
+This file describes the current organization of the GNU Radio source
+tree.  It is intended to be both descriptive and normative.
+
+The big issues are:
+
+1) Should we separate by "code needed to implement protocol/modulation
+foo", or related blocks. to (that are therefore not so likely to be
+used together).
+
+2) How do m-blocks impact organization?  If m-blocks are in a separate
+module, which seems reasonable, then do we have most modules depend on
+m-blocks rather than just core, or do we have two versions of blocks -
+the classic continuous block and the m-block wrapped block?  If
+m-blocks become the main path, what will be less awkward?
+
+3) Because some (ADROIT at BBN) have proposed to implement MACs in
+click instead of GNU Radio, should we have a clean separation of
+MAC/PHY within GNU Radio, to facilitate using MACs implemented in
+various places?
+
+
+The immediate question is how to integrate the 802.11 implementation
+done by BBN, available at:
+
+  http://acert.ir.bbn.com/viewvc/adroitgrdevel/adroitgrdevel/gr-bbn/
+
+This contains blocks at various places in the stack, and gdt believs
+that putting them in an 802.11 module will lead to less reuse and less
+of a tendency to generalize.
+
+[need pointers to existing documentation of big picture and what's where]

Modified: gnuradio/branches/developers/jcorgan/hier/config/gr_scripting.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/config/gr_scripting.m4    
2006-12-11 17:23:53 UTC (rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/config/gr_scripting.m4    
2006-12-12 05:54:24 UTC (rev 4064)
@@ -24,7 +24,7 @@
   AC_REQUIRE([AC_PROG_CXX])
   AC_REQUIRE([AC_PROG_LIBTOOL])
 
-  SWIG_PROG(1.3.23)
+  SWIG_PROG(1.3.31)
   SWIG_ENABLE_CXX
   SWIG_PYTHON
 ])

Modified: gnuradio/branches/developers/jcorgan/hier/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/config/grc_gr_wxgui.m4    
2006-12-11 17:23:53 UTC (rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/config/grc_gr_wxgui.m4    
2006-12-12 05:54:24 UTC (rev 4064)
@@ -26,9 +26,7 @@
          gr-wxgui/src/python/Makefile \
     ])
 
-    # FIXME: this breaks pkgsrc by calling python without a version number
-    # gdt--patch welcome :-)
-    if python -c 'import wx'; then
+    if ${PYTHON} -c 'import wx'; then
        passed=yes
     else
        passed=no

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_firdes.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_firdes.cc
        2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_firdes.cc
        2006-12-12 05:54:24 UTC (rev 4064)
@@ -272,7 +272,7 @@
 
   for (int n = -M; n <= M; n++){
     if (n == 0)
-      taps[n + M] = (1.0 + (fwT0 - fwT1)) / M_PI * w[n + M];
+      taps[n + M] = 1.0 + ((fwT0 - fwT1) / M_PI * w[n + M]);
     else {
       taps[n + M] =  (sin (n * fwT0) - sin (n * fwT1)) / (n * M_PI) * w[n + M];
     }

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_throttle.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_throttle.cc
      2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/general/gr_throttle.cc
      2006-12-12 05:54:24 UTC (rev 4064)
@@ -32,6 +32,9 @@
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
+#if !defined(HAVE_NANOSLEEP) && defined(HAVE_SSLEEP)
+#include <windows.h>
+#endif
 
 
 #ifdef HAVE_NANOSLEEP
@@ -80,7 +83,7 @@
   const char *in = (const char *) input_items[0];
   char *out = (char *) output_items[0];
 
-#if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_NANOSLEEP)
+#if defined(HAVE_GETTIMEOFDAY)
   //
   // If our average sample rate exceeds our target sample rate,
   // delay long enough to reduce to our target rate.
@@ -96,10 +99,14 @@
   double actual_samples_per_sec = d_total_samples / t;
   if (actual_samples_per_sec > d_samples_per_sec){     // need to delay
     double delay = d_total_samples / d_samples_per_sec - t;
+#ifdef HAVE_NANOSLEEP
     struct timespec ts;
     ts.tv_sec = (time_t)floor(delay);
     ts.tv_nsec = (long)((delay - floor(delay)) * 1e9);
     gr_nanosleep(&ts);
+#elif HAVE_SSLEEP
+    Sleep( (DWORD)(delay*1000) );
+#endif
   }
 #endif  
 

Modified: 
gnuradio/branches/developers/jcorgan/hier/gr-audio-portaudio/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gr-audio-portaudio/src/Makefile.am    
    2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/gr-audio-portaudio/src/Makefile.am    
    2006-12-12 05:54:24 UTC (rev 4064)
@@ -49,7 +49,7 @@
 ourpython_PYTHON =                     \
        audio_portaudio.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(PORTAUDIO_CFLAGS)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) -I/usr/include
 

Modified: 
gnuradio/branches/developers/jcorgan/hier/gr-error-correcting-codes/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gr-error-correcting-codes/src/Makefile.am
 2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/gr-error-correcting-codes/src/Makefile.am
 2006-12-12 05:54:24 UTC (rev 4064)
@@ -22,5 +22,3 @@
 SUBDIRS = lib python
 
 MOSTLYCLEANFILES = *~
-
-CONFIG_CLEAN_FILES = *.in

Modified: 
gnuradio/branches/developers/jcorgan/hier/gr-howto-write-a-block/doc/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gr-howto-write-a-block/doc/Makefile.am
    2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/gr-howto-write-a-block/doc/Makefile.am
    2006-12-12 05:54:24 UTC (rev 4064)
@@ -54,19 +54,19 @@
 
 
 gr_block.h.xml: $(GNURADIO_CORE_INCLUDEDIR)/gr_block.h make_numbered_listing.py
-       ./make_numbered_listing.py $<
+       ./make_numbered_listing.py $(GNURADIO_CORE_INCLUDEDIR)/gr_block.h
 
 howto_square_ff.cc.xml: $(top_srcdir)/src/lib/howto_square_ff.cc 
make_numbered_listing.py
-       ./make_numbered_listing.py $<
+       ./make_numbered_listing.py $(top_srcdir)/src/lib/howto_square_ff.cc 
 
 howto_square_ff.h.xml: $(top_srcdir)/src/lib/howto_square_ff.h 
make_numbered_listing.py
-       ./make_numbered_listing.py $<
+       ./make_numbered_listing.py $(top_srcdir)/src/lib/howto_square_ff.h 
 
 howto_square2_ff.cc.xml: $(top_srcdir)/src/lib/howto_square2_ff.cc 
make_numbered_listing.py
-       ./make_numbered_listing.py $<
+       ./make_numbered_listing.py $(top_srcdir)/src/lib/howto_square2_ff.cc 
 
 howto_square2_ff.h.xml: $(top_srcdir)/src/lib/howto_square2_ff.h 
make_numbered_listing.py
-       ./make_numbered_listing.py $<
+       ./make_numbered_listing.py $(top_srcdir)/src/lib/howto_square2_ff.h 
 
 
 # ----------------------------------------------------------------

Modified: gnuradio/branches/developers/jcorgan/hier/gr-trellis/doc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/gr-trellis/doc/Makefile.am        
2006-12-11 17:23:53 UTC (rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/gr-trellis/doc/Makefile.am        
2006-12-12 05:54:24 UTC (rev 4064)
@@ -44,8 +44,8 @@
 
 # ----------------------------------------------------------------
 
-%.html : %.xml
-       xmlto html-nochunks $<
+gr-trellis.html : gr-trellis.xml
+       xmlto html-nochunks $(top_srcdir)/gr-trellis/doc/gr-trellis.xml
 
 %.xml : % make_numbered_listing.py
        ./make_numbered_listing.py $<

Modified: 
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_s.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_s.cc  
    2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_s.cc  
    2006-12-12 05:54:24 UTC (rev 4064)
@@ -28,7 +28,6 @@
 
 #include <video_sdl_sink_s.h>
 #include <gr_io_signature.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

Modified: 
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_uc.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_uc.cc 
    2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/gr-video-sdl/src/video_sdl_sink_uc.cc 
    2006-12-12 05:54:24 UTC (rev 4064)
@@ -28,7 +28,6 @@
 
 #include <video_sdl_sink_uc.h>
 #include <gr_io_signature.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

Modified: gnuradio/branches/developers/jcorgan/hier/mblock/doc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/mblock/doc/Makefile.am    
2006-12-11 17:23:53 UTC (rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/mblock/doc/Makefile.am    
2006-12-12 05:54:24 UTC (rev 4064)
@@ -39,5 +39,6 @@
 clean:
        -rm -f $(TARGETS) $(BUILT_XML_FILES)
 
-%.html : %.xml
-       xmlto html-nochunks $<
+# This is non-portable pattern rule.
+#%.html : %.xml
+#      xmlto html-nochunks $<

Modified: gnuradio/branches/developers/jcorgan/hier/pmt/doc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/pmt/doc/Makefile.am       
2006-12-11 17:23:53 UTC (rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/pmt/doc/Makefile.am       
2006-12-12 05:54:24 UTC (rev 4064)
@@ -39,5 +39,6 @@
 clean:
        -rm -f $(TARGETS) $(BUILT_XML_FILES)
 
-%.html : %.xml
-       xmlto html-nochunks $<
+# This is non-portable pattern rule.
+#%.html : %.xml
+#      xmlto html-nochunks $<

Modified: gnuradio/branches/developers/jcorgan/hier/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/run_tests.sh.in   2006-12-11 
17:23:53 UTC (rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/run_tests.sh.in   2006-12-12 
05:54:24 UTC (rev 4064)
@@ -21,7 +21,7 @@
 address@hidden@/gnuradio-core/src/python
 
 # Where to find core's master library files
address@hidden@/gnuradio-core/src/lib
address@hidden@/gnuradio-core/src/lib
 grlibdir=$grlibdir:$grlibdir/.libs
 
 # Construct search path for python modules

Modified: gnuradio/branches/developers/jcorgan/hier/usrp/doc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/usrp/doc/Makefile.am      
2006-12-11 17:23:53 UTC (rev 4063)
+++ gnuradio/branches/developers/jcorgan/hier/usrp/doc/Makefile.am      
2006-12-12 05:54:24 UTC (rev 4064)
@@ -52,7 +52,7 @@
 docbook-html: usrp_guide.html
 
 usrp_guide.html: usrp_guide.xml
-       xmlto html-nochunks $<
+       xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(docdir)

Modified: 
gnuradio/branches/developers/jcorgan/hier/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/usrp/firmware/src/usrp2/Makefile.am   
    2006-12-11 17:23:53 UTC (rev 4063)
+++ 
gnuradio/branches/developers/jcorgan/hier/usrp/firmware/src/usrp2/Makefile.am   
    2006-12-12 05:54:24 UTC (rev 4064)
@@ -95,10 +95,10 @@
                -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
 .a51.rel:
-       test -f `basename '$<'` || ln -s '$<' .
+       test -f `basename '$<'` || $(LN_S) '$<' .
        test -f ../common/`basename '$<'` -o \
                \! -f `dirname '$<'`/../common/`basename '$<'` \
-               || ln -s `dirname '$<'`/../common/`basename '$<'` ../common/.
+               || $(LN_S) `dirname '$<'`/../common/`basename '$<'` 
../common/`basename '$<'`
        $(XAS) `basename '$<'`