1 files changed, 29 insertions, 13 deletions

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);