[Commit-gnuradio] r8516 - in usrp2/trunk/host-ng: . apps include/usrp2 lib

[jcorgan]

Author: jcorgan
Date: 2008-05-28 10:41:42 -0600 (Wed, 28 May 2008)
New Revision: 8516

Added:
   usrp2/trunk/host-ng/include/usrp2/usrp2.h
   usrp2/trunk/host-ng/lib/usrp2.cc
Removed:
   usrp2/trunk/host-ng/include/usrp2/basic.h
   usrp2/trunk/host-ng/lib/basic.cc
Modified:
   usrp2/trunk/host-ng/apps/test_usrp2.cc
   usrp2/trunk/host-ng/configure.ac
   usrp2/trunk/host-ng/include/usrp2/Makefile.am
   usrp2/trunk/host-ng/lib/Makefile.am
Log:
Renamed usrp2::basic to usrp2::usrp2.

Modified: usrp2/trunk/host-ng/apps/test_usrp2.cc
===================================================================
--- usrp2/trunk/host-ng/apps/test_usrp2.cc      2008-05-28 15:57:25 UTC (rev 
8515)
+++ usrp2/trunk/host-ng/apps/test_usrp2.cc      2008-05-28 16:41:42 UTC (rev 
8516)
@@ -20,12 +20,12 @@
 #include <config.h>
 #endif
 
-#include <usrp2/basic.h>
+#include <usrp2/usrp2.h>
 
 int
 main(int argc, char **argv)
 {
-  usrp2::basic_sptr u2 = usrp2::make_basic();
+  usrp2::usrp2_sptr u2 = usrp2::make_usrp2();
 
   return 0;
 }

Modified: usrp2/trunk/host-ng/configure.ac
===================================================================
--- usrp2/trunk/host-ng/configure.ac    2008-05-28 15:57:25 UTC (rev 8515)
+++ usrp2/trunk/host-ng/configure.ac    2008-05-28 16:41:42 UTC (rev 8516)
@@ -17,7 +17,7 @@
 AC_INIT
 AC_PREREQ(2.57)
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR([lib/basic.cc])
+AC_CONFIG_SRCDIR([lib/usrp2.cc])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST

Modified: usrp2/trunk/host-ng/include/usrp2/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/include/usrp2/Makefile.am       2008-05-28 15:57:25 UTC 
(rev 8515)
+++ usrp2/trunk/host-ng/include/usrp2/Makefile.am       2008-05-28 16:41:42 UTC 
(rev 8516)
@@ -22,4 +22,4 @@
 usrp2includedir = $(includedir)/usrp2
 
 usrp2include_HEADERS = \
-       basic.h
+       usrp2.h

Deleted: usrp2/trunk/host-ng/include/usrp2/basic.h

Copied: usrp2/trunk/host-ng/include/usrp2/usrp2.h (from rev 8515, 
usrp2/trunk/host-ng/include/usrp2/basic.h)
===================================================================
--- usrp2/trunk/host-ng/include/usrp2/usrp2.h                           (rev 0)
+++ usrp2/trunk/host-ng/include/usrp2/usrp2.h   2008-05-28 16:41:42 UTC (rev 
8516)
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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/>.
+ */
+
+#ifndef INCLUDED_USRP2_H
+#define INCLUDED_USRP2_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
+
+namespace usrp2 {
+
+// Shared pointer to usrp2::usrp2
+class usrp2;
+typedef boost::shared_ptr<usrp2> usrp2_sptr;
+
+// Factory function to return a new instance of usrp2::usrp2
+usrp2_sptr make_usrp2();
+
+class usrp2
+{
+private:
+  // Only factory function can instantiate this class
+  usrp2();
+  friend usrp2_sptr make_usrp2();
+  
+public:
+  ~usrp2();  
+
+};
+
+};
+
+#endif /* INCLUDED_USRP2_H */

Modified: usrp2/trunk/host-ng/lib/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/lib/Makefile.am 2008-05-28 15:57:25 UTC (rev 8515)
+++ usrp2/trunk/host-ng/lib/Makefile.am 2008-05-28 16:41:42 UTC (rev 8516)
@@ -23,7 +23,7 @@
        libusrp2ng.la
 
 libusrp2ng_la_SOURCES = \
-       basic.cc
+       usrp2.cc
 
 libusrp2ng_la_LIBADD = \
        $(GR_OMNITHREAD_LIBS)

Deleted: usrp2/trunk/host-ng/lib/basic.cc

Copied: usrp2/trunk/host-ng/lib/usrp2.cc (from rev 8515, 
usrp2/trunk/host-ng/lib/basic.cc)
===================================================================
--- usrp2/trunk/host-ng/lib/usrp2.cc                            (rev 0)
+++ usrp2/trunk/host-ng/lib/usrp2.cc    2008-05-28 16:41:42 UTC (rev 8516)
@@ -0,0 +1,41 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <usrp2/usrp2.h>
+
+namespace usrp2 {
+
+usrp2_sptr
+make_usrp2()
+{
+  return usrp2_sptr(new usrp2());
+}
+
+usrp2::usrp2()
+{
+}
+
+usrp2::~usrp2()
+{
+}
+
+}