diff options
| -rw-r--r-- | host/apps/omap_debug/Makefile | 6 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp-e-loopback.c | 39 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp-e-mm-loopback.c | 194 | 
3 files changed, 227 insertions, 12 deletions
| 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..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); 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..d11cf7d09 --- /dev/null +++ b/host/apps/omap_debug/usrp-e-mm-loopback.c @@ -0,0 +1,194 @@ +#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 "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[]; +}; + +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) +{ +	char *rx_data; +	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; + +	printf("Greetings from the reading thread!\n"); + +	bytes_transfered = 0; +	gettimeofday(&start_time, NULL); + +	// IMPORTANT: must assume max length packet from fpga +	rx_data = malloc(2048); +	p = (struct pkt *) ((void *)rx_data); + +	prev_seq_num = 0; +	pkt_count = 0; +	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("p->seq_num = %d\n", p->seq_num); + + +		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; +		} + +		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; +	struct usrp_transfer_frame *tx_rb, *rx_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) { +		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(1000000000); + +	printf("Done sleeping\n"); +} | 
