From 8df3a38c3be477a02c4b9d636a3ddd647e55e4a5 Mon Sep 17 00:00:00 2001
From: Philip Balister <balister@moose.(none)>
Date: Fri, 7 May 2010 15:45:31 -0400
Subject: First pass at data transfer program that uses CRC.

---
 host/apps/omap_debug/usrp-e-crc-rw.c | 195 +++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 host/apps/omap_debug/usrp-e-crc-rw.c

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
new file mode 100644
index 000000000..1f23c8d54
--- /dev/null
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -0,0 +1,195 @@
+#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;
+
+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 = 0xEDB88320L;
+
+	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;
+	}
+}
+
+static void *read_thread(void *threadid)
+{
+	int cnt;
+	struct usrp_transfer_frame *rx_data;
+	int rx_pkt_cnt;
+	int i;
+	unsigned long crc;
+	unsigned int rx_crc;
+
+	printf("Greetings from the reading thread!\n");
+
+	// IMPORTANT: must assume max length packet from fpga
+	rx_data = malloc(2048);
+
+	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 (rx_pkt_cnt  == 512) {
+			printf(".");
+			fflush(stdout);
+			rx_pkt_cnt = 0;
+		}
+		
+		if (rx_data->flags & RB_OVERRUN)
+			printf("O");
+		
+		crc = 0xFFFFFFFF;
+		for (i = 0; i < rx_data->len - 4; i++) {
+			crc = ((crc >> 8) & 0x00FFFFFF) ^
+				crc_tab[(crc ^ rx_data->buf[i]) & 0xFF];
+		}
+		
+		rx_crc = *((int *) &rx_data[rx_data->len - 4]);
+	
+		if (rx_crc != (crc & 0xFFFFFFFF)) {
+			printf("CRC Error, sent: %d, rx: %d\n",
+				rx_crc, (crc & 0xFFFFFFFF));
+		}
+		
+	}	
+}
+	
+static void *write_thread(void *threadid)
+{
+	int seq_number, i, cnt, tx_pkt_cnt;
+	int tx_len;
+	unsigned long crc;
+	struct usrp_transfer_frame *tx_data;
+	struct pkt *p;
+
+	printf("Greetings from the write thread!\n");
+
+	tx_data = malloc(2048);
+
+	while (1) {
+
+		tx_pkt_cnt++;
+		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;
+		}
+
+		tx_len = 2048 - sizeof(struct usrp_transfer_frame) - sizeof(int);
+		crc = 0xFFFFFFFF;
+		for (i = 0; i < tx_len; i++) {
+			tx_data->buf[i] = rand() & 0xFF;
+
+			crc = ((crc >> 8) & 0x00FFFFFF) ^
+				crc_tab[(crc ^ tx_data->buf[i]) & 0xFF];
+
+		}
+		*((int *) &tx_data[tx_len]) = crc;
+
+		cnt = write(fp, tx_data, 2048);
+		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;
+	int fpga_config_flag ,decimation;
+	struct usrp_e_ctl16 d;
+	struct sched_param s = {
+		.sched_priority = 1
+	};
+
+	if (argc < 4) {
+		printf("%s t|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");
+}
-- 
cgit v1.2.3


From 9251c115b302b7b5773e2e16bbd7a7dfd6c18b74 Mon Sep 17 00:00:00 2001
From: Philip Balister <balister@moose.(none)>
Date: Wed, 12 May 2010 14:11:10 -0400
Subject: Add calculation for data trasnfer rates.

---
 host/apps/omap_debug/usrp-e-crc-rw.c | 46 +++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index 1f23c8d54..f99654781 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -44,6 +44,8 @@ static void *read_thread(void *threadid)
 	int i;
 	unsigned long crc;
 	unsigned int rx_crc;
+	unsigned long bytes_transfered, elapsed_seconds;
+	struct timeval start_time, finish_time;
 
 	printf("Greetings from the reading thread!\n");
 
@@ -51,7 +53,10 @@ static void *read_thread(void *threadid)
 	rx_data = malloc(2048);
 
 	rx_pkt_cnt = 0;
-	
+
+	bytes_transfered = 0;
+	gettimeofday(&start_time, NULL);
+
 	while (1) {
 		
 		cnt = read(fp, rx_data, 2048);
@@ -81,7 +86,20 @@ static void *read_thread(void *threadid)
 			printf("CRC Error, sent: %d, rx: %d\n",
 				rx_crc, (crc & 0xFFFFFFFF));
 		}
-		
+
+		bytes_transfered += rx_data->len;
+
+		if (bytes_transfered > (100 * 1000000)) {
+			gettimeofday(&finish_time, NULL);
+			elapsed_seconds = start_time.tv_sec - finish_time.tv_sec;
+
+			printf("RX data transfer rate = %f K Bps\n",
+				(float) bytes_transfered / (float) elapsed_seconds / 1000);
+
+
+			start_time = finish_time;
+			bytes_transfered = 0;
+		}
 	}	
 }
 	
