Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 9422

Timestamp:

08/26/08 17:56:01

Author:

jcorgan

Message:

Rolled forward r9181:9183 from jcorgan/gr-usrp2 to jcorgan/wip

Files:

usrp2/branches/developers/jcorgan/wip/host-ng (modified) (1 prop)
usrp2/branches/developers/jcorgan/wip/host-ng/Makefile.am (modified) (1 diff)
usrp2/branches/developers/jcorgan/wip/host-ng/configure.ac (modified) (1 diff)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2 (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/Makefile.am (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/Makefile.am)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/test_gr_usrp2.cc (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/test_gr_usrp2.cc)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2.i (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2.i)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_sink_base.cc (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_sink_base.cc)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_sink_base.h (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_sink_base.h)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_sink_c.cc (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_sink_c.cc)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_sink_c.h (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_sink_c.h)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_source_base.cc (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_source_base.cc)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_source_base.h (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_source_base.h)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_source_c.cc (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_source_c.cc)
usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_source_c.h (copied) (copied from usrp2/branches/developers/jcorgan/gr-usrp2/host-ng/gr-usrp2/usrp2_source_c.h)
usrp2/branches/developers/jcorgan/wip/host-ng/include/usrp2/usrp2.h (modified) (1 diff)
usrp2/branches/developers/jcorgan/wip/host-ng/lib/usrp2.cc (modified) (1 diff)
usrp2/branches/developers/jcorgan/wip/host-ng/lib/usrp2_impl.h (modified) (2 diffs)
usrp2/branches/developers/jcorgan/wip/host/Makefile.am (modified) (1 diff)
usrp2/branches/developers/jcorgan/wip/host/configure.ac (modified) (1 diff)
usrp2/branches/developers/jcorgan/wip/host/gr-usrp2 (deleted)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

usrp2/branches/developers/jcorgan/wip/host-ng
- Property svn:ignore changed from configure Makefile.in config.log config.status config.guess stamp-h1 config.h ltmain.sh config.sub config.h.in libtool autom4te.cache missing aclocal.m4 Makefile install-sh depcomp usrp2*.tar.gz to configure Makefile.in config.log config.status config.guess stamp-h1 config.h ltmain.sh config.sub config.h.in libtool autom4te.cache missing aclocal.m4 Makefile install-sh depcomp usrp2*.tar.gz py-compile
usrp2/branches/developers/jcorgan/wip/host-ng/Makefile.am

r8515 r9422

27 27 config.h.in
28 28
29 SUBDIRS = config include lib apps
29 SUBDIRS = config include lib gr-usrp2 apps
usrp2/branches/developers/jcorgan/wip/host-ng/configure.ac

r9410 r9422

222 222 include/Makefile \
223 223 include/usrp2/Makefile \
224 gr-usrp2/Makefile \
224 225 lib/Makefile \
225 226 ])

usrp2/branches/developers/jcorgan/wip/host-ng/include/usrp2/usrp2.h

r9142	r9422
84	84	~usrp2();
85	85
	86	/*!
	87	* Returns the MAC address associated with this USRP
	88	*/
	89	const std::string &mac_addr();
	90
86	91	/*
87	92	* ----------------------------------------------------------------

usrp2/branches/developers/jcorgan/wip/host-ng/lib/usrp2.cc

r9411	r9422
105	105	}
106	106
	107	const std::string &
	108	usrp2::mac_addr()
	109	{
	110	return d_impl->mac_addr();
	111	}
	112
107	113	// Receive
108	114

usrp2/branches/developers/jcorgan/wip/host-ng/lib/usrp2_impl.h

r9142	r9422
44	44	eth_buffer *d_eth_buf;
45	45	pktfilter *d_pf;
46		std::string d_addr;
	46	std::string d_addr; // FIXME: use u2_mac_addr_t instead
47	47	usrp2_thread *d_bg_thread;
48	48	volatile bool d_bg_running; // TODO: multistate if needed
…	…
95	95	void bg_loop();
96	96
	97	const std::string &mac_addr() const { return d_addr; } // FIXME: convert from u2_mac_addr_t
97	98	bool set_rx_gain(double gain);
98	99	bool set_rx_center_freq(double frequency, tune_result *result);

usrp2/branches/developers/jcorgan/wip/host/Makefile.am

r8391 r9422

27 27 config.h.in
28 28
29 SUBDIRS = config lib ~~gr-usrp2~~ apps
29 SUBDIRS = config lib apps
usrp2/branches/developers/jcorgan/wip/host/configure.ac

r8391 r9422

206 206 config/Makefile \
207 207 apps/Makefile \
208 ~~gr-usrp2/Makefile \~~
209 208 lib/Makefile \
210 209 ])

r8515	r9422
27	27	config.h.in
28	28
29		SUBDIRS = config include lib apps
	29	SUBDIRS = config include lib gr-usrp2 apps

r9410	r9422
222	222	include/Makefile \
223	223	include/usrp2/Makefile \
	224	gr-usrp2/Makefile \
224	225	lib/Makefile \
225	226	])

r8391	r9422
27	27	config.h.in
28	28
29		SUBDIRS = config lib ~~gr-usrp2~~ apps
	29	SUBDIRS = config lib apps

r8391	r9422
206	206	config/Makefile \
207	207	apps/Makefile \
208		~~gr-usrp2/Makefile \~~
209	208	lib/Makefile \
210	209	])

Changeset Navigation

Changeset 9422

Legend:

Download in other formats: