[Commit-gnuradio] r10897 - in gnuradio/branches/developers/eb/vrt: . config vrt vrt/include vrt/include/vrt vrt/lib

[eb]

Author: eb
Date: 2009-04-22 21:56:05 -0600 (Wed, 22 Apr 2009)
New Revision: 10897

Added:
   gnuradio/branches/developers/eb/vrt/config/grc_vrt.m4
   gnuradio/branches/developers/eb/vrt/vrt/Makefile.am
   gnuradio/branches/developers/eb/vrt/vrt/include/Makefile.am
   gnuradio/branches/developers/eb/vrt/vrt/include/vrt/Makefile.am
   gnuradio/branches/developers/eb/vrt/vrt/lib/Makefile.am
   gnuradio/branches/developers/eb/vrt/vrt/lib/rx_packet_handler.cc
   gnuradio/branches/developers/eb/vrt/vrt/vrt.pc.in
Modified:
   gnuradio/branches/developers/eb/vrt/config/Makefile.am
   gnuradio/branches/developers/eb/vrt/configure.ac
   gnuradio/branches/developers/eb/vrt/vrt/
   gnuradio/branches/developers/eb/vrt/vrt/include/
   gnuradio/branches/developers/eb/vrt/vrt/include/vrt/
   gnuradio/branches/developers/eb/vrt/vrt/include/vrt/expanded_headers.h
   gnuradio/branches/developers/eb/vrt/vrt/include/vrt/rx_packet_handler.h
   gnuradio/branches/developers/eb/vrt/vrt/lib/
   gnuradio/branches/developers/eb/vrt/vrt/lib/expanded_headers.cc
Log:
checkpoint

Modified: gnuradio/branches/developers/eb/vrt/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/vrt/config/Makefile.am      2009-04-23 
03:13:47 UTC (rev 10896)
+++ gnuradio/branches/developers/eb/vrt/config/Makefile.am      2009-04-23 
03:56:05 UTC (rev 10897)
@@ -69,6 +69,7 @@
        grc_gr_wxgui.m4 \
        grc_mblock.m4 \
        grc_gruel.m4 \
+       grc_vrt.m4 \
        gr_check_createfilemapping.m4 \
        gr_check_mc4020.m4 \
        gr_check_shm_open.m4 \

Copied: gnuradio/branches/developers/eb/vrt/config/grc_vrt.m4 (from rev 10893, 
gnuradio/branches/developers/eb/vrt/config/grc_usrp2.m4)
===================================================================
--- gnuradio/branches/developers/eb/vrt/config/grc_vrt.m4                       
        (rev 0)
+++ gnuradio/branches/developers/eb/vrt/config/grc_vrt.m4       2009-04-23 
03:56:05 UTC (rev 10897)
@@ -0,0 +1,50 @@
+dnl Copyright 2008,2009 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_VRT],[
+    GRC_ENABLE(vrt)
+
+    dnl If execution gets to here, $passed will be:
+    dnl   with : if the --with code didn't error out
+    dnl   yes  : if the --enable code passed muster and all dependencies are 
met
+    dnl   no   : otherwise
+    if test $passed = yes; then
+       dnl Needed for vrt_socket_opener
+       AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h 
sys/un.h)
+    fi
+    if test $passed != with; then
+       dnl how and where to find INCLUDES and LA
+       VRT_INCLUDES="-I\${abs_top_srcdir}/vrt/include"
+        VRT_LA="\${abs_top_builddir}/vrt/lib/libvrt.la"
+    fi
+
+    dnl Include the vrt INCLUDES and LA
+    AC_SUBST(VRT_INCLUDES)
+    AC_SUBST(VRT_LA)
+
+    AC_CONFIG_FILES([
+        vrt/Makefile
+        vrt/vrt.pc
+        vrt/include/Makefile
+        vrt/include/vrt/Makefile
+        vrt/lib/Makefile
+    ])
+
+    GRC_BUILD_CONDITIONAL(vrt)
+])

Modified: gnuradio/branches/developers/eb/vrt/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/vrt/configure.ac    2009-04-23 03:13:47 UTC 
(rev 10896)
+++ gnuradio/branches/developers/eb/vrt/configure.ac    2009-04-23 03:56:05 UTC 
(rev 10897)
@@ -275,6 +275,7 @@
 GRC_MBLOCK                     dnl this must come after GRC_PMT
 GRC_USRP
 GRC_USRP2