@@ -91,12 +109,16 @@ static void *write_thread(void *threadid)
 	int tx_len;
 	unsigned long crc;
 	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");
 
 	tx_data = malloc(2048);
 
+	bytes_transfered = 0;
+	gettimeofday(&start_time, NULL);
+
 	while (1) {
 
 		tx_pkt_cnt++;
@@ -115,6 +137,8 @@ static void *write_thread(void *threadid)
 		}
 
 		tx_len = 2048 - sizeof(struct usrp_transfer_frame) - sizeof(int);
+		tx_data->len = tx_len + sizeof(int);
+
 		crc = 0xFFFFFFFF;
 		for (i = 0; i < tx_len; i++) {
 			tx_data->buf[i] = rand() & 0xFF;
@@ -128,6 +152,22 @@ static void *write_thread(void *threadid)
 		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 = start_time.tv_sec - finish_time.tv_sec;
+
+			printf("TX data transfer rate = %f K Bps\n",
+				(float) bytes_transfered / (float) elapsed_seconds / 1000);
+
+
+			start_time = finish_time;
+			bytes_transfered = 0;
+		}
+
 //		sleep(1);
 	}
 }
-- 
cgit v1.2.3


From 4d82cabe938b398bc42cab3d316983d2bbe40d06 Mon Sep 17 00:00:00 2001
From: Philip Balister <balister@moose.(none)>
Date: Fri, 14 May 2010 10:05:54 -0400
Subject: Update test program to reflect what is in the FPGA image.

---
 host/apps/omap_debug/usrp-e-crc-rw.c | 41 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index f99654781..e32cf2c59 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -177,43 +177,42 @@ 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
 	};
+	int read, write;
 
-	if (argc < 4) {
-		printf("%s t|w|rw decimation data_size\n", argv[0]);
+	if (argc < 2) {
+		printf("%s  r|w|rw tx_data_size\n", argv[0]);
 		return -1;
 	}
 
-	decimation = atoi(argv[2]);
-	packet_data_length = atoi(argv[3]);
+	packet_data_length = atoi(argv[2]);
 
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
+	if (strcmp(argv[1], "r") == 0) {
+		read = 1;
+		write = 0;
+	}
 
-	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));
+	if (strcmp(argv[1], "w") == 0) {
+		read = 0;
+		write = 1;
+	}
 
-	fpga_config_flag |= decimation;
+	if (strcmp(argv[1], "rw") == 0) {
+		read = 1;
+		write = 1;
+	}
 
