Merge branch 'usrp2_fw_clock_cleanup' into usrp2_dual_dsp

8 files changed, 1 insertions, 1782 deletions

diff --git a/host/apps/omap_debug/Makefile b/host/apps/omap_debug/Makefile
index 46d4714a8..f8b9f2bd9 100644
--- a/host/apps/omap_debug/Makefile
+++ b/host/apps/omap_debug/Makefile
@@ -1,27 +1,12 @@
 CFLAGS=-Wall -I../../lib/usrp/usrp_e/ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -O3
 CXXFLAGS=-Wall -I../../lib/usrp/usrp_e/ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -O3
 
-all : usrp-e-spi usrp-e-i2c usrp-e-loopback usrp-e-mm-loopback usrp-e-uart usrp-e-led usrp-e-ctl usrp-e-button usrp-e-uart-rx fpga-downloader usrp-e-gpio usrp-e-debug-pins usrp-e-random-loopback usrp-e-timed usrp-e-lb-test usrp-e-crc-rw clkgen-config
+all : usrp-e-spi usrp-e-i2c usrp-e-uart usrp-e-led usrp-e-ctl usrp-e-button usrp-e-uart-rx usrp-e-gpio usrp-e-debug-pins
 
 usrp-e-spi : usrp-e-spi.c
 
 usrp-e-i2c : usrp-e-i2c.c
 
-usrp-e-loopback : usrp-e-loopback.c
-	gcc -o $@ $< -lpthread ${CFLAGS}
-
-usrp-e-mm-loopback : usrp-e-mm-loopback.c
-	gcc -o $@ $< -lpthread ${CFLAGS}
-
-usrp-e-timed : usrp-e-timed.c
-	gcc -o $@ $< -lpthread ${CFLAGS}
-
-usrp-e-random-loopback : usrp-e-random-loopback.c
-	gcc -o $@ $< -lpthread ${CFLAGS}
-
-usrp-e-crc-rw : usrp-e-crc-rw.c
-	gcc -o $@ $< -lpthread ${CFLAGS}
-
 usrp-e-uart : usrp-e-uart.c
 
 usrp-e-uart-rx : usrp-e-uart-rx.c
@@ -32,30 +17,17 @@ usrp-e-ctl : usrp-e-ctl.c
 
 usrp-e-button : usrp-e-button.c
 
-fpga-downloader : fpga-downloader.cc
-
-clkgen-config : clkgen-config.cc
-
 usrp-e-gpio : usrp-e-gpio.c
 
-usrp-e-lb-test : usrp-e-lb-test.c
-
 usrp-e-debug-pins : usrp-e-debug-pins.c
 clean :
 	rm -f usrp-e-spi
 	rm -f usrp-e-i2c
-	rm -f usrp-e-loopback
-	rm -f usrp-e-mm-loopback
-	rm -f usrp-e-timed
-	rm -f usrp-e-rw-random
 	rm -f usrp-e-uart
 	rm -f usrp-e-uart-rx
 	rm -f usrp-e-led
 	rm -f usrp-e-ctl
 	rm -f usrp-e-button
-	rm -f fpga-downloader
 	rm -f usrp-e-gpio
 	rm -f usrp-e-debug-pins
 	rm -f usrp-e-lb-test
