diff options
Diffstat (limited to 'gnuradio-runtime/lib/controlport')
9 files changed, 42 insertions, 42 deletions
diff --git a/gnuradio-runtime/lib/controlport/CMakeLists.txt b/gnuradio-runtime/lib/controlport/CMakeLists.txt index c05a82bf4f..bd46659eb2 100644 --- a/gnuradio-runtime/lib/controlport/CMakeLists.txt +++ b/gnuradio-runtime/lib/controlport/CMakeLists.txt @@ -45,7 +45,7 @@ list(APPEND gnuradio_runtime_sources ) # Append generated file in build directory -list(APPEND gnuradio_runtime_sources +list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/gnuradio.cpp ) diff --git a/gnuradio-runtime/lib/controlport/ICE_LICENSE b/gnuradio-runtime/lib/controlport/ICE_LICENSE index 43ea7572d9..51ab60d453 100644 --- a/gnuradio-runtime/lib/controlport/ICE_LICENSE +++ b/gnuradio-runtime/lib/controlport/ICE_LICENSE @@ -12,43 +12,43 @@ details. You should have received a copy of the GNU General Public License version 2 along with this program; if not, see http://www.gnu.org/licenses. -Linking Ice statically or dynamically with other software (such as a -library, module or application) is making a combined work based on Ice. +Linking Ice statically or dynamically with other software (such as a +library, module or application) is making a combined work based on Ice. Thus, the terms and conditions of the GNU General Public License version 2 cover this combined work. -If such software can only be used together with Ice, then not only the +If such software can only be used together with Ice, then not only the combined work but the software itself is a work derived from Ice and as -such shall be licensed under the terms of the GNU General Public License -version 2. This includes the situation where Ice is only being used +such shall be licensed under the terms of the GNU General Public License +version 2. This includes the situation where Ice is only being used through an abstraction layer. As a special exception to the above, ZeroC grants to the contributors for -the following projects the permission to license their Ice-based software -under the terms of the GNU Lesser General Public License (LGPL) version +the following projects the permission to license their Ice-based software +under the terms of the GNU Lesser General Public License (LGPL) version 2.1 or of the BSD license: - Orca Robotics (http://orca-robotics.sourceforge.net) - + - Mumble (http://mumble.sourceforge.net) -This exception does not extend to the parts of Ice used by these +This exception does not extend to the parts of Ice used by these projects, or to any other derived work: as a whole, any work based on Ice shall be licensed under the terms and conditions of the GNU General Public License version 2. You may also combine Ice with any software not derived from Ice, provided -the license of such software is compatible with the GNU General Public +the license of such software is compatible with the GNU General Public License version 2. In addition, as a special exception, ZeroC grants you permission to combine Ice with: - + - the OpenSSL library, or with a modified version of the OpenSSL library that uses the same license as OpenSSL - any library not derived from Ice and licensed under the terms of - the Apache License, version 2.0 - (http://www.apache.org/licenses/LICENSE-2.0.html) + the Apache License, version 2.0 + (http://www.apache.org/licenses/LICENSE-2.0.html) -If you modify this copy of Ice, you may extend any of the exceptions -provided above to your version of Ice, but you are not obligated to +If you modify this copy of Ice, you may extend any of the exceptions +provided above to your version of Ice, but you are not obligated to do so. diff --git a/gnuradio-runtime/lib/controlport/frontend.ice b/gnuradio-runtime/lib/controlport/frontend.ice index 50d056df72..e4d346dba0 100644 --- a/gnuradio-runtime/lib/controlport/frontend.ice +++ b/gnuradio-runtime/lib/controlport/frontend.ice @@ -28,10 +28,10 @@ module GNURadio { // primitive types dictionary<string, string> StrStrDict; dictionary<string, string> TunerArgs; - struct F32Range + struct F32Range { - float min; - float max; + float min; + float max; }; // exception types @@ -111,7 +111,7 @@ module GNURadio { sequence<Tuner*> TunerSeq; sequence<Channel*> ChannelSeq; - + interface Channelizer extends AbstractReceiver { idempotent ChannelizerStatus status(); idempotent Tuner* getTuner(); @@ -131,7 +131,7 @@ module GNURadio { }; }; - + module Booter { dictionary<string, string> WaveformArgs; exception WaveformRunningError { diff --git a/gnuradio-runtime/lib/controlport/gnuradio.ice b/gnuradio-runtime/lib/controlport/gnuradio.ice index 3d6101087a..01db91b7be 100644 --- a/gnuradio-runtime/lib/controlport/gnuradio.ice +++ b/gnuradio-runtime/lib/controlport/gnuradio.ice @@ -42,23 +42,23 @@ class KnobL extends Knob { long value; }; class KnobS extends Knob { string value; }; class KnobZ extends Knob { complex value; }; -sequence<bool> VectorB; sequence<byte> VectorC; +sequence<bool> VectorB; sequence<byte> VectorC; sequence<int> VectorI; sequence<float> VectorF; sequence<double> VectorD; sequence<string> VectorS; sequence<long> VectorL; sequence<short> VectorT; -class KnobVecB extends Knob { VectorB value; }; -class KnobVecC extends Knob { VectorC value; }; -class KnobVecI extends Knob { VectorI value; }; -class KnobVecT extends Knob { VectorT value; }; -class KnobVecF extends Knob { VectorF value; }; -class KnobVecD extends Knob { VectorD value; }; -class KnobVecL extends Knob { VectorL value; }; -class KnobVecS extends Knob { VectorS value; }; +class KnobVecB extends Knob { VectorB value; }; +class KnobVecC extends Knob { VectorC value; }; +class KnobVecI extends Knob { VectorI value; }; +class KnobVecT extends Knob { VectorT value; }; +class KnobVecF extends Knob { VectorF value; }; +class KnobVecD extends Knob { VectorD value; }; +class KnobVecL extends Knob { VectorL value; }; +class KnobVecS extends Knob { VectorS value; }; -enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT, - KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL, - KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE, +enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT, + KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL, + KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE, KNOBVECSTRING, KNOBVECLONG, KNOBSHORT}; const int DISPNULL = 0x0000; @@ -69,7 +69,7 @@ const int DISPSPEC = 0x0008; const int DISPRAST = 0x0010; const int DISPOPTCPLX = 0x0100; const int DISPOPTLOG = 0x0200; -const int DISPOPTSTEM = 0x0400; +const int DISPOPTSTEM = 0x0400; const int DISPOPTSTRIP = 0x0800; const int DISPOPTSCATTER = 0x1000; diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc index 59ec518960..0c7bc135be 100644 --- a/gnuradio-runtime/lib/controlport/rpcmanager.cc +++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc @@ -42,7 +42,7 @@ rpcmanager::get() { if(aggregator_registered) { return aggregator.get(); - } + } else if(booter_registered) { return boot; } diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc index e86306910d..201dfb3929 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc @@ -25,7 +25,7 @@ rpcserver_booter_aggregator::rpcserver_booter_aggregator() : d_type(std::string("aggregator")), server(new rpcserver_aggregator()) {;} - + rpcserver_booter_aggregator::~rpcserver_booter_aggregator() {;} diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc index cffa268a6d..f60a218747 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc @@ -1,9 +1,9 @@ /* -*- c++ -*- */ -/* +/* * Copyright 2012 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) diff --git a/gnuradio-runtime/lib/controlport/rpcserver_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc index 5409f5e931..cba6be578e 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_ice.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc @@ -1,9 +1,9 @@ /* -*- c++ -*- */ -/* +/* * Copyright 2012 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) @@ -55,7 +55,7 @@ rpcserver_ice::registerConfigureCallback(const std::string &id, if(DEBUG) std::cout << "rpcserver_ice registering set: " << id << std::endl; - + d_setcallbackmap.insert(ConfigureCallbackMap_t::value_type(id, callback)); } diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc index 697ec497b1..d515e78963 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc @@ -36,5 +36,5 @@ bool rpcmanager::make_aggregator(false); #endif #ifdef RPCSERVER_XMLRPC - #error TODO XMLRPC + #error TODO XMLRPC #endif |