-	d.offset = 14;
-	d.count = 1;
-	d.buf[0] = fpga_config_flag;
-	ioctl(fp, USRP_E_WRITE_CTL16, &d);
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
 
 	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 (read) {
 		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
 			printf("Failed to create rx thread\n");
 			exit(-1);
@@ -222,7 +221,7 @@ int main(int argc, char *argv[])
 
 	sleep(1);
 
-	if (fpga_config_flag & (1 << 15)) {
+	if (write) {
 		if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
 			printf("Failed to create tx thread\n");
 			exit(-1);
-- 
cgit v1.2.3


From 7d0a98fc33c17457c9f4cd8e03eddb0d559457f0 Mon Sep 17 00:00:00 2001
From: Philip Balister <balister@moose.(none)>
Date: Tue, 18 May 2010 10:26:21 -0400
Subject: Revert "Update test program to reflect what is in the FPGA image."

This reverts commit 4d82cabe938b398bc42cab3d316983d2bbe40d06.

Now sure where I got the idea this image did not contain the rate setting code.
---
 host/apps/omap_debug/usrp-e-crc-rw.c | 41 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index e32cf2c59..f99654781 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -177,42 +177,43 @@ 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
 	};
-	int read, write;
 
-	if (argc < 2) {
-		printf("%s  r|w|rw tx_data_size\n", argv[0]);
+	if (argc < 4) {
+		printf("%s t|w|rw decimation data_size\n", argv[0]);
 		return -1;
 	}
 
-	packet_data_length = atoi(argv[2]);
+	decimation = atoi(argv[2]);
+	packet_data_length = atoi(argv[3]);
 
-	if (strcmp(argv[1], "r") == 0) {
-		read = 1;
-		write = 0;
-	}
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
 
-	if (strcmp(argv[1], "w") == 0) {
-		read = 0;
-		write = 1;
-	}
+	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));
 
-	if (strcmp(argv[1], "rw") == 0) {
-		read = 1;
-		write = 1;
-	}
+	fpga_config_flag |= decimation;
 
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
+	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 (read) {
+	if (fpga_config_flag & (1 << 14)) {
 		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
 			printf("Failed to create rx thread\n");
 			exit(-1);
@@ -221,7 +222,7 @@ int main(int argc, char *argv[])
 
 	sleep(1);
 
-	if (write) {
+	if (fpga_config_flag & (1 << 15)) {
 		if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
 			printf("Failed to create tx thread\n");
 			exit(-1);
-- 
cgit v1.2.3


From 3689cdd36c43656edc93cfee25d3bee1837f8bbd Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Tue, 18 May 2010 14:27:57 +0000
Subject: Remove rand for now. Fix bug in data rate calculation.

---
 host/apps/omap_debug/usrp-e-crc-rw.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index f99654781..b3f8ccc90 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -114,6 +114,7 @@ static void *write_thread(void *threadid)
 
 	printf("Greetings from the write thread!\n");
 
+	tx_pkt_cnt = 0;
 	tx_data = malloc(2048);
 
 	bytes_transfered = 0;
@@ -141,7 +142,7 @@ static void *write_thread(void *threadid)
 
 		crc = 0xFFFFFFFF;
 		for (i = 0; i < tx_len; i++) {
-			tx_data->buf[i] = rand() & 0xFF;
+			tx_data->buf[i] = i & 0xFF;
 
 			crc = ((crc >> 8) & 0x00FFFFFF) ^
 				crc_tab[(crc ^ tx_data->buf[i]) & 0xFF];
@@ -158,8 +159,9 @@ static void *write_thread(void *threadid)
 
 		if (bytes_transfered > (100 * 1000000)) {
 			gettimeofday(&finish_time, NULL);
-			elapsed_seconds = start_time.tv_sec - finish_time.tv_sec;
+			elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
 
+			printf("%d bytes transfered in %d seconds.\n", bytes_transfered, elapsed_seconds);
 			printf("TX data transfer rate = %f K Bps\n",
 				(float) bytes_transfered / (float) elapsed_seconds / 1000);
 
-- 
cgit v1.2.3


From b5dfe74e991d240f0e666dfd521726ec61128eb8 Mon Sep 17 00:00:00 2001
From: Philip Balister <balister@moose.(none)>
Date: Tue, 18 May 2010 13:56:57 -0400
Subject: Revert "Revert "Update test program to reflect what is in the FPGA
 image.""

This reverts commit 7d0a98fc33c17457c9f4cd8e03eddb0d559457f0.

Must make filenames more different.
---
 host/apps/omap_debug/usrp-e-crc-rw.c | 41 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index b3f8ccc90..d47dfef5e 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -179,43 +179,42 @@ 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
 	};
+	int read, write;
 
-	if (argc < 4) {
-		printf("%s t|w|rw decimation data_size\n", argv[0]);
+	if (argc < 2) {
+		printf("%s  r|w|rw tx_data_size\n", argv[0]);
 		return -1;
 	}
 
-	decimation = atoi(argv[2]);
-	packet_data_length = atoi(argv[3]);
+	packet_data_length = atoi(argv[2]);
 
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
+	if (strcmp(argv[1], "r") == 0) {
+		read = 1;
+		write = 0;
+	}
 
-	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));
+	if (strcmp(argv[1], "w") == 0) {
+		read = 0;
+		write = 1;
+	}
 
-	fpga_config_flag |= decimation;
+	if (strcmp(argv[1], "rw") == 0) {
+		read = 1;
+		write = 1;
+	}
 
-	d.offset = 14;
-	d.count = 1;
-	d.buf[0] = fpga_config_flag;
-	ioctl(fp, USRP_E_WRITE_CTL16, &d);
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
 
 	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 (read) {
 		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
 			printf("Failed to create rx thread\n");
 			exit(-1);
@@ -224,7 +223,7 @@ int main(int argc, char *argv[])
 
 	sleep(1);
 
-	if (fpga_config_flag & (1 << 15)) {
+	if (write) {
 		if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
 			printf("Failed to create tx thread\n");
 			exit(-1);
-- 
cgit v1.2.3


From e62fd331f37f532e63bdc302236a53dc2e2021e9 Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Tue, 18 May 2010 17:58:39 +0000
Subject: Comment out progress indicators.

---
 host/apps/omap_debug/usrp-e-crc-rw.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index d47dfef5e..cd95761a2 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -64,13 +64,15 @@ static void *read_thread(void *threadid)
 			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->flags & RB_OVERRUN)
 			printf("O");
 		
@@ -91,7 +93,7 @@ static void *read_thread(void *threadid)
 
 		if (bytes_transfered > (100 * 1000000)) {
 			gettimeofday(&finish_time, NULL);
-			elapsed_seconds = start_time.tv_sec - finish_time.tv_sec;
+			elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
 
 			printf("RX data transfer rate = %f K Bps\n",
 				(float) bytes_transfered / (float) elapsed_seconds / 1000);
@@ -123,6 +125,8 @@ static void *write_thread(void *threadid)
 	while (1) {
 
 		tx_pkt_cnt++;
+
+#if 0
 		if (tx_pkt_cnt  == 512) {
 			printf(".");
 			fflush(stdout);
@@ -136,6 +140,7 @@ static void *write_thread(void *threadid)
 			fflush(stdout);
 			tx_pkt_cnt = 0;
 		}
+#endif
 
 		tx_len = 2048 - sizeof(struct usrp_transfer_frame) - sizeof(int);
 		tx_data->len = tx_len + sizeof(int);
@@ -161,7 +166,6 @@ static void *write_thread(void *threadid)
 			gettimeofday(&finish_time, NULL);
 			elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
 
-			printf("%d bytes transfered in %d seconds.\n", bytes_transfered, elapsed_seconds);
 			printf("TX data transfer rate = %f K Bps\n",
 				(float) bytes_transfered / (float) elapsed_seconds / 1000);
 
-- 
cgit v1.2.3


From ad01832ca5a52d70a5f26de9c45868626b850785 Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Wed, 19 May 2010 15:01:23 +0000
Subject: Keep repo in sync with my churn ...

---
 host/apps/omap_debug/usrp-e-crc-rw.c |  3 ++-
 host/apps/omap_debug/usrp-e-rw.c     | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index cd95761a2..e1d9bf0db 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -211,12 +211,13 @@ int main(int argc, char *argv[])
 		write = 1;
 	}
 
+	printf("About to open /dev/usrp_e0");
 	fp = open("/dev/usrp_e0", O_RDWR);
 	printf("fp = %d\n", fp);
 
 	sleep(1); // in case the kernel threads need time to start. FIXME if so
 
-	sched_setscheduler(0, SCHED_RR, &s);
+//	sched_setscheduler(0, SCHED_RR, &s);
 
 	if (read) {
 		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
diff --git a/host/apps/omap_debug/usrp-e-rw.c b/host/apps/omap_debug/usrp-e-rw.c
index 7fba8cd2a..1b12fa889 100644
--- a/host/apps/omap_debug/usrp-e-rw.c
+++ b/host/apps/omap_debug/usrp-e-rw.c
@@ -35,7 +35,7 @@ static int calc_checksum(struct pkt *p)
 
 static void *read_thread(void *threadid)
 {
-	int cnt, prev_seq_num;
+	int cnt, prev_seq_num, pkt_count;
 	struct usrp_transfer_frame *rx_data;
 	struct pkt *p;
 
@@ -50,6 +50,7 @@ static void *read_thread(void *threadid)
 	printf("sizeof rx data = %d\n", sizeof(struct usrp_transfer_frame) + sizeof(struct pkt));
 
 	prev_seq_num = 0;
+	pkt_count = 0;
 
 	while (1) {
 
@@ -60,14 +61,17 @@ static void *read_thread(void *threadid)
 //		printf("Packet received, flags = %X, len = %d\n", rx_data->flags, 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\n",
-				p->seq_num, prev_seq_num);
+			printf("Sequence number fail, current = %X, previous = %X, pkt_count = %d\n",
+				p->seq_num, prev_seq_num, pkt_count);
 		prev_seq_num = p->seq_num;
 
 		if (calc_checksum(p) != p->checksum)
-			printf("Checksum fail packet = %X, expected = %X\n",
-				calc_checksum(p), p->checksum);
+			printf("Checksum fail packet = %X, expected = %X, pkt_count = %d\n",
+				calc_checksum(p), p->checksum, pkt_count);
 
 		printf(".");
 		fflush(stdout);
@@ -108,7 +112,7 @@ static void *write_thread(void *threadid)
 		cnt = write(fp, tx_data, 2048);
 		if (cnt < 0)
 			printf("Error returned from write: %d\n", cnt);
-	//	sleep(1);
+		sleep(1);
 	}
 }
 
-- 
cgit v1.2.3


From 96ef5b171b44956f44e02672af8a734f3c0e38c4 Mon Sep 17 00:00:00 2001
From: Philip Balister <balister@moose.(none)>
Date: Fri, 21 May 2010 10:14:03 -0400
Subject: OK, now crc uses the timed interface to set the data rate.

Revert "Revert "Revert "Update test program to reflect what is in the FPGA image."""

This reverts commit b5dfe74e991d240f0e666dfd521726ec61128eb8.

Conflicts:

	host/apps/omap_debug/usrp-e-crc-rw.c
---
 host/apps/omap_debug/usrp-e-crc-rw.c | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index e1d9bf0db..b0982de86 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -183,43 +183,43 @@ 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
 	};
-	int read, write;
 
-	if (argc < 2) {
-		printf("%s  r|w|rw tx_data_size\n", argv[0]);
+	if (argc < 4) {
+		printf("%s t|w|rw decimation data_size\n", argv[0]);
 		return -1;
 	}
 
-	packet_data_length = atoi(argv[2]);
+	decimation = atoi(argv[2]);
+	packet_data_length = atoi(argv[3]);
 
-	if (strcmp(argv[1], "r") == 0) {
-		read = 1;
-		write = 0;
-	}
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
 
-	if (strcmp(argv[1], "w") == 0) {
-		read = 0;
-		write = 1;
-	}
+	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));
 
-	if (strcmp(argv[1], "rw") == 0) {
-		read = 1;
-		write = 1;
-	}
+	fpga_config_flag |= decimation;
 
-	printf("About to open /dev/usrp_e0");
-	fp = open("/dev/usrp_e0", O_RDWR);
-	printf("fp = %d\n", fp);
+	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 (read) {
+	if (fpga_config_flag & (1 << 14)) {
 		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
 			printf("Failed to create rx thread\n");
 			exit(-1);
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
 
 	sleep(1);
 
-	if (write) {
+	if (fpga_config_flag & (1 << 15)) {
 		if (pthread_create(&tx, NULL, write_thread, (void *) t)) {
 			printf("Failed to create tx thread\n");
 			exit(-1);
-- 
cgit v1.2.3


From 85e32e298217a16102d25a455d605c55a05e369c Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Fri, 21 May 2010 21:13:25 +0000
Subject: Work on crc testing program. Currently dumps first received packet to
 the screen. Started to reduce teh number of warnings.

---
 host/apps/omap_debug/usrp-e-crc-rw.c | 46 ++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 10 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index b0982de86..8883366ae 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -1,5 +1,8 @@
 #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>
@@ -34,6 +37,8 @@ static u_int32_t chksum_crc32_gentab(void)
 		}
 		crc_tab[i] = crc;
 	}
+
+	return 0;
 }
 
 static void *read_thread(void *threadid)
@@ -47,6 +52,9 @@ static void *read_thread(void *threadid)
 	unsigned long bytes_transfered, elapsed_seconds;
 	struct timeval start_time, finish_time;
 
+	__u8 *p;
+	__u32 *pi;
+
 	printf("Greetings from the reading thread!\n");
 
 	// IMPORTANT: must assume max length packet from fpga
@@ -81,12 +89,24 @@ static void *read_thread(void *threadid)
 			crc = ((crc >> 8) & 0x00FFFFFF) ^
 				crc_tab[(crc ^ rx_data->buf[i]) & 0xFF];
 		}
-		
-		rx_crc = *((int *) &rx_data[rx_data->len - 4]);
-	
+
+		p = &rx_data->buf[rx_data->len - 4];
+		pi = (__u32 *) p;
+		rx_crc = *pi;
+
+#if 1
+		printf("rx_data->len = %d\n", rx_data->len);
+		printf("rx_data->flags = %d\n", rx_data->flags);
+		for (i = 0; i < rx_data->len; i++)
+			printf("idx = %d, data = %X\n", i, rx_data->buf[i]);
+		printf("calc crc = %lX, rx crc = %X\n", crc, rx_crc); 
+		fflush(stdout);
+		break;
+#endif
+
 		if (rx_crc != (crc & 0xFFFFFFFF)) {
-			printf("CRC Error, sent: %d, rx: %d\n",
-				rx_crc, (crc & 0xFFFFFFFF));
+			printf("CRC Error, calc crc: %X, rx_crc: %X\n",
+				(crc & 0xFFFFFFFF), rx_crc);
 		}
 
 		bytes_transfered += rx_data->len;
@@ -95,8 +115,9 @@ static void *read_thread(void *threadid)
 			gettimeofday(&finish_time, NULL);
 			elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
 
-			printf("RX data transfer rate = %f K Bps\n",
-				(float) bytes_transfered / (float) elapsed_seconds / 1000);
+			printf("Bytes transfered = %ld, elapsed seconds = %ld\n", bytes_transfered, elapsed_seconds);
+			printf("RX data transfer rate = %f K Samples/second\n",
+				(float) bytes_transfered / (float) elapsed_seconds / 250);
 
 
 			start_time = finish_time;
@@ -166,8 +187,9 @@ static void *write_thread(void *threadid)
 			gettimeofday(&finish_time, NULL);
 			elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
 
-			printf("TX data transfer rate = %f K Bps\n",
-				(float) bytes_transfered / (float) elapsed_seconds / 1000);
+			printf("Bytes transfered = %d, elapsed seconds = %d\n", bytes_transfered, elapsed_seconds);
+			printf("TX data transfer rate = %f K Samples/second\n",
+				(float) bytes_transfered / (float) elapsed_seconds / 250);
 
 
 			start_time = finish_time;
@@ -194,6 +216,8 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
+	chksum_crc32_gentab();
+
 	decimation = atoi(argv[2]);
 	packet_data_length = atoi(argv[3]);
 
@@ -217,7 +241,7 @@ int main(int argc, char *argv[])
 
 	sleep(1); // in case the kernel threads need time to start. FIXME if so
 
-//	sched_setscheduler(0, SCHED_RR, &s);
+	sched_setscheduler(0, SCHED_RR, &s);
 
 	if (fpga_config_flag & (1 << 14)) {
 		if (pthread_create(&rx, NULL, read_thread, (void *) t)) {
@@ -238,4 +262,6 @@ int main(int argc, char *argv[])
 	sleep(10000);
 
 	printf("Done sleeping\n");
+
+	return 0;
 }
-- 
cgit v1.2.3


From 8869208ea8d8dfdd5fe86adc1637b93c4b390c0c Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Fri, 28 May 2010 11:26:40 +0000
Subject: Update usrp_e.h file. Change programs to use struct element status
 instead of flags.

---
 host/apps/omap_debug/usrp-e-crc-rw.c    | 15 +++++++++++----
 host/apps/omap_debug/usrp-e-lb-test.c   |  2 +-
 host/apps/omap_debug/usrp-e-loopback.c  |  6 +++---
 host/apps/omap_debug/usrp-e-rw-random.c |  4 ++--
 host/apps/omap_debug/usrp-e-timed.c     |  6 +++---
 host/apps/omap_debug/usrp_e.h           | 16 +++++++++-------
 6 files changed, 29 insertions(+), 20 deletions(-)

(limited to 'host/apps/omap_debug/usrp-e-crc-rw.c')

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index 8883366ae..c3ae45cc1 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -81,13 +81,20 @@ static void *read_thread(void *threadid)
 		}
 #endif
 
-		if (rx_data->flags & RB_OVERRUN)
+		if (rx_data->status & RB_OVERRUN)
 			printf("O");
-		
+
+		printf("rx_data->len = %d\n", rx_data->len);
+
+	
 		crc = 0xFFFFFFFF;
-		for (i = 0; i < rx_data->len - 4; i++) {
+		for (i = 0; i < rx_data->len - 4; i+=2) {
+			crc = ((crc >> 8) & 0x00FFFFFF) ^
+				crc_tab[(crc ^ rx_data->buf[i+1]) & 0xFF];
+printf("idx = %d, data = %X, crc = %X\n", i, rx_data->buf[i+1],crc);
 			crc = ((crc >> 8) & 0x00FFFFFF) ^
 				crc_tab[(crc ^ rx_data->buf[i]) & 0xFF];
+printf("idx = %d, data = %X, crc = %X\n", i, rx_data->buf[i],crc);
 		}
 
 		p = &rx_data->buf[rx_data->len - 4];
@@ -96,7 +103,7 @@ static void *read_thread(void *threadid)
 
 #if 1
 		printf("rx_data->len = %d\n", rx_data->len);
-		printf("rx_data->flags = %d\n", rx_data->flags);
+		printf("rx_data->status = %d\n", rx_data->status);
 		for (i = 0; i < rx_data->len; i++)
 			printf("idx = %d, data = %X\n", i, rx_data->buf[i]);
 		printf("calc crc = %lX, rx crc = %X\n", crc, rx_crc); 
diff --git a/host/apps/omap_debug/usrp-e-lb-test.c b/host/apps/omap_debug/usrp-e-lb-test.c
index 675de8622..68848064e 100644
--- a/host/apps/omap_debug/usrp-e-lb-test.c
+++ b/host/apps/omap_debug/usrp-e-lb-test.c
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 	tx_data = malloc(2048);
 	rx_data = malloc(2048);
 
-	tx_data->flags = 0;
+	tx_data->status = 0;
 	tx_data->len = sizeof(struct usrp_transfer_frame) + packet_data_length;
 
 	while (1) {
diff --git a/host/apps/omap_debug/usrp-e-loopback.c b/host/apps/omap_debug/usrp-e-loopback.c
index 177394947..535ce1025 100644
--- a/host/apps/omap_debug/usrp-e-loopback.c
+++ b/host/apps/omap_debug/usrp-e-loopback.c
@@ -63,7 +63,7 @@ static void *read_thread(void *threadid)
 		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("Packet received, status = %X, len = %d\n", rx_data->status, rx_data->len);
 //		printf("p->seq_num = %d\n", p->seq_num);
 
 
@@ -119,7 +119,7 @@ static void *write_thread(void *threadid)
 //		p->data[i] = random() >> 16;
 		p->data[i] = i;
 
-	tx_data->flags = 0xdeadbeef;
+	tx_data->status = 0xdeadbeef;
 	tx_data->len = 8 + packet_data_length * 2;
 
 	printf("tx_data->len = %d\n", tx_data->len);
@@ -127,7 +127,7 @@ static void *write_thread(void *threadid)
 	seq_number = 1;
 
 	while (1) {
-//		printf("tx flags = %X, len = %d\n", tx_data->flags, tx_data->len);
+//		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);
diff --git a/host/apps/omap_debug/usrp-e-rw-random.c b/host/apps/omap_debug/usrp-e-rw-random.c
index 43f1571cb..5960b8fbd 100644
--- a/host/apps/omap_debug/usrp-e-rw-random.c
+++ b/host/apps/omap_debug/usrp-e-rw-random.c
@@ -65,7 +65,7 @@ static void *read_thread(void *threadid)
 	while (1) {
 
 		cnt = read(fp, rx_data, 2048);
-//		printf("Packet received, flags = %X, len = %d\n", rx_data->flags, rx_data->len);
+//		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)
@@ -102,7 +102,7 @@ static void *write_thread(void *threadid)
 //		p->data[i] = random() >> 16;
 		p->data[i] = i;
 
-	tx_data->flags = 0xdeadbeef;
+	tx_data->status = 0xdeadbeef;
 	tx_data->len = 8 + packet_data_length * 2;
 
 	printf("tx_data->len = %d\n", tx_data->len);
diff --git a/host/apps/omap_debug/usrp-e-timed.c b/host/apps/omap_debug/usrp-e-timed.c
index c71651741..3cb33ce2d 100644
--- a/host/apps/omap_debug/usrp-e-timed.c
+++ b/host/apps/omap_debug/usrp-e-timed.c
@@ -75,7 +75,7 @@ static void *read_thread(void *threadid)
 		}
 #endif
 
-		if (rx_data->flags & RB_OVERRUN)
+		if (rx_data->status & RB_OVERRUN)
 			printf("O");
 
 		bytes_transfered += rx_data->len;
@@ -118,7 +118,7 @@ static void *write_thread(void *threadid)
 //		p->data[i] = random() >> 16;
 		p->data[i] = i;
 
-	tx_data->flags = 0;
+	tx_data->status = 0;
 	tx_data->len = 8 + packet_data_length * 2;
 
 	printf("tx_data->len = %d\n", tx_data->len);
@@ -146,7 +146,7 @@ static void *write_thread(void *threadid)
 		}
 #endif
 
-//		printf("tx flags = %X, len = %d\n", tx_data->flags, tx_data->len);
+//		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);
diff --git a/host/apps/omap_debug/usrp_e.h b/host/apps/omap_debug/usrp_e.h
index fd74e6e9e..b098ad114 100644
--- a/host/apps/omap_debug/usrp_e.h
+++ b/host/apps/omap_debug/usrp_e.h
@@ -28,14 +28,14 @@ struct usrp_e_ctl32 {
 	__u32 buf[10];
 };
 
-// SPI interface
+/* SPI interface */
 
 #define UE_SPI_TXONLY	0
 #define UE_SPI_TXRX	1
 
-// Defines for spi ctrl register
-#define UE_SPI_CTRL_TXNEG	(1<<10)
-#define UE_SPI_CTRL_RXNEG	(1<<9)
+/* Defines for spi ctrl register */
+#define UE_SPI_CTRL_TXNEG	(1 << 10)
+#define UE_SPI_CTRL_RXNEG	(1 << 9)
 
 #define UE_SPI_PUSH_RISE	0
 #define UE_SPI_PUSH_FALL	UE_SPI_CTRL_TXNEG
@@ -65,20 +65,22 @@ struct usrp_e_i2c {
 #define USRP_E_I2C_READ		_IOWR(USRP_E_IOC_MAGIC, 0x25, struct usrp_e_i2c)
 #define USRP_E_I2C_WRITE	_IOW(USRP_E_IOC_MAGIC, 0x26, struct usrp_e_i2c)
 
-// Data transfer frame definition
+/* Data transfer frame definition */
 
 struct usrp_transfer_frame {
-	__u32 flags;
+	__u32 status;
 	__u32 len;
 	__u8  buf[];
 };
 
-// Flag defines
+/* Flag defines */
 #define RB_USER (1 << 0)
 #define RB_KERNEL (1 << 1)
 #define RB_OVERRUN (1 << 2)
+#define RB_DMA_ACTIVE (1 << 3)
 
 struct ring_buffer_entry {
+	unsigned int flags;
 	unsigned long dma_addr;
 	struct usrp_transfer_frame *frame_addr;
 };
-- 
cgit v1.2.3