[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9322 - gnuradio/branches/developers/trondeau/dbs/gr-u
|
From: |
trondeau |
|
Subject: |
[Commit-gnuradio] r9322 - gnuradio/branches/developers/trondeau/dbs/gr-usrp/src |
|
Date: |
Mon, 18 Aug 2008 21:06:54 -0600 (MDT) |
Author: trondeau
Date: 2008-08-18 21:06:53 -0600 (Mon, 18 Aug 2008)
New Revision: 9322
Modified:
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source.i
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_c.cc
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.cc
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.h
Log:
adding short source back.
Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
2008-08-19 01:58:23 UTC (rev 9321)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
2008-08-19 03:06:53 UTC (rev 9322)
@@ -40,9 +40,7 @@
usrp1.i \
usrp1_source.i \
usrp1_sink.i
-# db1_base.i
-
NON_LOCAL_IFILES = $(GNURADIO_I)
ALL_IFILES = \
@@ -53,7 +51,6 @@
usrp1.cc \
usrp.py
-
ourpython_PYTHON = \
usrp.py
@@ -73,13 +70,12 @@
usrp1_sink_base.h \
usrp1_sink_c.h \
usrp1_source_base.h \
- usrp1_source_c.h
-# db1_base.h
+ usrp1_source_c.h \
+ usrp1_source_s.h
swiginclude_HEADERS = \
$(LOCAL_IFILES)
-
ourlib_LTLIBRARIES = \
_usrp.la
@@ -89,10 +85,9 @@
usrp1_sink_base.cc \
usrp1_sink_c.cc \
usrp1_source_base.cc \
- usrp1_source_c.cc
-# db1_base.cc
+ usrp1_source_c.cc \
+ usrp1_source_s.cc
-
_usrp_la_LIBADD = \
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LA) \
Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i
2008-08-19 01:58:23 UTC (rev 9321)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i
2008-08-19 03:06:53 UTC (rev 9322)
@@ -30,6 +30,7 @@
#include "usrp1_base.h"
#include "usrp1_source_base.h"
#include "usrp1_source_c.h"
+#include "usrp1_source_s.h"
#include "usrp1_sink_base.h"
#include "usrp1_sink_c.h"
#include "usrp_standard.h"
Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source.i
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source.i
2008-08-19 01:58:23 UTC (rev 9321)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source.i
2008-08-19 03:06:53 UTC (rev 9322)
@@ -154,7 +154,7 @@
protected:
usrp1_source_c (int which_board, unsigned int decim_rate,
int nchan, int mux, int mode, int fusb_block_size, int
fusb_nblocks,
- const std::string fpga_filename, const std::string
fgpa_filename);
+ const std::string fpga_filename, const std::string
fgpa_filename);
public:
@@ -163,37 +163,29 @@
// ----------------------------------------------------------------
-#if 0
-
GR_SWIG_BLOCK_MAGIC(usrp1,source_s)
usrp1_source_s_sptr
-usrp1_make_source_s (int which_board,
- unsigned int decim_rate,
- int nchan,
- int mux,
- int mode,
- int fusb_block_size,
- int fusb_nblocks,
- const std::string fpga_filename,
- const std::string firmware_filename
+usrp1_make_source_s (int which_board=0,
+ unsigned int decim_rate=64,
+ int nchan=1,
+ int mux=0x32103210,
+ int mode=0,
+ int fusb_block_size=0,
+ int fusb_nblocks=0,
+ const std::string fpga_filename="",
+ const std::string firmware_filename=""
) throw (std::runtime_error);
class usrp1_source_s : public usrp1_source_base {
protected:
usrp1_source_s (int which_board, unsigned int decim_rate,
- int nchan, int mux, int mode);
+ int nchan, int mux, int mode, int fusb_block_size, int
fusb_nblocks,
+ const std::string fpga_filename, const std::string
firmware_filename);
public:
~usrp1_source_s ();
-
- std::vector<db_base_sptr> db(int which);
};
-%pythoncode %{
- usrp1_source_c_sptr.__init__(self, which_board, decim_rate, nchan, mux,
mode) =
- usrp1_source_c_sptr(which_board, decim_rate, nchan, mux, mode)
-%}
-#endif
Modified:
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_c.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_c.cc
2008-08-19 01:58:23 UTC (rev 9321)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_c.cc
2008-08-19 03:06:53 UTC (rev 9322)
@@ -73,11 +73,6 @@
fpga_filename, firmware_filename)
{
_ensure_rev2(which_board);
-
- //int dbid = daughterboard_id(which_board);
-
- //d_db[0] = (db1_base*)instantiate_dbs(dbid, this->d_usrp, which_board);
- //d_db[1] = (db1_base*)instantiate_dbs(dbid, this->d_usrp, which_board);
}
usrp1_source_c::~usrp1_source_c ()
Modified:
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.cc
2008-08-19 01:58:23 UTC (rev 9321)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.cc
2008-08-19 03:06:53 UTC (rev 9322)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -73,6 +73,9 @@
fusb_nblocks,
fpga_filename, firmware_filename)
{
+ _ensure_rev2(which_board);
+
+ printf("usrp source_s\n");
}
usrp1_source_s::~usrp1_source_s ()
Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.h
2008-08-19 01:58:23 UTC (rev 9321)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_s.h
2008-08-19 03:06:53 UTC (rev 9322)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -36,15 +36,15 @@
// public shared_ptr constructor
usrp1_source_s_sptr
-usrp1_make_source_s (int which_board,
- unsigned int decim_rate,
- int nchan,
- int mux,
- int mode,
- int fusb_block_size,
- int fusb_nblocks,
- const std::string fpga_filename,
- const std::string firmware_filename
+usrp1_make_source_s (int which_board=0,
+ unsigned int decim_rate=64,
+ int nchan=1,
+ int mux=0x32103210,
+ int mode=0,
+ int fusb_block_size=0,
+ int fusb_nblocks=0,
+ const std::string fpga_filename="",
+ const std::string firmware_filename=""
) throw (std::runtime_error);
/*!
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9322 - gnuradio/branches/developers/trondeau/dbs/gr-usrp/src,
trondeau <=