Loopback test now supports variable size and works with mmapable ring buffer.

1 files changed, 28 insertions, 11 deletions

diff --git a/host/apps/omap_debug/usrp-e-loopback.c b/host/apps/omap_debug/usrp-e-loopback.c
index 929d65604..c463e774d 100644
--- a/host/apps/omap_debug/usrp-e-loopback.c
+++ b/host/apps/omap_debug/usrp-e-loopback.c
@@ -14,6 +14,7 @@ static int error;
 struct pkt {
 	int checksum;
 	int seq_num;
+	int len;
 	short data[];
 };
 
@@ -26,10 +27,11 @@ 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;
 }
@@ -48,7 +50,7 @@ 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));
+	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);
@@ -60,14 +62,16 @@ static void *read_thread(void *threadid)
 	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("Packet received, status = %X, len = %d\n", rx_data->status, rx_data->len);
-//		printf("p->seq_num = %d\n", p->seq_num);
+//		printf("p->seq_num = %d, p->len = %d\n", p->seq_num, p->len);
+
 
+		if (rx_data->len != (p->len*2 + 12))
+			printf("rx_data->len = %d, p->len*2 + 12 = %d\n", rx_data->len, p->len*2 + 12);
 
 		pkt_count++;
 
@@ -83,8 +87,8 @@ static void *read_thread(void *threadid)
 		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);
+			printf("Cksum fail rx = %X, tx = %X, dif = %d, count = %d, len = %d, rx->len = %d\n",
+				calc_checksum(p), p->checksum, p->checksum - calc_checksum(p), pkt_count, p->len, rx_data->len);
 			error = 1;
 		}
 
@@ -112,24 +116,23 @@ static void *read_thread(void *threadid)
 
 static void *write_thread(void *threadid)
 {
-	int seq_number, i, cnt;
+	int seq_number, i, cnt, data_length;
 	struct usrp_transfer_frame *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));
+	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 < packet_data_length; i++)
+	for (i=0; i < 2048; 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);
 
@@ -137,9 +140,23 @@ static void *write_thread(void *threadid)
 
 	while (1) {
 //		printf("tx status = %X, len = %d\n", tx_data->status, tx_data->len);
+		if (packet_data_length > 0)
+			data_length = packet_data_length;
+		else 
+			data_length = (random() & 0x1ff) + (1004 - 512);
+
+//		printf("data_length = %d\n", data_length);
+
 		p->seq_num = seq_number++;
+		p->len = data_length;
 		p->checksum = calc_checksum(p);
-		cnt = write(fp, tx_data, 2048);
+		tx_data->len = 12 + p->len * 2;
+
+//		printf("tx status = %X, len = %d, p->len = %d\n", tx_data->status, tx_data->len, p->len);
+
+		cnt = write(fp, tx_data, sizeof(struct usrp_transfer_frame) + sizeof(struct pkt) + 2 * p->len);
+//		cnt = write(fp, tx_data, 2048);
+
 		if (cnt < 0)
 			printf("Error returned from write: %d\n", cnt);
 //		sleep(1);