-	rm -f usrp-e-crc-rw
-	rm -f clkgen-config
diff --git a/host/apps/omap_debug/clkgen-config.cc b/host/apps/omap_debug/clkgen-config.cc
deleted file mode 100644
index e8279b4ae..000000000
--- a/host/apps/omap_debug/clkgen-config.cc
+++ /dev/null
@@ -1,296 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2008,2009 Free Software Foundation, Inc.
- *
- * This file is part of UHD
- *
- * GNU Radio 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, or (at your option)
- * any later version.
- *
- * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
-*/
-
-#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>
-
-
-// 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,
-	0x019333,
-	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)
-{
-	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 = 12000000;
-	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);
-
-	};
-}
-
-int main(int argc, char *argv[])
-{
-
-	gpio clkgen_select(CLKGEN_SELECT, OUT, true);
-
-	send_config_to_clkgen(clkgen_select, config_data, sizeof(config_data)/sizeof(unsigned int));
-}
-
diff --git a/host/apps/omap_debug/fpga-downloader.cc b/host/apps/omap_debug/fpga-downloader.cc
deleted file mode 100644
index 4e475b5c1..000000000
--- a/host/apps/omap_debug/fpga-downloader.cc
+++ /dev/null
@@ -1,253 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2008,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio 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, or (at your option)
- * any later version.
- *
- * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
-*/
-
-#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>
-
-/*
- * Configuration connections
- *
- * CCK    - MCSPI1_CLK
- * DIN    - MCSPI1_MOSI
- * PROG_B - GPIO_175     - output (change mux)
- * DONE   - GPIO_173     - input  (change mux)
- * INIT_B - GPIO_114     - input  (change mux)
- *
-*/
-
-const unsigned int PROG_B = 175;
-const unsigned int DONE   = 173;
-const unsigned int INIT_B = 114;
-
-static std::string bit_file = "safe_u1e.bin";
-
-const int BUF_SIZE = 4096;
-
-enum gpio_direction {IN, OUT};
-
-class gpio {
-	public:
-
-	gpio(unsigned int gpio_num, gpio_direction pin_direction);
-
-	bool get_value();
-	void set_value(bool state);
-
-	private:
-
-	std::stringstream base_path;
-	std::fstream value_file;	
-};
-
-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)
-{
-	std::fstream export_file;
-
-	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::fstream direction_file;
-	std::string direction_file_name;
-
-	if (gpio_num != 114) {
-		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;
-}
-
-static void prepare_fpga_for_configuration(gpio &prog, gpio &init)
-{
-
-	prog.set_value(true);
-	prog.set_value(false);
-	prog.set_value(true);
-
-#if 0
-	bool ready_to_program(false);
-	unsigned int count(0);
-	do {
-		ready_to_program = init.get_value();
-		count++;
-
-		sleep(1);
-	} while (count < 10 && !ready_to_program);
-
-	if (count == 10) {
-		std::cout << "FPGA not ready for programming." << std::endl;
-		exit(-1);
-	}
-#endif
-}
-
-spidev::spidev(std::string fname)
-{
-	int ret;
-	int mode = 0;
-	int speed = 12000000;
-	int bits = 8;
-
-	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 = 48000000;
-	tr.bits_per_word = 8;
-
-	ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);	
-
-}
-
-static void send_file_to_fpga(std::string &file_name, gpio &error, gpio &done)
-{
-	std::ifstream bitstream;
-
-	std::cout << "File name - " << file_name.c_str() << std::endl;
-
-	bitstream.open(file_name.c_str(), std::ios::binary);
-	if (!bitstream.is_open())
-		std::cout << "File " << file_name << " not opened succesfully." << std::endl;
-
-	spidev spi("/dev/spidev1.0");
-	char buf[BUF_SIZE];
-	char rbuf[BUF_SIZE];
-
-	do {
-		bitstream.read(buf, BUF_SIZE);
-		spi.send(buf, rbuf, bitstream.gcount());
-
-		if (error.get_value())
-			std::cout << "INIT_B went high, error occured." << std::endl;
-
-		if (!done.get_value())
-			std::cout << "Configuration complete." << std::endl;
-
-	} while (bitstream.gcount() == BUF_SIZE);
-}
-
-int main(int argc, char *argv[])
-{
-
-	gpio gpio_prog_b(PROG_B, OUT);
-	gpio gpio_init_b(INIT_B, IN);
-	gpio gpio_done  (DONE,   IN);
-
-	if (argc == 2)
-		bit_file = argv[1];
-
-	std::cout << "FPGA config file: " << bit_file << std::endl;
-
-	prepare_fpga_for_configuration(gpio_prog_b, gpio_init_b);
-
-	std::cout << "Done = " << gpio_done.get_value() << std::endl;
-
-	send_file_to_fpga(bit_file, gpio_init_b, gpio_done);
-}
-
diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
deleted file mode 100644
index f91c4fa85..000000000
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ /dev/null
@@ -1,368 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <poll.h>
-#include <sys/mman.h>
-#include "usrp_e.h"
-
-// max length #define PKT_DATA_LENGTH 1016
-static int packet_data_length;
-
-struct ring_buffer_info (*rxi)[];
-struct ring_buffer_info (*txi)[];
-__u8 *rx_buf;
-__u8 *tx_buf;
-static struct usrp_e_ring_buffer_size_t rb_size;
-
-static int fp;
-static u_int32_t crc_tab[256];
-
-// CRC code from http://www.koders.com/c/fid699AFE0A656F0022C9D6B9D1743E697B69CE5815.aspx
-// GPLv2
-
-static u_int32_t chksum_crc32_gentab(void)
-{
-	unsigned long crc, poly;
-	unsigned long i, j;
-
-	poly = 0x04C11DB7L;
-
-	for (i = 0; i < 256; i++) {
-		crc = i;
-		for (j = 8; j > 0; j--) {
-			if (crc & 1) {
-				crc = (crc >> 1) ^ poly;
-			} else {
-				crc >>= 1;
-			}
-		}
-		crc_tab[i] = crc;
-//		printf("crc_tab[%d] = %X\n", i , crc);
-	}
-
-	return 0;
-}
-
-struct timeval delta_time(struct timeval f, struct timeval s)
-{
-	struct timeval d;
-
-	if (f.tv_usec > s.tv_usec) {
-		d.tv_usec = f.tv_usec - s.tv_usec;
-		d.tv_sec = f.tv_sec - s.tv_sec;
-	} else {
-		d.tv_usec = f.tv_usec - s.tv_usec + 1e6;
-		d.tv_sec = f.tv_sec - s.tv_sec - 1;
-	}
-
-	return d;
-}
-
-
-static void *read_thread(void *threadid)
-{
-	int cnt;
-	int rx_pkt_cnt, rb_read;
-	int i;
-	unsigned long crc, ck_sum;
-	unsigned int rx_crc, pkt_len, pkt_seq;
-	unsigned long bytes_transfered;
-	struct timeval start_time;
-	unsigned int prev_seq = 0;
-	int first = 1;
-
-	__u8 *p;
-
-
-	printf("Greetings from the reading thread!\n");
-
-	// IMPORTANT: must assume max length packet from fpga
-	
-	rx_pkt_cnt = 0;
-	rb_read = 0;
-
-	bytes_transfered = 0;
-	gettimeofday(&start_time, NULL);
-
-	while (1) {
-		
-		while (!((*rxi)[rb_read].flags & RB_USER)) {
-			struct pollfd pfd;
-			pfd.fd = fp;
-			pfd.events = POLLIN;
-			ssize_t ret = poll(&pfd, 1, -1);
-		}
-		(*rxi)[rb_read].flags = RB_USER_PROCESS;
-
-		rx_pkt_cnt++;
-		cnt = (*rxi)[rb_read].len;
-		p = rx_buf + (rb_read * 2048);
-
-		rx_crc = *(int *) &p[cnt-4];
-		crc = 0xFFFFFFFF;
-		ck_sum = 0;
-
-		pkt_len = *(unsigned int *) &p[0];
-		pkt_seq = *(unsigned int *) &p[4];
-
-//		printf("Pkt len = %X, pkt seq = %X, driver len = %X\n", pkt_len, pkt_seq, cnt);
-
-		if (pkt_len != (cnt - 4))
-			printf("Packet length check fail, driver len = %ud, content = %ud\n",
-					cnt, pkt_len);
-
-		if (!first && (pkt_seq != (prev_seq + 1)))
-			printf("Sequence number check fail, pkt_seq = %ud, prev_seq = %ud\n",
-					pkt_seq, prev_seq);
-		first = 0;
-		prev_seq = pkt_seq;
-
-		for (i = 0; i < cnt-4; i++) {
-			ck_sum += p[i];
-
-			crc = ((crc >> 8) & 0x00FFFFFF) ^
-				crc_tab[(crc ^ p[i]) & 0xFF];
-//printf("idx = %d, data = %X, crc = %X, ck_sum = %X\n", i, p[i], crc, ck_sum);
-//			crc = ((crc >> 8) & 0x00FFFFFF) ^
-//				crc_tab[(crc ^ p[i+1]) & 0xFF];
-//printf("idx = %d, data = %X, crc = %X\n", i, p[i+1],crc);
-		}
-
-		(*rxi)[rb_read].flags = RB_KERNEL;
-
-
-		if (rx_crc != ck_sum)
-			printf("Ck_sum eror, calc ck_sum = %lX, rx ck_sum = %X\n",
-					ck_sum, rx_crc);
-
-#if 0
-		if (rx_crc != (crc & 0xFFFFFFFF)) {
-			printf("CRC Error, calc crc: %X, rx_crc: %X\n",
-				(crc & 0xFFFFFFFF), rx_crc);
-		}
-#endif
-
-		rb_read++;
-		if (rb_read == rb_size.num_rx_frames)
-			rb_read = 0;
-
-		bytes_transfered += cnt;
-
-		if (bytes_transfered > (100 * 1000000)) {
-			struct timeval finish_time, d_time;
-			float elapsed_seconds;
-
-			gettimeofday(&finish_time, NULL);
-
-			printf("sec = %ld, usec = %ld\n", finish_time.tv_sec, finish_time.tv_usec);
-
-			d_time = delta_time(finish_time, start_time);
-
-			elapsed_seconds = (float)d_time.tv_sec + ((float)d_time.tv_usec * 1e-6f);
-
-			printf("Bytes transfered = %ld, elapsed seconds = %f\n", bytes_transfered, elapsed_seconds);
-			printf("RX data transfer rate = %f K Samples/second\n",
-				(float) bytes_transfered / (float) elapsed_seconds / 4000);
-
-
-			start_time = finish_time;
-			bytes_transfered = 0;
-		}
-	}	
-}
-	
-static void *write_thread(void *threadid)
-{
-	int i, tx_pkt_cnt, rb_write;
-	int tx_len;
-	unsigned long crc;
-	unsigned long bytes_transfered;
-	struct timeval start_time;
-	__u8 *p;
-
-	printf("Greetings from the write thread!\n");
-
-	rb_write = 0;
-	tx_pkt_cnt = 0;
-
-	bytes_transfered = 0;
-	gettimeofday(&start_time, NULL);
-
-	while (1) {
-
-		tx_pkt_cnt++;
-		p = tx_buf + (rb_write * 2048);
-
-//		printf("p = %p\n", p);
-
-		if (packet_data_length > 0)
-			tx_len = packet_data_length;
-		else
-			tx_len = (random() & 0x1ff) + (2044 - 512);
-
-#if 0
-		if (tx_pkt_cnt  == 512) {
-			printf(".");
-			fflush(stdout);
-		}
-		if (tx_pkt_cnt  == 1024) {
-			printf("'");
-			fflush(stdout);
-		}
-		if (tx_pkt_cnt  == 1536) {
-			printf(":");
-			fflush(stdout);
-			tx_pkt_cnt = 0;
-		}
-#endif
-
-//		printf("Checking for space at rb entry = %d\n", rb_write);
-		while (!((*txi)[rb_write].flags & RB_KERNEL)) {
-			struct pollfd pfd;
-			pfd.fd = fp;
-			pfd.events = POLLOUT;
-			ssize_t ret = poll(&pfd, 1, -1);
-		}
-//		printf("Got space\n");
-
-		crc = 0xFFFFFFFF;
-		for (i = 0; i < tx_len-4; i++) {
-			p[i] = i & 0xFF;
-//			printf("%X ", p[i]);
-			crc = ((crc >> 8) & 0x00FFFFFF) ^
-				crc_tab[(crc ^ p[i]) & 0xFF];
-
-		}
-		*(int *) &p[tx_len-4] = crc;
-//		printf("\n crc = %lX\n", crc);
-
-		(*txi)[rb_write].len = tx_len;
-		(*txi)[rb_write].flags = RB_USER;
-
-		rb_write++;
-		if (rb_write == rb_size.num_tx_frames)
-			rb_write = 0;
-
-		bytes_transfered += tx_len;
-
-		if (bytes_transfered > (100 * 1000000)) {
-			struct timeval finish_time, d_time;
-			float elapsed_seconds;
-
-			gettimeofday(&finish_time, NULL);
-
-			d_time = delta_time(finish_time, start_time);
-
-			elapsed_seconds = (float)d_time.tv_sec - ((float)d_time.tv_usec * 1e-6f);
-
-			printf("Bytes transfered = %ld, elapsed seconds = %f\n", bytes_transfered, elapsed_seconds);
-			printf("TX data transfer rate = %f K Samples/second\n",
-				(float) bytes_transfered / (float) elapsed_seconds / 4000);
-
-
-			start_time = finish_time;
-			bytes_transfered = 0;
-		}
-
-//		sleep(1);
-	}
-}
-
-
-int main(int argc, char *argv[])
-{
-	pthread_t tx, rx;
-	long int t;
-	int fpga_config_flag ,decimation;
-	int ret, map_size, page_size;
-	void *rb;
-
-	struct usrp_e_ctl16 d;
-	struct sched_param s = {
-		.sched_priority = 1
-	};
-
-	if (argc < 4) {
-		printf("%s r|w|rw decimation data_size\n", argv[0]);
-		return -1;
-	}
-
-	chksum_crc32_gentab();
-
-	decimation = atoi(argv[2]);
-	packet_data_length = atoi(argv[3]);
-
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
-
-	page_size = getpagesize();
-
-	ret = ioctl(fp, USRP_E_GET_RB_INFO, &rb_size);
-
-	map_size = (rb_size.num_pages_rx_flags + rb_size.num_pages_tx_flags) * page_size +
-		(rb_size.num_rx_frames + rb_size.num_tx_frames) * (page_size >> 1);
-
-	rb = mmap(0, map_size, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0);
-	if (rb == MAP_FAILED) {
-		perror("mmap failed");
-		return -1;
-	}
-
-	printf("rb = %X\n", rb);
-
-	rxi = rb;
-	rx_buf = rb + (rb_size.num_pages_rx_flags * page_size);
-	txi = rb + (rb_size.num_pages_rx_flags * page_size) +
-		(rb_size.num_rx_frames * page_size >> 1);
-	tx_buf = rb + (rb_size.num_pages_rx_flags * page_size) +
-		(rb_size.num_rx_frames * page_size >> 1) +
-		(rb_size.num_pages_tx_flags * page_size);
-
-	fpga_config_flag = 0;
-	if (strcmp(argv[1], "w") == 0)
-		fpga_config_flag |= (1 << 15);
-	else if (strcmp(argv[1], "r") == 0)
-		fpga_config_flag |= (1 << 14);
-	else if (strcmp(argv[1], "rw") == 0)
-		fpga_config_flag |= ((1 << 15) | (1 << 14));
-
-	fpga_config_flag |= decimation;
-
-	d.offset = 14;
-	d.count = 1;
-	d.buf[0] = fpga_config_flag;
-	ioctl(fp, USRP_E_WRITE_CTL16, &d);
-
-	sleep(1); // in case the kernel threads need time to start. FIXME if so
-
-	sched_setscheduler(0, SCHED_RR, &s);
-
-	if (fpga_config_flag & (1 << 14)) {
-		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
-			printf("Failed to create rx thread\n");
-			exit(-1);
-		}
-	}
-
-	sleep(1);
-
-	if (fpga_config_flag & (1 << 15)) {
-		if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
-			printf("Failed to create tx thread\n");
-			exit(-1);
-		}
-	}
-
-	sleep(10000);
-
-	printf("Done sleeping\n");
-
-	return 0;
-}
diff --git a/host/apps/omap_debug/usrp-e-loopback.c b/host/apps/omap_debug/usrp-e-loopback.c
deleted file mode 100644
index d11cf7d09..000000000
--- a/host/apps/omap_debug/usrp-e-loopback.c
+++ /dev/null
@@ -1,194 +0,0 @@
-#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 "usrp_e.h"
-
-// max length #define PKT_DATA_LENGTH 1016
-static int packet_data_length;
-static int error;
-
-struct pkt {
-	int len;
-	int checksum;
-	int seq_num;
-	short data[];
-};
-
-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;
-
-	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;
-		}
-
-		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() & 0x1ff) + (1004 - 512);
-
-		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;
-	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]);
-
-	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/apps/omap_debug/usrp-e-mm-loopback.c b/host/apps/omap_debug/usrp-e-mm-loopback.c
deleted file mode 100644
index b67eecd21..000000000
--- a/host/apps/omap_debug/usrp-e-mm-loopback.c
+++ /dev/null
@@ -1,260 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <sys/mman.h>
-#include <poll.h>
-#include "usrp_e.h"
-
-// max length #define PKT_DATA_LENGTH 1016
-static int packet_data_length;
-static int error;
-
-struct pkt {
-	int len;
-	int checksum;
-	int seq_num;
-	short data[1024-6];
-};
-
-struct ring_buffer_info (*rxi)[];
-struct ring_buffer_info (*txi)[];
-struct pkt (*rx_buf)[200];
-struct pkt (*tx_buf)[200];
-
-static int fp;
-static struct usrp_e_ring_buffer_size_t rb_size;
-
-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)
-{
-	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 rb_read;
-
-	printf("Greetings from the reading thread!\n");
-	printf("sizeof pkt = %d\n", sizeof(struct pkt));
-
-	rb_read = 0;
-
-	bytes_transfered = 0;
-	gettimeofday(&start_time, NULL);
-
-	prev_seq_num = 0;
-	pkt_count = 0;
-	seq_num_failure = 0;
-
-	while (1) {
-
-		if (!((*rxi)[rb_read].flags & RB_USER)) {
-//			printf("Waiting for data\n");
-			struct pollfd pfd;
-			pfd.fd = fp;
-			pfd.events = POLLIN;
-			ssize_t ret = poll(&pfd, 1, -1);
-		}
-
-		(*rxi)[rb_read].flags = RB_USER_PROCESS;
-
-//		printf("pkt received, rb_read = %d\n", rb_read);
-
-		cnt = (*rxi)[rb_read].len;
-		p = &(*rx_buf)[rb_read];
-
-//		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 = %X, p->seq_num = %d p->len = %d\n", p, p->seq_num, p->len);
-
-
-		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);
-			printf("pkt received, rb_read = %d\n", rb_read);
-			printf("p = %X, p->seq_num = %d p->len = %d\n", p, p->seq_num, p->len);
-
-			seq_num_failure ++;
-			if (seq_num_failure > 2)
-				error = 1;
-		}
-
-		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;
-		}
-
-		(*rxi)[rb_read].flags = RB_KERNEL;
-
-		rb_read++;
-		if (rb_read == rb_size.num_rx_frames)
-			rb_read = 0;
-
-		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, rb_write;
-	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;
-	rb_write = 0;
-
-	while (1) {
-		p->seq_num = seq_number++;
-
-		if (packet_data_length > 0)
-			p->len = packet_data_length;
-		else
-			p->len = (random() & 0x1ff) + (1004 - 512);
-
-		p->checksum = calc_checksum(p);
-
-		if (!((*txi)[rb_write].flags & RB_KERNEL)) {
-//			printf("Waiting for space\n");
-			struct pollfd pfd;
-			pfd.fd = fp;
-			pfd.events = POLLOUT;
-			ssize_t ret = poll(&pfd, 1, -1);
-		}
-
-		memcpy(&(*tx_buf)[rb_write], tx_data, p->len * 2 + 12);
-
-		(*txi)[rb_write].len = p->len * 2 + 12;
-		(*txi)[rb_write].flags = RB_USER;
-
-		rb_write++;
-		if (rb_write == rb_size.num_tx_frames)
-			rb_write = 0;
-
-		cnt = write(fp, NULL, 0);
-//		if (cnt < 0)
-//			printf("Error returned from write: %d\n", cnt);
-//		sleep(1);
-	}
-}
-
-
-int main(int argc, char *argv[])
-{
-	pthread_t tx, rx;
-	long int t;
-	struct sched_param s = {
-		.sched_priority = 1
-	};
-	int ret, map_size, page_size;
-	void *rb;
-
-	if (argc < 2) {
-		printf("%s data_size\n", argv[0]);
-		return -1;
-	}
-
-	packet_data_length = atoi(argv[1]);
-
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
-
-	page_size = getpagesize();
-
-	ret = ioctl(fp, USRP_E_GET_RB_INFO, &rb_size);
-
-	map_size = (rb_size.num_pages_rx_flags + rb_size.num_pages_tx_flags) * page_size +
-		(rb_size.num_rx_frames + rb_size.num_tx_frames) * (page_size >> 1);
-
-	rb = mmap(0, map_size, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0);
-	if (rb == MAP_FAILED) {
-		perror("mmap failed");
-		return -1;
-	}
-
-	printf("rb = %X\n", rb);
-
-	rxi = rb;
-	rx_buf = rb + (rb_size.num_pages_rx_flags * page_size);
-	txi = rb +  (rb_size.num_pages_rx_flags * page_size) +
-		(rb_size.num_rx_frames * page_size >> 1);
-	tx_buf = rb +  (rb_size.num_pages_rx_flags * page_size) +
-		(rb_size.num_rx_frames * page_size >> 1) +
-		(rb_size.num_pages_tx_flags * page_size);
-
-	printf("rxi = %X, rx_buf = %X, txi = %X, tx_buf = %X\n", rxi, rx_buf, txi, tx_buf);
-
-	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/apps/omap_debug/usrp-e-random-loopback.c b/host/apps/omap_debug/usrp-e-random-loopback.c
deleted file mode 100644
index 5960b8fbd..000000000
--- a/host/apps/omap_debug/usrp-e-random-loopback.c
+++ /dev/null
@@ -1,149 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stddef.h>
-#include "usrp_e.h"
-
-// max length #define PKT_DATA_LENGTH 1014
-static int packet_data_length;
-
-struct pkt {
-	int checksum;
-	int seq_num;
-	int len;
-	short data[];
-};
-
-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;
-
-	return sum;
-}
-
-int randN(int n)
-{
-	long tmp;
-
-	tmp = rand()  % n;
-
-	return tmp;
-}
-
-static void *read_thread(void *threadid)
-{
-	int cnt, prev_seq_num;
-	struct usrp_transfer_frame *rx_data;
-	struct pkt *p;
-
-	printf("Greetings from the reading thread!\n");
-
-	// IMPORTANT: must assume max length packet from fpga
-	rx_data = malloc(sizeof(struct usrp_transfer_frame) + sizeof(struct pkt) + (1014 * 2));
-	rx_data = malloc(2048);
-	p = (struct pkt *) ((void *)rx_data + offsetof(struct usrp_transfer_frame, buf));
-	//p = &(rx_data->buf[0]);
-	printf("Address of rx_data = %p, p = %p\n", rx_data, p);
-	printf("offsetof = %d\n", offsetof(struct usrp_transfer_frame, buf));
-	printf("sizeof rx data = %d\n", sizeof(struct usrp_transfer_frame) + sizeof(struct pkt));
-
-	prev_seq_num = 0;
-
-	while (1) {
-
-		cnt = read(fp, rx_data, 2048);
-//		printf("Packet received, status = %X, len = %d\n", rx_data->status, rx_data->len);
-//		printf("p->seq_num = %d\n", p->seq_num);
-
-		if (p->seq_num != prev_seq_num + 1)
-			printf("Sequence number fail, current = %d, previous = %d\n",
-				p->seq_num, prev_seq_num);
-		prev_seq_num = p->seq_num;
-
-		if (calc_checksum(p) != p->checksum)
-			printf("Checksum fail packet = %d, expected = %d\n",
-				calc_checksum(p), p->checksum);
-		printf(".");
-		fflush(stdout);
-//		printf("\n");
-	}
-
-}
-
-static void *write_thread(void *threadid)
-{
-	int seq_number, i, cnt, pkt_cnt;
-	struct usrp_transfer_frame *tx_data;
-	struct pkt *p;
-
-	printf("Greetings from the write thread!\n");
-
-	// Allocate max length buffer for frame
-	tx_data = malloc(2048);
-	p = (struct pkt *) ((void *)tx_data + offsetof(struct usrp_transfer_frame, buf));
-	printf("Address of tx_data = %p, p = %p\n", tx_data, p);
-
-	printf("sizeof rp_transfer_frame = %d, sizeof pkt = %d\n", sizeof(struct usrp_transfer_frame), sizeof(struct pkt));
-
-	for (i=0; i < 1014; i++)
-//		p->data[i] = random() >> 16;
-		p->data[i] = i;
-
-	tx_data->status = 0xdeadbeef;
-	tx_data->len = 8 + packet_data_length * 2;
-
-	printf("tx_data->len = %d\n", tx_data->len);
-
-	seq_number = 1;
-
-	while (1) {
-		pkt_cnt = randN(16);
-		for (i = 0; i < pkt_cnt; i++) {
-			p->seq_num = seq_number++;
-			p->len = randN(1013) + 1;
-			p->checksum = calc_checksum(p);
-			tx_data->len = 12 + p->len * 2;
-			cnt = write(fp, tx_data, tx_data->len + 8);
-		}
-		sleep(random() >> 31);
-	}
-}
-
-
-int main(int argc, char *argv[])
-{
-	pthread_t tx, rx;
-	long int t;
-
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
-
-	if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
-		printf("Failed to create rx thread\n");
-		exit(-1);
-	}
-
-	sleep(1);
-
-	if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
-		printf("Failed to create tx thread\n");
-		exit(-1);
-	}
-
-	sleep(1000000000);
-
-	printf("Done sleeping\n");
-}
diff --git a/host/apps/omap_debug/usrp-e-timed.c b/host/apps/omap_debug/usrp-e-timed.c
deleted file mode 100644
index 3cb33ce2d..000000000
--- a/host/apps/omap_debug/usrp-e-timed.c
+++ /dev/null
@@ -1,233 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stddef.h>
-#include "usrp_e.h"
-
-// max length #define PKT_DATA_LENGTH 1016
-static int packet_data_length;
-
-struct pkt {
-	int checksum;
-	int seq_num;
-	short data[];
-};
-
-static int fp;
-
-static int calc_checksum(struct pkt *p)
-{
-	int i, sum;
-
-	i = 0;
-	sum = 0;
-
-	for (i=0; i < packet_data_length; i++)
-		sum += p->data[i];
-
-	sum += p->seq_num;
-
-	return sum;
-}
-
-static void *read_thread(void *threadid)
-{
-	int cnt, prev_seq_num;
-	struct usrp_transfer_frame *rx_data;
-	struct pkt *p;
-	int rx_pkt_cnt;
-	int i;
-	unsigned long bytes_transfered, elapsed_seconds;
-	struct timeval start_time, finish_time;
-
-	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(sizeof(struct usrp_transfer_frame) + sizeof(struct pkt) + (1016 * 2));
-	p = (struct pkt *) ((void *)rx_data + offsetof(struct usrp_transfer_frame, buf));
-	//p = &(rx_data->buf[0]);
-	printf("Address of rx_data = %p, p = %p\n", rx_data, p);
-	printf("offsetof = %d\n", offsetof(struct usrp_transfer_frame, buf));
-	printf("sizeof rx data = %d\n", sizeof(struct usrp_transfer_frame) + sizeof(struct pkt));
-
-	prev_seq_num = 0;
-
-	rx_pkt_cnt = 0;
-
-	while (1) {
-
-		cnt = read(fp, rx_data, 2048);
-		if (cnt < 0)
-			printf("Error returned from read: %d\n", cnt);
-		rx_pkt_cnt++;
-
-#if 0
-		if (rx_pkt_cnt  == 512) {
-			printf(".");
-			fflush(stdout);
-			rx_pkt_cnt = 0;
-		}
-#endif
-
-		if (rx_data->status & RB_OVERRUN)
-			printf("O");
-
-		bytes_transfered += rx_data->len;
-
-		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;
-                }
-	}
-
-}
-
-static void *write_thread(void *threadid)
-{
-	int seq_number, i, cnt, tx_pkt_cnt;
-	struct usrp_transfer_frame *tx_data;
-	struct pkt *p;
-	unsigned long bytes_transfered, elapsed_seconds;
-	struct timeval start_time, finish_time;
-
-	printf("Greetings from the write thread!\n");
-
-	bytes_transfered = 0;
-	gettimeofday(&start_time, NULL);
-
-	tx_data = malloc(sizeof(struct usrp_transfer_frame) + sizeof(struct pkt) + (packet_data_length * 2));
-	p = (struct pkt *) ((void *)tx_data + offsetof(struct usrp_transfer_frame, buf));
-	printf("Address of tx_data = %p, p = %p\n", tx_data, p);
-
-	printf("sizeof rp_transfer_frame = %d, sizeof pkt = %d\n", sizeof(struct usrp_transfer_frame), sizeof(struct pkt));
-
-	for (i=0; i < packet_data_length; i++)
-//		p->data[i] = random() >> 16;
-		p->data[i] = i;
-
-	tx_data->status = 0;
-	tx_data->len = 8 + packet_data_length * 2;
-
-	printf("tx_data->len = %d\n", tx_data->len);
-
-	seq_number = 1;
-	tx_pkt_cnt = 0;
-
-	while (1) {
-
-		tx_pkt_cnt++;
-
-#if 0
-		if (tx_pkt_cnt  == 512) {
-			printf(".");
-			fflush(stdout);
-		}
-		if (tx_pkt_cnt  == 1024) {
-			printf("'");
-			fflush(stdout);
-		}
-		if (tx_pkt_cnt  == 1536) {
-			printf(":");
-			fflush(stdout);
-			tx_pkt_cnt = 0;
-		}
-#endif
-
-//		printf("tx status = %X, len = %d\n", tx_data->status, tx_data->len);
-		p->seq_num = seq_number++;
-		p->checksum = calc_checksum(p);
-		cnt = write(fp, tx_data, 2048);
-		if (cnt < 0)
-			printf("Error returned from write: %d\n", cnt);
-
-		bytes_transfered += tx_data->len;
-
-		if (bytes_transfered > (100 * 1000000)) {
-			gettimeofday(&finish_time, NULL);
-			elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
-
-			printf("TX data transfer rate = %f K Samples/second\n",
-				(float) bytes_transfered / (float) elapsed_seconds / 4000);
-
-
-			start_time = finish_time;
-			bytes_transfered = 0;
-                }
-//		sleep(1);
-	}
-}
-
-
-int main(int argc, char *argv[])
-{
-	pthread_t tx, rx;
-	long int t;
-	int fpga_config_flag ,decimation;
-	struct usrp_e_ctl16 d;
-	struct sched_param s = {
-		.sched_priority = 1
-	};
-
-	if (argc < 4) {
-		printf("%s r|w|rw decimation data_size\n", argv[0]);
-		return -1;
-	}
-
-	decimation = atoi(argv[2]);
-	packet_data_length = atoi(argv[3]);
-
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
-
-	fpga_config_flag = 0;
-	if (strcmp(argv[1], "w") == 0)
-		fpga_config_flag |= (1 << 15);
-	else if (strcmp(argv[1], "r") == 0)
-		fpga_config_flag |= (1 << 14);
-	else if (strcmp(argv[1], "rw") == 0)
-		fpga_config_flag |= ((1 << 15) | (1 << 14));
-
-	fpga_config_flag |= decimation;
-
-	d.offset = 14;
-	d.count = 1;
-	d.buf[0] = fpga_config_flag;
-	ioctl(fp, USRP_E_WRITE_CTL16, &d);
-
-	sleep(1); // in case the kernel threads need time to start. FIXME if so
-
-	sched_setscheduler(0, SCHED_RR, &s);
-
-	if (fpga_config_flag & (1 << 14)) {
-		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
-			printf("Failed to create rx thread\n");
-			exit(-1);
-		}
-	}
-
-	sleep(1);
-
-	if (fpga_config_flag & (1 << 15)) {
-		if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
-			printf("Failed to create tx thread\n");
-			exit(-1);
-		}
-	}
-
-	sleep(10000);
-
-	printf("Done sleeping\n");
-}