[Commit-gnuradio] r11382 - in gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host: apps include/usrp lib/legacy

[jcorgan]

Author: jcorgan
Date: 2009-07-08 17:05:54 -0600 (Wed, 08 Jul 2009)
New Revision: 11382

Added:
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/usrp_local_sighandler.h
Removed:
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/usrp_local_sighandler.h
Modified:
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_rx.cc
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_tx.cc
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrp_cal_dc_offset.cc
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrper.cc
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/usrp_local_sighandler.cc
Log:
usrp/host/apps compiling

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_rx.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_rx.cc
   2009-07-08 22:36:06 UTC (rev 11381)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_rx.cc
   2009-07-08 23:05:54 UTC (rev 11382)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2006,2008 Free Software Foundation, Inc.
+ * Copyright 2003,2006,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -33,8 +33,8 @@
 #include <assert.h>
 #include <math.h>
 #include "time_stuff.h"
-#include "usrp_standard.h"
-#include "usrp_bytesex.h"
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 #include "fpga_regs_common.h"
 #include "fpga_regs_standard.h"
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_tx.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_tx.cc
   2009-07-08 22:36:06 UTC (rev 11381)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/test_usrp_standard_tx.cc
   2009-07-08 23:05:54 UTC (rev 11382)
@@ -34,8 +34,8 @@
 #include <assert.h>
 #include <math.h>
 #include "time_stuff.h"
-#include "usrp_standard.h"
-#include "usrp_bytesex.h"
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 #include <boost/program_options.hpp>
 
 enum {

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrp_cal_dc_offset.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrp_cal_dc_offset.cc
      2009-07-08 22:36:06 UTC (rev 11381)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrp_cal_dc_offset.cc
      2009-07-08 23:05:54 UTC (rev 11382)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2008 Free Software Foundation, Inc.
+ * Copyright 2005,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -33,9 +33,9 @@
 #include <assert.h>
 #include <math.h>
 #include <boost/scoped_ptr.hpp>
-#include "usrp_local_sighandler.h"
-#include "usrp_standard.h"
-#include "usrp_bytesex.h"
+#include <usrp/usrp_local_sighandler.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 char *prog_name;
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrper.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrper.cc  
2009-07-08 22:36:06 UTC (rev 11381)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps/usrper.cc  
2009-07-08 23:05:54 UTC (rev 11382)
@@ -2,7 +2,7 @@
 /*
  * USRP - Universal Software Radio Peripheral
  *
- * Copyright (C) 2003,2004 Free Software Foundation, Inc.
+ * Copyright (C) 2003,2004,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
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "usrp_prims.h"
+#include "usrp/usrp_prims.h"
 #include "usrp_spi_defs.h"
 #include <string.h>
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
        2009-07-08 22:36:06 UTC (rev 11381)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
        2009-07-08 23:05:54 UTC (rev 11382)
@@ -36,6 +36,7 @@
        usrp_basic.h \
        usrp_bytesex.h \
        usrp_dbid.h \
+       usrp_local_sighandler.h \
        usrp_prims.h \
        usrp_slots.h \
        usrp_standard.h \

Copied: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/usrp_local_sighandler.h
 (from rev 11377, 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/usrp_local_sighandler.h)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/usrp_local_sighandler.h
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/usrp_local_sighandler.h
    2009-07-08 23:05:54 UTC (rev 11382)
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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 GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_USRP_LOCAL_SIGHANDLER_H
+#define INCLUDED_USRP_LOCAL_SIGHANDLER_H
+
+#include <signal.h>
+#include <string>
+
+/*!
+ * \brief Representation of signal.
+ */
+class usrp_signal
+{
+  int  d_signum;
+public:
+  usrp_signal (int signum) : d_signum (signum) {}
+  int signal () const { return d_signum; }
+  std::string name () const;
+};
+
+
+/*!
+ * \brief Get and set signal handler.
+ *
+ * Constructor installs new handler, destructor reinstalls
+ * original value.
+ */
+class usrp_local_sighandler {
+  int                  d_signum;
+#ifdef HAVE_SIGACTION
+  struct sigaction     d_old_action;
+#endif
+public:
+  usrp_local_sighandler (int signum, void (*new_handler)(int));
+  ~usrp_local_sighandler ();
+
+  /* throw usrp_signal (signum) */
+  static void throw_signal (int signum) throw (usrp_signal);
+};
+
+#endif /* INCLUDED_USRP_LOCAL_SIGHANDLER_H */


Property changes on: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/usrp_local_sighandler.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_local_sighandler.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_local_sighandler.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_local_sighandler.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_local_sighandler.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_local_sighandler.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_local_sighandler.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_local_sighandler.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_local_sighandler.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_local_sighandler.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_local_sighandler.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_local_sighandler.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_local_sighandler.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_local_sighandler.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_local_sighandler.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_local_sighandler.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_local_sighandler.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_local_sighandler.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_local_sighandler.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_local_sighandler.h:11235-11360
Added: svn:eol-style
   + native

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
  2009-07-08 22:36:06 UTC (rev 11381)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
  2009-07-08 23:05:54 UTC (rev 11382)
@@ -153,8 +153,7 @@
        fusb_win32.h                    \
        md5.h                           \
        rate_to_regval.h                \
-       usrp_config.h                   \
-       usrp_local_sighandler.h         
+       usrp_config.h
 
 if PYTHON
 usrppython_PYTHON =                    \

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/usrp_local_sighandler.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/usrp_local_sighandler.cc
     2009-07-08 22:36:06 UTC (rev 11381)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/usrp_local_sighandler.cc
     2009-07-08 23:05:54 UTC (rev 11382)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include <usrp_local_sighandler.h>
+#include <usrp/usrp_local_sighandler.h>
 #include <stdexcept>
 #include <stdio.h>
 #include <string.h>