Updates to test programs.

3 files changed, 181 insertions, 14 deletions

diff --git a/host/apps/omap_debug/Makefile b/host/apps/omap_debug/Makefile
index 61f659b3e..b00210c4f 100644
--- a/host/apps/omap_debug/Makefile
+++ b/host/apps/omap_debug/Makefile
@@ -1,6 +1,6 @@
 CFLAGS=-Wall -I../../lib/usrp/usrp_e/
 
-all : usrp-e-spi usrp-e-i2c usrp-e-rw 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
+all : usrp-e-spi usrp-e-i2c usrp-e-rw 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-rw-random
 
 usrp-e-spi : usrp-e-spi.c
 
@@ -9,6 +9,9 @@ usrp-e-i2c : usrp-e-i2c.c
 usrp-e-rw : usrp-e-rw.c
 	gcc -o $@ $< -lpthread
 
+usrp-e-rw-random : usrp-e-rw-random.c
+	gcc -o $@ $< -lpthread
+
 usrp-e-uart : usrp-e-uart.c
 
 usrp-e-uart-rx : usrp-e-uart-rx.c
@@ -28,6 +31,7 @@ clean :
 	rm -f usrp-e-spi
 	rm -f usrp-e-i2c
 	rm -f usrp-e-rw
+	rm -f usrp-e-rw-random
 	rm -f usrp-e-uart
 	rm -f usrp-e-uart-rx
 	rm -f usrp-e-led
diff --git a/host/apps/omap_debug/usrp-e-rw-random.c b/host/apps/omap_debug/usrp-e-rw-random.c
new file mode 100644
index 000000000..67d6ca803
--- /dev/null
+++ b/host/apps/omap_debug/usrp-e-rw-random.c
@@ -0,0 +1,147 @@
+#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, flags = %X, len = %d\n", rx_data->flags, 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("\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->flags = 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, 2048);
+		}
+		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(10000);
+
+	printf("Done sleeping\n");
+}
diff --git a/host/apps/omap_debug/usrp-e-rw.c b/host/apps/omap_debug/usrp-e-rw.c
index 5fd73e9b6..edfcea92a 100644
--- a/host/apps/omap_debug/usrp-e-rw.c
+++ b/host/apps/omap_debug/usrp-e-rw.c
@@ -7,13 +7,13 @@
 #include <stddef.h>
 #include "usrp_e.h"
 
-#define PKT_DATA_LENGTH 30
 // max length #define PKT_DATA_LENGTH 1016
+static int packet_data_length;
 
 struct pkt {
 	int checksum;
 	int seq_num;
-	short data[PKT_DATA_LENGTH];
+	short data[];
 };
 
 static int fp;
@@ -25,7 +25,7 @@ static int calc_checksum(struct pkt *p)
 	i = 0;
 	sum = 0;
 
-	for (i=0; i<PKT_DATA_LENGTH; i++)
+	for (i=0; i < packet_data_length; i++)
 		sum += p->data[i];
 
 	sum += p->seq_num;
@@ -41,20 +41,24 @@ static void *read_thread(void *threadid)
 
 	printf("Greetings from the reading thread!\n");
 
-	rx_data = malloc(sizeof(struct usrp_transfer_frame) + sizeof(struct pkt));
+	// 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 = %X\n", sizeof(struct usrp_transfer_frame) + sizeof(struct pkt));
+	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, flags = %X, len = %X\n", rx_data->flags, rx_data->len);
-		printf("p->seq_num = %d\n", p->seq_num);
+		if (cnt < 0)
+			printf("Error returned from read: %d\n", cnt);
+
+//		printf("Packet received, flags = %X, len = %d\n", rx_data->flags, 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 = %X, previous = %X\n",
@@ -64,7 +68,7 @@ static void *read_thread(void *threadid)
 		if (calc_checksum(p) != p->checksum)
 			printf("Checksum fail packet = %X, expected = %X\n",
 				calc_checksum(p), p->checksum);
-		printf("\n");
+//		printf("\n");
 	}
 
 }
@@ -77,26 +81,31 @@ static void *write_thread(void *threadid)
 
 	printf("Greetings from the write thread!\n");
 
-	tx_data = malloc(sizeof(struct usrp_transfer_frame) + sizeof(struct pkt));
+	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 tx data = %X\n", sizeof(struct usrp_transfer_frame) + sizeof(struct pkt));
+	printf("sizeof rp_transfer_frame = %d, sizeof pkt = %d\n", sizeof(struct usrp_transfer_frame), sizeof(struct pkt));
 
-	for (i=0; i<PKT_DATA_LENGTH; i++)
+	for (i=0; i < packet_data_length; i++)
 //		p->data[i] = random() >> 16;
 		p->data[i] = i;
 
 	tx_data->flags = 0xdeadbeef;
-	tx_data->len = 8 + PKT_DATA_LENGTH * 2;
+	tx_data->len = 8 + packet_data_length * 2;
+
+	printf("tx_data->len = %d\n", tx_data->len);
 
 	seq_number = 1;
 
 	while (1) {
+//		printf("tx flags = %X, len = %d\n", tx_data->flags, tx_data->len);
 		p->seq_num = seq_number++;
 		p->checksum = calc_checksum(p);
 		cnt = write(fp, tx_data, 2048);
-		sleep(1);
+		if (cnt < 0)
+			printf("Error returned from write: %d\n", cnt);
+	//	sleep(1);
 	}
 }
 
@@ -106,6 +115,13 @@ int main(int argc, char *argv[])
 	pthread_t tx, rx;
 	long int t;
 
+	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);