+GRC_VRT
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_USRP2
 GRC_GR_GCELL                   dnl this must come after GRC_GCELL and 
GRC_GNURADIO_CORE


Property changes on: gnuradio/branches/developers/eb/vrt/vrt
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in
.deps
.libs
*.la
*.lo
vrt.pc


Added: gnuradio/branches/developers/eb/vrt/vrt/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/Makefile.am                         
(rev 0)
+++ gnuradio/branches/developers/eb/vrt/vrt/Makefile.am 2009-04-23 03:56:05 UTC 
(rev 10897)
@@ -0,0 +1,29 @@
+#
+# Copyright 2008,2009 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
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = vrt.pc
+
+EXTRA_DIST = \
+       vrt.pc.in        
+
+SUBDIRS = include lib


Property changes on: gnuradio/branches/developers/eb/vrt/vrt/Makefile.am
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: gnuradio/branches/developers/eb/vrt/vrt/include
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in
.deps
.libs
*.la
*.lo


Added: gnuradio/branches/developers/eb/vrt/vrt/include/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/include/Makefile.am                 
        (rev 0)
+++ gnuradio/branches/developers/eb/vrt/vrt/include/Makefile.am 2009-04-23 
03:56:05 UTC (rev 10897)
@@ -0,0 +1,23 @@
+#
+# Copyright 2009 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
+
+SUBDIRS = vrt


Property changes on: gnuradio/branches/developers/eb/vrt/vrt/include/Makefile.am
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: gnuradio/branches/developers/eb/vrt/vrt/include/vrt
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in
.deps
.libs
*.la
*.lo


Added: gnuradio/branches/developers/eb/vrt/vrt/include/vrt/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/include/vrt/Makefile.am             
                (rev 0)
+++ gnuradio/branches/developers/eb/vrt/vrt/include/vrt/Makefile.am     
2009-04-23 03:56:05 UTC (rev 10897)
@@ -0,0 +1,28 @@
+#
+# Copyright 2008,2009 Free Software Foundation, Inc.
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+INCLUDES = 
+
+vrtincludedir = $(includedir)/vrt
+
+vrtinclude_HEADERS = \
+       expanded_headers.h \
+       rx_packet_handler.h \
+       vrt_bits.h \
+       vrt_rx_udp.h 


Property changes on: 
gnuradio/branches/developers/eb/vrt/vrt/include/vrt/Makefile.am
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: gnuradio/branches/developers/eb/vrt/vrt/include/vrt/expanded_headers.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/include/vrt/expanded_headers.h      
2009-04-23 03:13:47 UTC (rev 10896)
+++ gnuradio/branches/developers/eb/vrt/vrt/include/vrt/expanded_headers.h      
2009-04-23 03:56:05 UTC (rev 10897)
@@ -54,10 +54,10 @@
     bool if_data_p() { return s_if_data[pkt_type()]; }
     bool ext_data_p() { return s_ext_data[pkt_type()]; }
     bool if_context_p() { return (header & VRTH_PT_MASK) == 
VRTH_PT_IF_CONTEXT; }
-    bool ext_context_p() {return (header & VRTH_PT_MASK) == 
VRTH_PT_EXT_CONTEXT; }
+    bool ext_context_p() { return (header & VRTH_PT_MASK) == 
VRTH_PT_EXT_CONTEXT; }
 
-    bool data_p() { return if_data_p() || ext_data_p(); }
-    bool context_p() { return if_context_p() || ext_context_p(); }
+    bool data_p() { return s_data[pkt_type()]; }       // if_data_p() || 
ext_data_p()
+    bool context_p() { return s_context[pkt_type()]; } // if_context_p() || 
ext_context_p()
 
     // optional info predicates
     bool stream_id_p() { return s_stream_id[pkt_type()]; }
@@ -67,6 +67,8 @@
   private:
     static unsigned char s_if_data[16];
     static unsigned char s_ext_data[16];
+    static unsigned char s_data[16];
+    static unsigned char s_context[16];
     static unsigned char s_stream_id[16];
 
   };

