change name to gr-foo

This commit is contained in:
Bastian Bloessl
2013-06-05 06:44:42 +02:00
parent 486cb0a50e
commit 3006afc700
37 changed files with 166 additions and 166 deletions
+12 -12
View File
@@ -25,7 +25,7 @@ include(GrPlatform) #define LIB_SUFFIX
include_directories(${Boost_INCLUDE_DIR})
link_directories(${Boost_LIBRARY_DIRS})
list(APPEND ccs_sources
list(APPEND foo_sources
burst_tagger_impl.cc
packet_dropper_impl.cc
packet_pad_impl.cc
@@ -35,14 +35,14 @@ list(APPEND ccs_sources
wireshark_connector_impl.cc
)
add_library(gnuradio-ccs SHARED ${ccs_sources})
target_link_libraries(gnuradio-ccs ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
set_target_properties(gnuradio-ccs PROPERTIES DEFINE_SYMBOL "gnuradio_ccs_EXPORTS")
add_library(gnuradio-foo SHARED ${foo_sources})
target_link_libraries(gnuradio-foo ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
set_target_properties(gnuradio-foo PROPERTIES DEFINE_SYMBOL "gnuradio_foo_EXPORTS")
########################################################################
# Install built library files
########################################################################
install(TARGETS gnuradio-ccs
install(TARGETS gnuradio-foo
LIBRARY DESTINATION lib${LIB_SUFFIX} # .so/.dylib file
ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
RUNTIME DESTINATION bin # .dll file
@@ -55,19 +55,19 @@ include(GrTest)
include_directories(${CPPUNIT_INCLUDE_DIRS})
list(APPEND test_ccs_sources
${CMAKE_CURRENT_SOURCE_DIR}/test_ccs.cc
${CMAKE_CURRENT_SOURCE_DIR}/qa_ccs.cc
list(APPEND test_foo_sources
${CMAKE_CURRENT_SOURCE_DIR}/test_foo.cc
${CMAKE_CURRENT_SOURCE_DIR}/qa_foo.cc
)
add_executable(test-ccs ${test_ccs_sources})
add_executable(test-foo ${test_foo_sources})
target_link_libraries(
test-ccs
test-foo
${GNURADIO_RUNTIME_LIBRARIES}
${Boost_LIBRARIES}
${CPPUNIT_LIBRARIES}
gnuradio-ccs
gnuradio-foo
)
GR_ADD_TEST(test_ccs test-ccs)
GR_ADD_TEST(test_foo test-foo)
+2 -2
View File
@@ -23,7 +23,7 @@
#define dout std::cout
namespace gr {
namespace ccs {
namespace foo {
burst_tagger_impl::burst_tagger_impl(pmt::pmt_t tag_name)
: gr::sync_block("burst_tagger",
@@ -114,6 +114,6 @@ burst_tagger::sptr burst_tagger::make(pmt::pmt_t tag_name) {
}
} /* namespace ccs */
} /* namespace foo */
} /* namespace gr */
+6 -6
View File
@@ -18,13 +18,13 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_CCS_BURST_TAGGER_IMPL_H
#define INCLUDED_CCS_BURST_TAGGER_IMPL_H
#ifndef INCLUDED_FOO_BURST_TAGGER_IMPL_H
#define INCLUDED_FOO_BURST_TAGGER_IMPL_H
#include <ccs/burst_tagger.h>
#include <foo/burst_tagger.h>
namespace gr {
namespace ccs {
namespace foo {
class burst_tagger_impl : public burst_tagger {
private:
@@ -43,8 +43,8 @@ namespace ccs {
gr_vector_void_star &output_items);
};
} // namespace ccs
} // namespace foo
} // namespace gr
#endif /* INCLUDED_CCS_BURST_TAGGER_IMPL_H */
#endif /* INCLUDED_FOO_BURST_TAGGER_IMPL_H */
+2 -2
View File
@@ -15,12 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ccs/packet_dropper.h>
#include <foo/packet_dropper.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/block_detail.h>
#include "packet_dropper_impl.h"
using namespace gr::ccs;
using namespace gr::foo;
packet_dropper_impl::packet_dropper_impl(double drop_rate, unsigned long seed)
: d_drop_rate(drop_rate), d_generator(seed), d_distribution(0.0,1.0),
+6 -6
View File
@@ -15,14 +15,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef INCLUDED_GR_CCS_PACKET_DROPPER_IMPL_H
#define INCLUDED_GR_CCS_PACKET_DROPPER_IMPL_H
#ifndef INCLUDED_GR_FOO_PACKET_DROPPER_IMPL_H
#define INCLUDED_GR_FOO_PACKET_DROPPER_IMPL_H
#include <ccs/packet_dropper.h>
#include <foo/packet_dropper.h>
namespace gr {
namespace ccs {
class CCS_API packet_dropper_impl : public packet_dropper {
namespace foo {
class FOO_API packet_dropper_impl : public packet_dropper {
private:
double d_drop_rate;
std::default_random_engine d_generator;
@@ -34,4 +34,4 @@ namespace ccs {
}
}
#endif /* INCLUDED_GR_CCS_PACKET_DROPPER_IMPL_H */
#endif /* INCLUDED_GR_FOO_PACKET_DROPPER_IMPL_H */
+2 -2
View File
@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ccs/packet_pad.h>
#include <foo/packet_pad.h>
#include <gnuradio/io_signature.h>
#include <iostream>
using namespace gr::ccs;
using namespace gr::foo;
class packet_pad_impl : public packet_pad {
+2 -2
View File
@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ccs/pdu_to_blob.h>
#include <foo/pdu_to_blob.h>
#include <gnuradio/io_signature.h>
#include <string>
using namespace gr::ccs;
using namespace gr::foo;
class pdu_to_blob_impl : public pdu_to_blob {
+2 -2
View File
@@ -14,13 +14,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ccs/periodic_msg_source.h>
#include <foo/periodic_msg_source.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/block_detail.h>
#include <string.h>
using namespace gr::ccs;
using namespace gr::foo;
class periodic_msg_source_impl : public periodic_msg_source {
+3 -3
View File
@@ -25,12 +25,12 @@
* add them here.
*/
#include "qa_ccs.h"
#include "qa_foo.h"
CppUnit::TestSuite *
qa_ccs::suite()
qa_foo::suite()
{
CppUnit::TestSuite *s = new CppUnit::TestSuite("ccs");
CppUnit::TestSuite *s = new CppUnit::TestSuite("foo");
return s;
}
+4 -4
View File
@@ -20,19 +20,19 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef _QA_CCS_H_
#define _QA_CCS_H_
#ifndef _QA_FOO_H_
#define _QA_FOO_H_
#include <gnuradio/attributes.h>
#include <cppunit/TestSuite.h>
//! collect all the tests for the gr-filter directory
class __GR_ATTR_EXPORT qa_ccs
class __GR_ATTR_EXPORT qa_foo
{
public:
//! return suite of tests for all of gr-filter directory
static CppUnit::TestSuite *suite();
};
#endif /* _QA_CCS_H_ */
#endif /* _QA_FOO_H_ */
+2 -2
View File
@@ -14,13 +14,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ccs/string_to_blob.h>
#include <foo/string_to_blob.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/block_detail.h>
#include <string.h>
using namespace gr::ccs;
using namespace gr::foo;
class string_to_blob_impl : public string_to_blob {
+3 -3
View File
@@ -28,17 +28,17 @@
#include <cppunit/XmlOutputter.h>
#include <gnuradio/unittests.h>
#include "qa_ccs.h"
#include "qa_foo.h"
#include <iostream>
int
main (int argc, char **argv)
{
CppUnit::TextTestRunner runner;
std::ofstream xmlfile(get_unittest_path("ccs.xml").c_str());
std::ofstream xmlfile(get_unittest_path("foo.xml").c_str());
CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
runner.addTest(qa_ccs::suite());
runner.addTest(qa_foo::suite());
runner.setOutputter(xmlout);
bool was_successful = runner.run("", false);
+2 -2
View File
@@ -15,14 +15,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "wireshark_connector_impl.h"
#include <ccs/wireshark_connector.h>
#include <foo/wireshark_connector.h>
#include <gnuradio/io_signature.h>
#include <iostream>
#include <iomanip>
#include <sys/time.h>
using namespace gr::ccs;
using namespace gr::foo;
class wireshark_connector_impl : public wireshark_connector {
+5 -5
View File
@@ -14,13 +14,13 @@
* 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_GR_CCS_WIRESHARK_CONNECTOR_IMPL_H
#define INCLUDED_GR_CCS_WIRESHARK_CONNECTOR_IMPL_H
#ifndef INCLUDED_GR_FOO_WIRESHARK_CONNECTOR_IMPL_H
#define INCLUDED_GR_FOO_WIRESHARK_CONNECTOR_IMPL_H
#include <boost/cstdint.hpp>
namespace gr {
namespace ccs {
namespace foo {
enum LINK_LAYER_PROTOCOL {
ZIGBEE = 195
@@ -43,7 +43,7 @@ struct pcap_pkt {
uint32_t orig_len; /* actual length of packet */
}__attribute__((packed));
} // namespace ccs
} // namespace foo
} // namespace gr
#endif /* INCLUDED_GR_CCS_WIRESHARK_CONNECTOR_IMPL_H */
#endif /* INCLUDED_GR_FOO_WIRESHARK_CONNECTOR_IMPL_H */