[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5709 - gnuradio/branches/developers/gnychis/inband/us
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r5709 - gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband |
|
Date: |
Wed, 6 Jun 2007 09:24:42 -0600 (MDT) |
Author: eb
Date: 2007-06-06 09:24:41 -0600 (Wed, 06 Jun 2007)
New Revision: 5709
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.h
Log:
a bit of cleanup
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am
2007-06-06 04:45:24 UTC (rev 5708)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am
2007-06-06 15:24:41 UTC (rev 5709)
@@ -35,11 +35,7 @@
libusrp_inband.la \
libusrp_inband-qa.la
-# FIXME, we've got a parallel make problem (make -j3):
-# make[6]: *** No rule to make target
-# `../../../../usrp/host/lib/inband/libusrp_inband.la', needed by
`libusrp_inband-qa.la'
-
# ------------------------------------------------------------------------
# Build the inband library
@@ -54,36 +50,36 @@
$(COMPILE_MBH) usrp_interface.mbh usrp_interface_mbh.cc
libusrp_inband_la_SOURCES = \
- $(BUILT_SOURCES) \
- usrp_server.cc \
- usrp_usb_interface.cc \
- usrp_tx.cc
\
- usrp_tx_stub.cc \
- usrp_rx.cc
\
- ../../apps/ui_sincos.c \
- usrp_rx_stub.cc
+ $(BUILT_SOURCES) \
+ ../../apps/ui_sincos.c \
+ usrp_rx.cc \
+ usrp_rx_stub.cc \
+ usrp_server.cc \
+ usrp_tx.cc \
+ usrp_tx_stub.cc \
+ usrp_usb_interface.cc
libusrp_inband_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-libusrp_inband_la_LIBADD = \
- $(MBLOCK_LA) \
- ../legacy/libusrp.la \
+libusrp_inband_la_LIBADD = \
+ $(MBLOCK_LA) \
+ ../legacy/libusrp.la \
-lstdc++
include_HEADERS = \
- usrp_server.h \
- usrp_usb_interface.h \
usrp_inband_usb_packet.h \
- usrp_tx_stub.h \
- usrp_rx_stub.h \
- usrp_tx.h
\
- usrp_rx.h
+ usrp_rx.h \
+ usrp_rx_stub.h \
+ usrp_server.h \
+ usrp_tx.h \
+ usrp_tx_stub.h \
+ usrp_usb_interface.h
noinst_HEADERS = \
+ fake_usrp.h \
qa_inband.h \
qa_inband_packet_prims.h \
- qa_inband_usrp_server.h \
- fake_usrp.h
+ qa_inband_usrp_server.h
# ------------------------------------------------------------------------
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
2007-06-06 04:45:24 UTC (rev 5708)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
2007-06-06 15:24:41 UTC (rev 5709)
@@ -23,14 +23,15 @@
#include <config.h>
#endif
+#include <usrp_rx.h>
+
+#include <usrp_standard.h>
#include <iostream>
#include <vector>
#include <usb.h>
#include <mb_class_registry.h>
-#include <usrp_rx.h>
#include <usrp_inband_usb_packet.h>
#include <fpga_regs_common.h>
-#include "usrp_standard.h"
#include <stdio.h>
typedef usrp_inband_usb_packet transport_pkt;
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h
2007-06-06 04:45:24 UTC (rev 5708)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.h
2007-06-06 15:24:41 UTC (rev 5709)
@@ -22,18 +22,16 @@
#define INCLUDED_USRP_RX_H
#include <mb_mblock.h>
-#include <vector>
-#include "usrp_standard.h"
+class usrp_standard_rx;
+
/*!
* \brief Implements the low level usb interface to the USRP
*/
class usrp_rx : public mb_mblock
{
- public:
-
- mb_port_sptr d_cs;
- usrp_standard_rx* d_urx;
+ mb_port_sptr d_cs;
+ usrp_standard_rx *d_urx;
public:
usrp_rx(mb_runtime *rt, const std::string &instance_name, pmt_t user_arg);
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
2007-06-06 04:45:24 UTC (rev 5708)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.cc
2007-06-06 15:24:41 UTC (rev 5709)
@@ -23,14 +23,13 @@
#include <config.h>
#endif
+#include <usrp_tx.h>
#include <iostream>
-#include <vector>
#include <usb.h>
#include <mb_class_registry.h>
-#include <usrp_tx.h>
#include <usrp_inband_usb_packet.h>
#include <fpga_regs_common.h>
-#include "usrp_standard.h"
+#include <usrp_standard.h>
#include <stdio.h>
typedef usrp_inband_usb_packet transport_pkt;
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.h
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.h
2007-06-06 04:45:24 UTC (rev 5708)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_tx.h
2007-06-06 15:24:41 UTC (rev 5709)
@@ -22,18 +22,16 @@
#define INCLUDED_USRP_TX_H
#include <mb_mblock.h>
-#include <vector>
-#include "usrp_standard.h"
+class usrp_standard_tx;
+
/*!
* \brief Implements the low level usb interface to the USRP
*/
class usrp_tx : public mb_mblock
{
- public:
-
- mb_port_sptr d_cs;
- usrp_standard_tx* d_utx;
+ mb_port_sptr d_cs;
+ usrp_standard_tx *d_utx;
public:
usrp_tx(mb_runtime *rt, const std::string &instance_name, pmt_t user_arg);
@@ -43,7 +41,6 @@
private:
void write(pmt_t data);
-
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5709 - gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband,
eb <=