sdr
/
libusrp
mirror of https://gerrit.osmocom.org/libusrp
8
0
Fork 0
Code Releases Activity

Move mblock library include files into separate library. Updates to usrp in-band code to accommodate. Tested with out-of-tree mblock application builds. Trunk passes distcheck. 

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10144 221aa14e-8319-0410-a670-987f0aec2ac5
This commit is contained in:
jcorgan 2008-12-20 20:54:52 +00:00
parent 93bb2af3f4
commit f3f0aafed4
25 changed files with 111 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/apps-inband/Makefile.am
View File

@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
$(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CPPFLAGS) \
$(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
$(CPPUNIT_INCLUDES) $(WITH_INCLUDES) -I$(top_srcdir)/mblock/src/lib
bin_PROGRAMS =

4
host/apps-inband/read_packets.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -25,7 +25,7 @@
#include <iostream>
#include <usrp_inband_usb_packet.h>
#include <mb_class_registry.h>
#include <mblock/class_registry.h>
#include <vector>
#include <usrp_usb_interface.h>
#include <fstream>

18
host/apps-inband/test_usrp_inband_2rx.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,16 +23,16 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

18
host/apps-inband/test_usrp_inband_2tx.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,16 +23,16 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

18
host/apps-inband/test_usrp_inband_overrun.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,14 +23,14 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

18
host/apps-inband/test_usrp_inband_ping.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,14 +23,14 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

16
host/apps-inband/test_usrp_inband_registers.cc
View File

@ -23,15 +23,15 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
//#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

16
host/apps-inband/test_usrp_inband_rx.cc
View File

@ -23,14 +23,14 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

18
host/apps-inband/test_usrp_inband_timestamps.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,14 +23,14 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

18
host/apps-inband/test_usrp_inband_tx.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,14 +23,14 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

18
host/apps-inband/test_usrp_inband_underrun.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,14 +23,14 @@
#include <config.h>
#endif
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/exception.h>
#include <mblock/msg_queue.h>
#include <mblock/message.h>
#include <mblock/msg_accepter.h>
#include <mblock/class_registry.h>
#include <pmt.h>
#include <stdio.h>
#include <string.h>

10
host/lib/inband/qa_inband_usrp_server.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -28,10 +28,10 @@
#include <cppunit/TestAssert.h>
#include <stdio.h>
#include <usrp_server.h>
#include <mb_mblock.h>
#include <mb_runtime.h>
#include <mb_protocol_class.h>
#include <mb_class_registry.h>
#include <mblock/mblock.h>
#include <mblock/runtime.h>
#include <mblock/protocol_class.h>
#include <mblock/class_registry.h>
#include <vector>
#include <iostream>
#include <pmt.h>

4
host/lib/inband/usrp_inband_usb_packet.h
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -23,7 +23,7 @@
#define INCLUDED_USRP_INBAND_USB_PACKET_H_
#include <usrp_bytesex.h>
#include <mb_mblock.h>
#include <mblock/mblock.h>
#include <pmt.h>
#include <iostream>

2
host/lib/inband/usrp_rx.cc
View File

@ -29,7 +29,7 @@
#include <iostream>
#include <vector>
#include <usb.h>
#include <mb_class_registry.h>
#include <mblock/class_registry.h>
#include <usrp_inband_usb_packet.h>
#include <fpga_regs_common.h>
#include <stdio.h>

4
host/lib/inband/usrp_rx.h
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -21,7 +21,7 @@
#ifndef INCLUDED_USRP_RX_H
#define INCLUDED_USRP_RX_H
#include <mb_mblock.h>
#include <mblock/mblock.h>
#include <fstream>
class usrp_standard_rx;

4
host/lib/inband/usrp_rx_stub.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -28,7 +28,7 @@
#include <iostream>
#include <vector>
#include <usb.h>
#include <mb_class_registry.h>
#include <mblock/class_registry.h>
#include <usrp_inband_usb_packet.h>
#include <fpga_regs_common.h>
#include "usrp_standard.h"

4
host/lib/inband/usrp_rx_stub.h
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -21,7 +21,7 @@
#ifndef INCLUDED_USRP_RX_STUB_H
#define INCLUDED_USRP_RX_STUB_H
#include <mb_mblock.h>
#include <mblock/mblock.h>
#include <vector>
#include "usrp_standard.h"
#include <ui_nco.h>

4
host/lib/inband/usrp_server.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -25,7 +25,7 @@
#include <usrp_server.h>
#include <iostream>
#include <usrp_inband_usb_packet.h>
#include <mb_class_registry.h>
#include <mblock/class_registry.h>
#include <vector>
#include <usrp_usb_interface.h>
#include <string.h>

4
host/lib/inband/usrp_server.h
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -21,7 +21,7 @@
#ifndef INCLUDED_USRP_SERVER_H
#define INCLUDED_USRP_SERVER_H
#include <mb_mblock.h>
#include <mblock/mblock.h>
#include <vector>
#include <queue>
#include <fstream>

4
host/lib/inband/usrp_tx.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -26,7 +26,7 @@
#include <usrp_tx.h>
#include <iostream>
#include <usb.h>
#include <mb_class_registry.h>
#include <mblock/class_registry.h>
#include <usrp_inband_usb_packet.h>
#include <fpga_regs_common.h>
#include <usrp_standard.h>

4
host/lib/inband/usrp_tx.h
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -21,7 +21,7 @@
#ifndef INCLUDED_USRP_TX_H
#define INCLUDED_USRP_TX_H
#include <mb_mblock.h>
#include <mblock/mblock.h>
#include <fstream>
class usrp_standard_tx;

4
host/lib/inband/usrp_tx_stub.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -26,7 +26,7 @@
#include <iostream>
#include <vector>
#include <usb.h>
#include <mb_class_registry.h>
#include <mblock/class_registry.h>
#include <usrp_tx_stub.h>
#include <usrp_inband_usb_packet.h>
#include <fpga_regs_common.h>

4
host/lib/inband/usrp_tx_stub.h
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -21,7 +21,7 @@
#ifndef INCLUDED_USRP_TX_STUB_H
#define INCLUDED_USRP_TX_STUB_H
#include <mb_mblock.h>
#include <mblock/mblock.h>
#include <vector>
#include "usrp_standard.h"
#include <fstream>

4
host/lib/inband/usrp_usb_interface.cc
View File

@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2007 Free Software Foundation, Inc.
* Copyright 2007,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@ -28,7 +28,7 @@
#include <iostream>
#include <vector>
#include <usb.h>
#include <mb_class_registry.h>
#include <mblock/class_registry.h>
#include <usrp_inband_usb_packet.h>
#include <fpga_regs_common.h>
#include "usrp_rx.h"

2
host/lib/inband/usrp_usb_interface.h
View File

@ -21,7 +21,7 @@
#ifndef INCLUDED_USRP_USB_INTERFACE_H
#define INCLUDED_USRP_USB_INTERFACE_H
#include <mb_mblock.h>
#include <mblock/mblock.h>
#include <vector>
#include "usrp_standard.h"