Merge branch 'usrp_e100_devel' into next

Conflicts:
	host/lib/usrp/usrp_e100/io_impl.cpp

8 files changed, 996 insertions, 0 deletions

diff --git a/host/usrp_e_utils/CMakeLists.txt b/host/usrp_e_utils/CMakeLists.txt
new file mode 100644
index 000000000..5123af592
--- /dev/null
+++ b/host/usrp_e_utils/CMakeLists.txt
@@ -0,0 +1,51 @@
+#
+# Copyright 2011 Ettus Research LLC
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+########################################################################
+# USRP embedded utilities that get installed into the share path
+########################################################################
+IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    SET(LINUX_TARGET TRUE)
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
+LIBUHD_REGISTER_COMPONENT("USRP-E Utils" ENABLE_USRP_E_UTILS OFF "LINUX_TARGET" OFF)
+
+IF(ENABLE_USRP_E_UTILS)
+    ENABLE_LANGUAGE(C)
+    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100)
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/include)
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/lib/ic_reg_maps)
+
+    SET(usrp_e_utils_sources
+        usrp-e-utility.cpp
+        usrp-e-loopback.c
+        usrp-e-wb-test.cpp
+        usrp-e-debug-pins.c
+        usrp-e-i2c.c
+        usrp-e-spi.c
+    )
+
+    #for each source: build an executable and install
+    FOREACH(util_source ${usrp_e_utils_sources})
+        GET_FILENAME_COMPONENT(util_name ${util_source} NAME_WE)
+        ADD_EXECUTABLE(${util_name} ${util_source})
+        TARGET_LINK_LIBRARIES(${util_name} ${Boost_LIBRARIES})
+        INSTALL(TARGETS ${util_name} RUNTIME DESTINATION ${PKG_DATA_DIR}/usrp_e_utils)
+    ENDFOREACH(util_source)
+
+ENDIF(ENABLE_USRP_E_UTILS)
diff --git a/host/usrp_e_utils/clkgen_config.hpp b/host/usrp_e_utils/clkgen_config.hpp
new file mode 100644
index 000000000..f39f8bb19
--- /dev/null
+++ b/host/usrp_e_utils/clkgen_config.hpp
@@ -0,0 +1,305 @@
+//
+// Copyright 2011 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// 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 USRP_E_UTILS_CLKGEN_CONFIG_HPP
+#define USRP_E_UTILS_CLKGEN_CONFIG_HPP
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <string>
+#include <cstdlib>
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+
+#include <linux/spi/spidev.h>
+
+namespace usrp_e_clkgen_config_utility{
+
+// Programming data for clock gen chip
+static const unsigned int config_data[] = {
+	0x000024,
+	0x023201,
+	0x000081,
+	0x000400,
+	0x00104c,
+	0x001101,
+	0x001200,
+	0x001300,
+	0x001414,
+	0x001500,
+	0x001604,
+	0x001704,
+	0x001807,
+	0x001900,
+	//0x001a00,//for debug
+	0x001a32,
+	0x001b12,
+	0x001c44,
+	0x001d00,
+	0x001e00,
+	0x00f062,
+	0x00f162,
+	0x00f262,
+	0x00f362,
+	0x00f462,
+	0x00f562,
+	0x00f662,
+	0x00f762,
+	0x00f862,
+	0x00f962,
+	0x00fa62,
+	0x00fb62,
+	0x00fc00,
+	0x00fd00,
+	0x019021,
+	0x019100,
+	0x019200,
+	0x019321,
+	0x019400,
+	0x019500,
+	0x019611,
+	0x019700,
+	0x019800,
+	0x019900,
+	0x019a00,
+	0x019b00,
+	0x01e003,
+	0x01e102,
+	0x023000,
+	0x023201,
+	0x0b0201,
+	0x0b0300,
+	0x001fff,
+	0x0a0000,
+	0x0a0100,
+	0x0a0200,
+	0x0a0302,
+	0x0a0400,
+	0x0a0504,
+	0x0a060e,
+	0x0a0700,
+	0x0a0810,
+	0x0a090e,
+	0x0a0a00,
+	0x0a0bf0,
+	0x0a0c0b,
+	0x0a0d01,
+	0x0a0e90,
+	0x0a0f01,
+	0x0a1001,
+	0x0a11e0,
+	0x0a1201,
+	0x0a1302,
+	0x0a1430,
+	0x0a1580,
+	0x0a16ff,
+	0x023201,
+	0x0b0301,
+	0x023201,
+};
+
+
+const unsigned int CLKGEN_SELECT = 145;
+
+
+enum gpio_direction {IN, OUT};
+
+class gpio {
+	public:
+
+	gpio(unsigned int gpio_num, gpio_direction pin_direction, bool close_action);
+	~gpio();
+
+	bool get_value();
+	void set_value(bool state);
+
+	private:
+
+	unsigned int gpio_num;
+
+	std::stringstream base_path;
+	std::fstream value_file;
+	std::fstream direction_file;
+	bool close_action; // True set to input and release, false do nothing
+};
+
+class spidev {
+	public:
+
+	spidev(std::string dev_name);
+	~spidev();
+
+	void send(char *wbuf, char *rbuf, unsigned int nbytes);
+
+	private:
+
+	int fd;
+
+};
+
+gpio::gpio(unsigned int _gpio_num, gpio_direction pin_direction, bool close_action)
+:close_action(close_action)
+{
+	std::fstream export_file;
+
+	gpio_num = _gpio_num;
+
+	export_file.open("/sys/class/gpio/export", std::ios::out);
+	if (!export_file.is_open())  ///\todo Poor error handling
+		std::cout << "Failed to open gpio export file." << std::endl;
+
+	export_file << gpio_num << std::endl;
+
+	base_path << "/sys/class/gpio/gpio" << gpio_num << std::flush;
+
+	std::string direction_file_name;
+
+	direction_file_name = base_path.str() + "/direction";
+
+	direction_file.open(direction_file_name.c_str()); 
+	if (!direction_file.is_open())
+		std::cout << "Failed to open direction file." << std::endl;
+	if (pin_direction == OUT)
+		direction_file << "out" << std::endl;
+	else
+		direction_file << "in" << std::endl;
+
+	std::string value_file_name;
+
+	value_file_name = base_path.str() + "/value";
+
+	value_file.open(value_file_name.c_str(), std::ios_base::in | std::ios_base::out);
+	if (!value_file.is_open())
+		std::cout << "Failed to open value file." << std::endl;
+}
+
+bool gpio::get_value()
+{
+
+	std::string val;
+
+	std::getline(value_file, val);
+	value_file.seekg(0);
+
+	if (val == "0")
+		return false;
+	else if (val == "1")
+		return true;
+	else
+		std::cout << "Data read from value file|" << val << "|" << std::endl;
+
+	return false;
+}
+
+void gpio::set_value(bool state)
+{
+
+	if (state)
+		value_file << "1" << std::endl;
+	else
+		value_file << "0" << std::endl;
+}
+
+gpio::~gpio()
+{
+	if (close_action) {
+		std::fstream unexport_file;
+
+		direction_file << "in" << std::endl;
+
+		unexport_file.open("/sys/class/gpio/unexport", std::ios::out);
+		if (!unexport_file.is_open())  ///\todo Poor error handling
+			std::cout << "Failed to open gpio export file." << std::endl;
+
+		unexport_file << gpio_num << std::endl;
+		
+	 }
+
+}
+
+spidev::spidev(std::string fname)
+{
+	int ret;
+	int mode = 0;
+	int speed = 12000;
+	int bits = 24;
+
+	fd = open(fname.c_str(), O_RDWR);
+
+	ret = ioctl(fd, SPI_IOC_WR_MODE, &mode);
+	ret = ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed);
+	ret = ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits);
+}
+	
+
+spidev::~spidev()
+{
+	close(fd);
+}
+
+void spidev::send(char *buf, char *rbuf, unsigned int nbytes)
+{
+	int ret;
+
+	struct spi_ioc_transfer tr;
+	tr.tx_buf = (unsigned long) buf;
+	tr.rx_buf = (unsigned long) rbuf;
+	tr.len = nbytes;
+	tr.delay_usecs = 0;
+	tr.speed_hz = 12000;
+	tr.bits_per_word = 24;
+
+	ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);
+
+}
+
+static void send_config_to_clkgen(gpio &chip_select, const unsigned int data[], unsigned int data_size)
+{
+	spidev spi("/dev/spidev1.0");
+	unsigned int rbuf;
+
+	for (unsigned int i = 0; i < data_size; i++) {
+
+		//std::cout << "sending " << std::hex << data[i] << std::endl;
+		chip_select.set_value(0);
+		spi.send((char *)&data[i], (char *)&rbuf, 4);
+		chip_select.set_value(1);
+		unsigned int addr = (data[i] >> 8) & 0xfff;
+		if (addr == 0x232 || addr == 0x000){
+			std::cout << "." << std::flush;
+			sleep(1);
+		}
+	};
+	std::cout << std::endl;
+}
+
+}//namespace usrp_e_clkgen_config_utility
+
+//int main(int argc, char *argv[])
+static void clock_genconfig_main(void)
+{
+	using namespace usrp_e_clkgen_config_utility;
+	gpio clkgen_select(CLKGEN_SELECT, OUT, true);
+
+	send_config_to_clkgen(clkgen_select, config_data, sizeof(config_data)/sizeof(config_data[0]));
+}
+
+#endif /*USRP_E_UTILS_CLKGEN_CONFIG_HPP*/
diff --git a/host/usrp_e_utils/usrp-e-debug-pins.c b/host/usrp_e_utils/usrp-e-debug-pins.c
new file mode 100644
index 000000000..94f898b67
--- /dev/null
+++ b/host/usrp_e_utils/usrp-e-debug-pins.c
@@ -0,0 +1,78 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/ioctl.h>
+
+#include <linux/usrp_e.h>
+#include "usrp_e100_regs.hpp"
+
+// Usage: usrp_e_gpio <string>
+
+static int fp;
+
+static int read_reg(__u16 reg)
+{
+	int ret;
+	struct usrp_e_ctl16 d;
+
+	d.offset = reg;
+	d.count = 1;
+	ret = ioctl(fp, USRP_E_READ_CTL16, &d);
+	return d.buf[0];
+}
+
+static void write_reg(__u16 reg, __u16 val)
+{
+	int ret;
+	struct usrp_e_ctl16 d;
+
+	d.offset = reg;
+	d.count = 1;
+	d.buf[0] = val;
+	ret = ioctl(fp, USRP_E_WRITE_CTL16, &d);
+}
+
+int main(int argc, char *argv[])
+{
+	int test;
+
+	test = 0;
+	if (argc < 2) {
+		printf("%s 0|1|off\n", argv[0]);
+		return -1;
+	}
+
+        fp = open("/dev/usrp_e0", O_RDWR);
+        printf("fp = %d\n", fp);
+	if (fp < 0) {
+		perror("Open failed");
+		return -1;
+	}
+
+	if (strcmp(argv[1], "0") == 0) {
+		printf("Selected 0 based on %s\n", argv[1]);
+		write_reg(UE_REG_GPIO_TX_DDR, 0xFFFF);
+		write_reg(UE_REG_GPIO_RX_DDR, 0xFFFF);
+		write_reg(UE_REG_GPIO_TX_SEL, 0x0);
+		write_reg(UE_REG_GPIO_RX_SEL, 0x0);
+		write_reg(UE_REG_GPIO_TX_DBG, 0xFFFF);
+		write_reg(UE_REG_GPIO_RX_DBG, 0xFFFF);
+	} else if (strcmp(argv[1], "1") == 0) {
+		printf("Selected 1 based on %s\n", argv[1]);
+		write_reg(UE_REG_GPIO_TX_DDR, 0xFFFF);
+		write_reg(UE_REG_GPIO_RX_DDR, 0xFFFF);
+		write_reg(UE_REG_GPIO_TX_SEL, 0xFFFF);
+		write_reg(UE_REG_GPIO_RX_SEL, 0xFFFF);
+		write_reg(UE_REG_GPIO_TX_DBG, 0xFFFF);
+		write_reg(UE_REG_GPIO_RX_DBG, 0xFFFF);
+	} else {
+		printf("Selected off based on %s\n", argv[1]);
+		write_reg(UE_REG_GPIO_TX_DDR, 0x0);
+		write_reg(UE_REG_GPIO_RX_DDR, 0x0);
+	}
+
+	return 0;
+}
diff --git a/host/usrp_e_utils/usrp-e-i2c.c b/host/usrp_e_utils/usrp-e-i2c.c
new file mode 100644
index 000000000..c6fd4c632
--- /dev/null
+++ b/host/usrp_e_utils/usrp-e-i2c.c
@@ -0,0 +1,87 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
+#include <linux/usrp_e.h>
+
+// Usage: usrp_e_i2c w address data0 data1 data 2 ....
+// Usage: usrp_e_i2c r address count
+
+int main(int argc, char *argv[])
+{
+	int fp, ret, i, tmp;
+	struct usrp_e_i2c *i2c_msg;
+	int direction, address, count;
+
+	if (argc < 3) {
+		printf("Usage: usrp-e-i2c w address data0 data1 data2 ...\n");
+		printf("Usage: usrp-e-i2c r address count\n");
+		printf("All addresses and data in hex.\n");
+		exit(-1);
+	}
+
+	if (strcmp(argv[1], "r") == 0) {
+		direction = 0;
+	} else if (strcmp(argv[1], "w") == 0) {
+		direction = 1;
+	} else {
+		return -1;
+	}
+
+	sscanf(argv[2], "%X", &address);
+	printf("Address = %X\n", address);
+
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
+	if (fp < 0) {
+		perror("Open failed");
+		return -1;
+	}
+
+//	sleep(1);
+
+	if (direction) {
+		count = argc - 3;
+	} else {
+		sscanf(argv[3], "%X", &count);
+	}
+	printf("Count = %X\n", count);
+
+	i2c_msg = malloc(sizeof(i2c_msg) + count * sizeof(char));
+
+	i2c_msg->addr = address;
+	i2c_msg->len = count;
+
+	for (i = 0; i < count; i++) {
+		i2c_msg->data[i] = i;
+	}
+
+	if (direction) {
+		// Write
+
+		for (i=0; i<count; i++) {
+			sscanf(argv[3+i], "%X", &tmp);
+			i2c_msg->data[i] = tmp;
+		}
+
+		ret = ioctl(fp, USRP_E_I2C_WRITE, i2c_msg);
+		printf("Return value from i2c_write ioctl: %d\n", ret);
+	} else {
+		// Read
+
+		ret = ioctl(fp, USRP_E_I2C_READ, i2c_msg);
+		printf("Return value from i2c_read ioctl: %d\n", ret);
+
+		printf("Ioctl: %d Data read :", ret);
+		for (i=0; i<count; i++) {
+			printf(" %X", i2c_msg->data[i]);
+		}
+		printf("\n");
+			
+	}
+	return 0;
+}
diff --git a/host/usrp_e_utils/usrp-e-loopback.c b/host/usrp_e_utils/usrp-e-loopback.c
new file mode 100644
index 000000000..454d81ba7
--- /dev/null
+++ b/host/usrp_e_utils/usrp-e-loopback.c
@@ -0,0 +1,231 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stddef.h>
+#include <sys/mman.h>
+#include <linux/usrp_e.h>
+
+#define MAX_PACKET_SIZE 1016
+static int packet_data_length;
+static int error;
+
+struct pkt {
+	int len;
+	int checksum;
+	int seq_num;
+	short data[];
+};
+
+static int length_array[2048];
+static int length_array_tail = 0;
+static int length_array_head = 0;
+
+pthread_mutex_t length_array_mutex; //gotta lock the index to keep it from getting hosed
+
+//yes this is a circular buffer that does not check empty
+//no i don't want to hear about it
+void push_length_array(int length) {
+	pthread_mutex_lock(&length_array_mutex);
+	if(length_array_tail > 2047) length_array_tail = 0;
+	length_array[length_array_tail++] = length;
+	pthread_mutex_unlock(&length_array_mutex);
+}
+
+int pop_length_array(void) {
+	int retval;
+	pthread_mutex_lock(&length_array_mutex);
+	if(length_array_head > 2047) length_array_head = 0;
+	retval = length_array[length_array_head++];
+	pthread_mutex_unlock(&length_array_mutex);
+	return retval;
+}
+
+static int fp;
+
+static int calc_checksum(struct pkt *p)
+{
+	int i, sum;
+
+	i = 0;
+	sum = 0;
+
+	for (i=0; i < p->len; i++)
+		sum ^= p->data[i];
+
+	sum ^= p->seq_num;
+	sum ^= p->len;
+
+	return sum;
+}
+
+static void *read_thread(void *threadid)
+{
+	char *rx_data;
+	int cnt, prev_seq_num, pkt_count, seq_num_failure;
+	struct pkt *p;
+	unsigned long bytes_transfered, elapsed_seconds;
+	struct timeval start_time, finish_time;
+	int expected_count;
+
+	printf("Greetings from the reading thread!\n");
+
+	bytes_transfered = 0;
+	gettimeofday(&start_time, NULL);
+
+	// IMPORTANT: must assume max length packet from fpga
+	rx_data = malloc(2048);
+	p = (struct pkt *) ((void *)rx_data);
+
+	prev_seq_num = 0;
+	pkt_count = 0;
+	seq_num_failure = 0;
+
+	while (1) {
+
+		cnt = read(fp, rx_data, 2048);
+		if (cnt < 0)
+			printf("Error returned from read: %d, sequence number = %d\n", cnt, p->seq_num);
+
+//		printf("p->seq_num = %d\n", p->seq_num);
+
+
+		pkt_count++;
+
+		if (p->seq_num != prev_seq_num + 1) {
+			printf("Sequence number fail, current = %d, previous = %d, pkt_count = %d\n",
+				p->seq_num, prev_seq_num, pkt_count);
+
+			seq_num_failure ++;
+			if (seq_num_failure > 2)
+				error = 1;
+		}
+
+		expected_count = pop_length_array()*2+12;
+		if(cnt != expected_count) {
+			printf("Received %d bytes, expected %d\n", cnt, expected_count);
+		}
+
+		prev_seq_num = p->seq_num;
+
+		if (calc_checksum(p) != p->checksum) {
+			printf("Checksum fail packet = %X, expected = %X, pkt_count = %d\n",
+				calc_checksum(p), p->checksum, pkt_count);
+			error = 1;
+		}
+
+		bytes_transfered += cnt;
+
+		if (bytes_transfered > (100 * 1000000)) {
+			gettimeofday(&finish_time, NULL);
+			elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
+
+			printf("RX data transfer rate = %f K Samples/second\n",
+				(float) bytes_transfered / (float) elapsed_seconds / 4000);
+
+
+			start_time = finish_time;
+			bytes_transfered = 0;
+		}
+
+
+//		printf(".");
+//		fflush(stdout);
+//		printf("\n");
+	}
+
+}
+
+static void *write_thread(void *threadid)
+{
+	int seq_number, i, cnt;
+	void *tx_data;
+	struct pkt *p;
+
+	printf("Greetings from the write thread!\n");
+
+	tx_data = malloc(2048);
+	p = (struct pkt *) ((void *)tx_data);
+
+	for (i=0; i < packet_data_length; i++)
+//		p->data[i] = random() >> 16;
+		p->data[i] = i;
+
+	seq_number = 1;
+
+	while (1) {
+		p->seq_num = seq_number++;
+
+		if (packet_data_length > 0)
+			p->len = packet_data_length;
+		else
+			p->len = (random()<<1 & 0x1ff) + (1004 - 512);
+
+		push_length_array(p->len);
+
+		p->checksum = calc_checksum(p);
+
+		cnt = write(fp, tx_data, p->len * 2 + 12);
+		if (cnt < 0)
+			printf("Error returned from write: %d\n", cnt);
+//		sleep(1);
+	}
+}
+
+
+int main(int argc, char *argv[])
+{
+	pthread_t tx, rx;
+	pthread_mutex_init(&length_array_mutex, 0);
+	long int t;
+	struct sched_param s = {
+		.sched_priority = 1
+	};
+	void *rb;
+	struct usrp_transfer_frame *tx_rb, *rx_rb;
+
+	if (argc < 2) {
+		printf("%s data_size\n", argv[0]);
+		return -1;
+	}
+
+	packet_data_length = atoi(argv[1]);
+	if(packet_data_length > MAX_PACKET_SIZE) {
+		printf("Packet size must be smaller than %i\n", MAX_PACKET_SIZE);
+		exit(-1);
+	}
+
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
+
+	rb = mmap(0, 202 * 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0);
+	if (!rb) {
+		printf("mmap failed\n");
+		exit;
+	}
+
+
+	sched_setscheduler(0, SCHED_RR, &s);
+	error = 0;
+
+#if 1
+	if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
+		printf("Failed to create rx thread\n");
+		exit(-1);
+	}
+
+	sleep(1);
+#endif
+
+	if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
+		printf("Failed to create tx thread\n");
+		exit(-1);
+	}
+
+//	while (!error)
+		sleep(1000000000);
+
+	printf("Done sleeping\n");
+}
diff --git a/host/usrp_e_utils/usrp-e-spi.c b/host/usrp_e_utils/usrp-e-spi.c
new file mode 100644
index 000000000..5203f56a8
--- /dev/null
+++ b/host/usrp_e_utils/usrp-e-spi.c
@@ -0,0 +1,54 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
+#include <linux/usrp_e.h>
+
+// Usage: usrp_e_spi w|rb slave data
+
+int main(int argc, char *argv[])
+{
+	int fp, slave, length, ret;
+	unsigned int data;
+	struct usrp_e_spi spi_dat;
+
+	if (argc < 5) {
+		printf("Usage: usrp_e_spi w|rb slave transfer_length data\n");
+		exit(-1);
+	}
+
+	slave = atoi(argv[2]);
+	length = atoi(argv[3]);
+	data = atoll(argv[4]);
+
+	printf("Data = %X\n", data);
+
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
+	if (fp < 0) {
+		perror("Open failed");
+		return -1;
+	}
+
+//	sleep(1);
+
+
+	spi_dat.slave = slave;
+	spi_dat.data = data;
+	spi_dat.length = length;
+	spi_dat.flags = UE_SPI_PUSH_FALL | UE_SPI_LATCH_RISE;
+
+	if (*argv[1] == 'r') {
+		spi_dat.readback = 1;
+		ret = ioctl(fp, USRP_E_SPI, &spi_dat);
+		printf("Ioctl returns: %d, Data returned = %d\n", ret, spi_dat.data);
+	} else {
+		spi_dat.readback = 0;
+		ioctl(fp, USRP_E_SPI, &spi_dat);
+	}
+
+	return 0;
+}
diff --git a/host/usrp_e_utils/usrp-e-utility.cpp b/host/usrp_e_utils/usrp-e-utility.cpp
new file mode 100644
index 000000000..b926cf49d
--- /dev/null
+++ b/host/usrp_e_utils/usrp-e-utility.cpp
@@ -0,0 +1,75 @@
+//
+// Copyright 2011 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// 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 <uhd/utils/safe_main.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <stdexcept>
+#include <iostream>
+
+#include "fpga_downloader.cpp"
+#include "clkgen_config.hpp"
+
+namespace po = boost::program_options;
+
+int UHD_SAFE_MAIN(int argc, char *argv[]){
+
+    //variables to be set by po
+    std::string fpga_path;
+
+    //setup the program options
+    po::options_description desc("Allowed options");
+    desc.add_options()
+        ("help", "help message")
+        ("fpga", po::value<std::string>(&fpga_path), "loads the specified FPGA file")
+        ("reclk",                                    "runs the clock recovery")
+    ;
+    po::variables_map vm;
+    po::store(po::parse_command_line(argc, argv, desc), vm);
+    po::notify(vm);
+
+    //print the help message
+    if (vm.count("help")){
+        std::cout << boost::format("UHD USRP-E Utility %s") % desc << std::endl;
+        return ~0;
+    }
+
+    bool loaded_fpga_image = false;
+    if (vm.count("fpga") != 0){
+        std::cout << "USRP-E Utility loading the FPGA..." << std::endl << std::endl;
+        usrp_e100_load_fpga(fpga_path);
+        loaded_fpga_image = true;
+        sleep(1);
+    }
+
+    if (vm.count("reclk") != 0){
+        std::cout << "USRP-E Utility running the clock recovery..." << std::flush;
+        //if an image was not loaded or specified, we load pass-through
+        if (fpga_path.empty()) throw std::runtime_error(
+            "Please specify the path to the pass-though FPGA image for your device.\n"
+            "  usrp-e-utility --reclk --fpga=/usr/share/uhd/images/usrp_e1xx_pt_fpga.bin"
+        );
+        clock_genconfig_main();
+        if (std::system("rm /tmp/usrp*hash") != 0){ //clear hash so driver must reload
+            std::cerr << "No hash to remove! Don't worry, its not a problem." << std::endl;
+        }
+    }
+
+    std::cout << "Done!" << std::endl;
+
+    return 0;
+}
diff --git a/host/usrp_e_utils/usrp-e-wb-test.cpp b/host/usrp_e_utils/usrp-e-wb-test.cpp
new file mode 100644
index 000000000..3d6a8d101
--- /dev/null
+++ b/host/usrp_e_utils/usrp-e-wb-test.cpp
@@ -0,0 +1,115 @@
+//
+// Copyright 2011 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// 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 <cstdlib>
+#include <cstdio>
+#include <ctime>
+#include <iostream>
+
+#include <sys/ioctl.h> //ioctl
+#include <fcntl.h> //open, close
+
+#include <linux/usrp_e.h>
+#include "usrp_e100_regs.hpp"
+
+static const size_t num_test_iters = 10000000;
+
+static int fp;
+
+static int peek16(int reg){
+    int ret;
+    struct usrp_e_ctl16 d;
+
+    d.offset = reg;
+    d.count = 1;
+    ret = ioctl(fp, USRP_E_READ_CTL16, &d);
+    return d.buf[0];
+}
+
+static void poke16(int reg, int val){
+    int ret;
+    struct usrp_e_ctl16 d;
+
+    d.offset = reg;
+    d.count = 1;
+    d.buf[0] = val;
+    ret = ioctl(fp, USRP_E_WRITE_CTL16, &d);
+}
+
+static int peek32(int reg){
+    int ret;
+    struct usrp_e_ctl32 d;
+
+    d.offset = reg;
+    d.count = 1;
+    ret = ioctl(fp, USRP_E_READ_CTL32, &d);
+    return d.buf[0];
+}
+
+static void poke32(int reg, int val){
+    int ret;
+    struct usrp_e_ctl32 d;
+
+    d.offset = reg;
+    d.count = 1;
+    d.buf[0] = val;
+    ret = ioctl(fp, USRP_E_WRITE_CTL32, &d);
+}
+
+int main(int, char *[]){
+
+    srandom(time(NULL)); //seed random()
+
+    if ((fp = ::open("/dev/usrp_e0", O_RDWR)) < 0){
+        std::cerr << "Open failed" << std::endl;
+        return -1;
+    }
+
+    size_t num_pass = 0, num_fail = 0;
+    for (size_t i = 0; i < num_test_iters; i++){
+	if(i%1000000 == 0) {
+	    std::cout << "num pass: " << num_pass;
+	    std::cout << "\tnum fail: " << num_fail << std::endl;
+	}
+        //make random values
+        int random_test32 = ::random();
+        int random_test16 = ::random() & 0xffff;
+        int random_secs = ::random();
+
+        //set a bunch of registers
+        poke16(UE_REG_MISC_TEST, random_test16);
+        poke32(UE_REG_SR_MISC_TEST32, random_test32);
+        poke32(UE_REG_TIME64_TICKS, 0);
+        poke32(UE_REG_TIME64_IMM, 1); //immediate
+        poke32(UE_REG_TIME64_SECS, random_secs);
+
+        //read a bunch of registers
+        if (
+            (peek16(UE_REG_MISC_TEST) == random_test16) and
+            (peek32(UE_REG_RB_MISC_TEST32) == random_test32) and
+            (peek32(UE_REG_RB_TIME_NOW_SECS) == random_secs) and
+//            (peek32(UE_REG_RB_TIME_NOW_TICKS) < 1000000) and
+        true) num_pass++;
+        else  num_fail++;
+    }
+
+    std::cout << "num pass: " << num_pass << std::endl;
+    std::cout << "num fail: " << num_fail << std::endl;
+
+    ::close(fp);
+    return 0;
+}