Modified: 
gnuradio/branches/developers/eb/vrt/vrt/include/vrt/rx_packet_handler.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/include/vrt/rx_packet_handler.h     
2009-04-23 03:13:47 UTC (rev 10896)
+++ gnuradio/branches/developers/eb/vrt/vrt/include/vrt/rx_packet_handler.h     
2009-04-23 03:56:05 UTC (rev 10897)
@@ -22,6 +22,7 @@
 #define INCLUDED_VRT_RX_PACKET_HANDLER_H
 
 #include <vrt/expanded_headers.h>
+#include <stddef.h>
 
 namespace vrt {
 
@@ -33,7 +34,7 @@
    */
   class rx_packet_handler {
   public:
-    virtual ~rx_sample_handler();
+    virtual ~rx_packet_handler();
 
     /*!
      * \param payload points to the first 32-bit word of the payload field.
@@ -52,7 +53,7 @@
      */
     virtual bool operator()(const uint32_t *payload,
                            size_t n32_bit_words,
-                           const expanded_headers *hdrs);
+                           const expanded_headers *hdrs) = 0;
   };
 
 };  // vrt


Property changes on: gnuradio/branches/developers/eb/vrt/vrt/lib
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in
.deps
.libs
*.la
*.lo


Added: gnuradio/branches/developers/eb/vrt/vrt/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/lib/Makefile.am                     
        (rev 0)
+++ gnuradio/branches/developers/eb/vrt/vrt/lib/Makefile.am     2009-04-23 
03:56:05 UTC (rev 10897)
@@ -0,0 +1,37 @@
+#
+# Copyright 2007,2008,2009 Free Software Foundation, Inc.
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = \
+    $(VRT_INCLUDES) \
+    $(BOOST_CPPFLAGS) \
+    $(CPPUNIT_INCLUDES)
+
+bin_PROGRAMS = 
+
+lib_LTLIBRARIES = \
+       libvrt.la
+
+libvrt_la_SOURCES = \
+       expanded_headers.cc \
+       rx_packet_handler.cc
+
+libvrt_la_LIBADD =
+
+# Private headers not needed for above the API development
+noinst_HEADERS =


Property changes on: gnuradio/branches/developers/eb/vrt/vrt/lib/Makefile.am
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: gnuradio/branches/developers/eb/vrt/vrt/lib/expanded_headers.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/lib/expanded_headers.cc     
2009-04-23 03:13:47 UTC (rev 10896)
+++ gnuradio/branches/developers/eb/vrt/vrt/lib/expanded_headers.cc     
2009-04-23 03:56:05 UTC (rev 10897)
@@ -26,15 +26,24 @@
 
 namespace vrt {
 
-  static unsigned char expanded_headers::s_if_data[16] = {
+  // lookup tables indexed by packet type
+  unsigned char expanded_headers::s_if_data[16] = {
     1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   };
 
-  static unsigned char expanded_headers::s_ext_data[16] = {
+  unsigned char expanded_headers::s_ext_data[16] = {
     0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   };
 
-  static unsigned char expanded_headers::s_stream_id[16] = {
+  unsigned char expanded_headers::s_data[16] = {
+    1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+  };
+
+  unsigned char expanded_headers::s_context[16] = {
+    0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+  };
+
+  unsigned char expanded_headers::s_stream_id[16] = {
     0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   };
 

Added: gnuradio/branches/developers/eb/vrt/vrt/lib/rx_packet_handler.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/lib/rx_packet_handler.cc            
                (rev 0)
+++ gnuradio/branches/developers/eb/vrt/vrt/lib/rx_packet_handler.cc    
2009-04-23 03:56:05 UTC (rev 10897)
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <vrt/rx_packet_handler.h>
+
+namespace vrt {
+
+  rx_packet_handler::~rx_packet_handler(){}
+
+}; // vrt


Property changes on: 
gnuradio/branches/developers/eb/vrt/vrt/lib/rx_packet_handler.cc
___________________________________________________________________
Added: svn:eol-style
   + native

Added: gnuradio/branches/developers/eb/vrt/vrt/vrt.pc.in
===================================================================
--- gnuradio/branches/developers/eb/vrt/vrt/vrt.pc.in                           
(rev 0)
+++ gnuradio/branches/developers/eb/vrt/vrt/vrt.pc.in   2009-04-23 03:56:05 UTC 
(rev 10897)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: vrt
+Description: Host implementation of Virtual Radio Transport (VITA-49)
+Requires: 
+Version: @VERSION@
+Libs: -L${libdir} -lvrt
+Cflags: -I${includedir}