Merge branch 'usrp_e' into usrp_e_merge

4 files changed, 270 insertions, 27 deletions

diff --git a/host/apps/omap_debug/.gitignore b/host/apps/omap_debug/.gitignore
index 5d6b1c6f5..008a23138 100644
--- a/host/apps/omap_debug/.gitignore
+++ b/host/apps/omap_debug/.gitignore
@@ -17,3 +17,4 @@ usrp-e-spi
 usrp-e-timed
 usrp-e-uart
 usrp-e-uart-rx
+usrp-e-mm-loopback
diff --git a/host/apps/omap_debug/Makefile b/host/apps/omap_debug/Makefile
index c11609bdd..46d4714a8 100644
--- a/host/apps/omap_debug/Makefile
+++ b/host/apps/omap_debug/Makefile
@@ -1,7 +1,7 @@
 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-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-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
 
 usrp-e-spi : usrp-e-spi.c
 
@@ -10,6 +10,9 @@ 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}
 
@@ -42,6 +45,7 @@ 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
diff --git a/host/apps/omap_debug/usrp-e-loopback.c b/host/apps/omap_debug/usrp-e-loopback.c
index 929d65604..d11cf7d09 100644
--- a/host/apps/omap_debug/usrp-e-loopback.c
+++ b/host/apps/omap_debug/usrp-e-loopback.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stddef.h>
+#include <sys/mman.h>
 #include "usrp_e.h"
 
 // max length #define PKT_DATA_LENGTH 1016
@@ -12,6 +13,7 @@ static int packet_data_length;
 static int error;
 
 struct pkt {
+	int len;
 	int checksum;
 	int seq_num;
 	short data[];
@@ -26,18 +28,19 @@ static int calc_checksum(struct pkt *p)
 	i = 0;
 	sum = 0;
 
-	for (i=0; i < packet_data_length; i++)
+	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 usrp_transfer_frame *rx_data;
 	struct pkt *p;
 	unsigned long bytes_transfered, elapsed_seconds;
 	struct timeval start_time, finish_time;
@@ -48,12 +51,8 @@ static void *read_thread(void *threadid)
 	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));
+	rx_data = malloc(2048);
+	p = (struct pkt *) ((void *)rx_data);
 
 	prev_seq_num = 0;
 	pkt_count = 0;
@@ -65,14 +64,13 @@ static void *read_thread(void *threadid)
 		if (cnt < 0)
 			printf("Error returned from read: %d, sequence number = %d\n", cnt, p->seq_num);
 
-//		printf("Packet received, status = %X, len = %d\n", rx_data->status, rx_data->len);
 //		printf("p->seq_num = %d\n", p->seq_num);
 
 
 		pkt_count++;
 
 		if (p->seq_num != prev_seq_num + 1) {
-			printf("Sequence number fail, current = %X, previous = %X, pkt_count = %d\n",
+			printf("Sequence number fail, current = %d, previous = %d, pkt_count = %d\n",
 				p->seq_num, prev_seq_num, pkt_count);
 
 			seq_num_failure ++;
@@ -88,7 +86,7 @@ static void *read_thread(void *threadid)
 			error = 1;
 		}
 
-		bytes_transfered += rx_data->len;
+		bytes_transfered += cnt;
 
 		if (bytes_transfered > (100 * 1000000)) {
 			gettimeofday(&finish_time, NULL);
@@ -113,33 +111,31 @@ static void *read_thread(void *threadid)
 static void *write_thread(void *threadid)
 {
 	int seq_number, i, cnt;
-	struct usrp_transfer_frame *tx_data;
+	void *tx_data;
 	struct pkt *p;
 
 	printf("Greetings from the write thread!\n");
 
-	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));
+	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;
 
-	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) {
-//		printf("tx status = %X, len = %d\n", tx_data->status, tx_data->len);
 		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, 2048);
+
+		cnt = write(fp, tx_data, p->len * 2 + 12);
 		if (cnt < 0)
 			printf("Error returned from write: %d\n", cnt);
 //		sleep(1);
@@ -154,6 +150,8 @@ int main(int argc, char *argv[])
 	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]);
@@ -165,23 +163,32 @@ int main(int argc, char *argv[])
 	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(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
new file mode 100644
index 000000000..722d09825
--- /dev/null
+++ b/host/apps/omap_debug/usrp-e-mm-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 <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];
+};
+
+/* delete after usrp_e.h updated */
+struct ring_buffer_info {
+	int flags;
+	int len;
+};
+
+struct ring_buffer_info (*rxi)[];
+struct ring_buffer_info (*txi)[];
+struct pkt (*rx_buf)[200];
+struct pkt (*tx_buf)[200];
+
+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)
+{
+	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);
+		}
+
+		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);
+
+			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 == 200)
+			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;
+	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;
+
+	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 == MAP_FAILED) {
+		perror("mmap failed");
+		exit;
+	}
+
+	printf("rb = %X\n", rb);
+
+	rxi = rb;
+	rx_buf = rb + 4096;
+	txi = rb + 4096 + 4096 * 200;
+	tx_buf = rb + 4096 * 2 + 4096 * 200;
+
+	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");
+}