diff options
| author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-05-26 13:00:44 +0200 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-05-26 13:02:14 +0200 |
| commit | 193fd0ad88f8b506785acaf8c5f92119db4e2a21 (patch) | |
| tree | 31423e36eaa22e49608e912e02ae218f95069830 | |
| parent | 4c101ea44ccc4a0a7cb397305ef2abb369eb2170 (diff) | |
osmosdr: remove deprecated device arguments
| -rw-r--r-- | grc/gen_osmosdr_blocks.py | 2 | ||||
| -rw-r--r-- | lib/osmosdr/osmosdr_src_c.cc | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/grc/gen_osmosdr_blocks.py b/grc/gen_osmosdr_blocks.py index a74b387..580c2e2 100644 --- a/grc/gen_osmosdr_blocks.py +++ b/grc/gen_osmosdr_blocks.py @@ -141,7 +141,7 @@ Source Mode: rtl=2[,direct_samp=0|1|2][,offset_tune=0|1] ... rtl_tcp=127.0.0.1:1234[,psize=16384][,direct_samp=0|1|2][,offset_tune=0|1] ... uhd[,serial=...][,lo_offset=0][,mcr=52e6][,nchan=2][,subdev='\\\\'B:0 A:0\\\\''] ... - osmosdr=0[,mcr=64e6][,nchan=5][,buffers=32][,buflen=N*512] ... + osmosdr=0[,buffers=32][,buflen=N*512] ... file='/path/to/your file',rate=1e6[,freq=100e6][,repeat=true][,throttle=true] ... Sink Mode: diff --git a/lib/osmosdr/osmosdr_src_c.cc b/lib/osmosdr/osmosdr_src_c.cc index 261f06d..98ae080 100644 --- a/lib/osmosdr/osmosdr_src_c.cc +++ b/lib/osmosdr/osmosdr_src_c.cc @@ -74,26 +74,13 @@ osmosdr_src_c::osmosdr_src_c (const std::string &args) _skipped(0) { int ret; - unsigned int dev_index = 0, mcr = 0; - size_t nchan = 1; + unsigned int dev_index = 0; dict_t dict = params_to_dict(args); if (dict.count("osmosdr")) dev_index = boost::lexical_cast< unsigned int >( dict["osmosdr"] ); - if (dict.count("mcr")) - mcr = (unsigned int) boost::lexical_cast< double >( dict["mcr"] ); - - if (mcr != 0) - throw std::runtime_error("FIXME: Setting the MCR is not supported."); - - if (dict.count("nchan")) - nchan = boost::lexical_cast< size_t >( dict["nchan"] ); - - if (nchan != 1) - throw std::runtime_error("FIXME: Values of nchan != 1 are not supported."); - _buf_num = _buf_len = _buf_head = _buf_used = _buf_offset = 0; if (dict.count("buffers")) |