diff options
| author | Philip Balister <philip@opensdr.com> | 2011-02-21 07:45:39 -0800 | 
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2011-02-21 07:45:39 -0800 | 
| commit | 40f58d26c28adee8c8aebf93df25535e16050932 (patch) | |
| tree | 02e35966a323700454102c1d0b0d4060d65a64fb | |
| parent | d7ae215814ab104be699d3f6d078ce84e6558330 (diff) | |
| download | uhd-40f58d26c28adee8c8aebf93df25535e16050932.tar.gz uhd-40f58d26c28adee8c8aebf93df25535e16050932.tar.bz2 uhd-40f58d26c28adee8c8aebf93df25535e16050932.zip | |
usrp-e-utils : Remove old files.
| -rw-r--r-- | host/apps/omap_debug/Makefile | 19 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp-e-crc-rw.c | 379 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp-e-loopback.c | 194 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp-e-mm-loopback.c | 273 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp-e-random-loopback.c | 149 | 
5 files changed, 1 insertions, 1013 deletions
| diff --git a/host/apps/omap_debug/Makefile b/host/apps/omap_debug/Makefile index 46d4714a8..dd27ba657 100644 --- a/host/apps/omap_debug/Makefile +++ b/host/apps/omap_debug/Makefile @@ -1,27 +1,12 @@  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-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 +all : usrp-e-spi usrp-e-i2c 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-lb-test usrp-e-crc-rw clkgen-config  usrp-e-spi : usrp-e-spi.c  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} - -usrp-e-random-loopback : usrp-e-random-loopback.c -	gcc -o $@ $< -lpthread ${CFLAGS} - -usrp-e-crc-rw : usrp-e-crc-rw.c -	gcc -o $@ $< -lpthread ${CFLAGS} -  usrp-e-uart : usrp-e-uart.c  usrp-e-uart-rx : usrp-e-uart-rx.c @@ -38,8 +23,6 @@ clkgen-config : clkgen-config.cc  usrp-e-gpio : usrp-e-gpio.c -usrp-e-lb-test : usrp-e-lb-test.c -  usrp-e-debug-pins : usrp-e-debug-pins.c  clean :  	rm -f usrp-e-spi diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c deleted file mode 100644 index 7f4ff0023..000000000 --- a/host/apps/omap_debug/usrp-e-crc-rw.c +++ /dev/null @@ -1,379 +0,0 @@ -#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> -#include <unistd.h> -#include <stddef.h> -#include <poll.h> -#include <sys/mman.h> -#include "usrp_e.h" - -// max length #define PKT_DATA_LENGTH 1016 -static int packet_data_length; - -struct ring_buffer_info (*rxi)[]; -struct ring_buffer_info (*txi)[]; -__u8 *rx_buf; -__u8 *tx_buf; -static struct usrp_e_ring_buffer_size_t rb_size; - -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 = 0x04C11DB7L; - -	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; -//		printf("crc_tab[%d] = %X\n", i , crc); -	} - -	return 0; -} - -struct timeval delta_time(struct timeval f, struct timeval s) -{ -	struct timeval d; - -	if (f.tv_usec > s.tv_usec) { -		d.tv_usec = f.tv_usec - s.tv_usec; -		d.tv_sec = f.tv_sec - s.tv_sec; -	} else { -		d.tv_usec = f.tv_usec - s.tv_usec + 1e6; -		d.tv_sec = f.tv_sec - s.tv_sec - 1; -	} - -	return d; -} - - -static void *read_thread(void *threadid) -{ -	int cnt; -	int rx_pkt_cnt, rb_read; -	int i; -	unsigned long crc, ck_sum; -	unsigned int rx_crc, pkt_len, pkt_seq; -	unsigned long bytes_transfered; -	struct timeval start_time; -	unsigned int prev_seq = 0; -	int first = 1; - -	__u8 *p; - - -	printf("Greetings from the reading thread!\n"); - -	// IMPORTANT: must assume max length packet from fpga -	 -	rx_pkt_cnt = 0; -	rb_read = 0; - -	bytes_transfered = 0; -	gettimeofday(&start_time, NULL); - -	while (1) { -		 -		while (!((*rxi)[rb_read].flags & RB_USER)) { -			struct pollfd pfd; -			pfd.fd = fp; -			pfd.events = POLLIN; -			poll(&pfd, 1, -1); -		} -		(*rxi)[rb_read].flags = RB_USER_PROCESS; - -		rx_pkt_cnt++; -		cnt = (*rxi)[rb_read].len; -		p = rx_buf + (rb_read * 2048); - -		rx_crc = *(int *) &p[cnt-4]; -		crc = 0xFFFFFFFF; -		ck_sum = 0; - -		pkt_len = *(unsigned int *) &p[0]; -		pkt_seq = *(unsigned int *) &p[4]; - -//		printf("Pkt len = %X, pkt seq = %X, driver len = %X\n", pkt_len, pkt_seq, cnt); - -		if (pkt_len != (cnt - 4)) -			printf("Packet length check fail, driver len = %ud, content = %ud\n", -					cnt, pkt_len); - -		if (!first && (pkt_seq != (prev_seq + 1))) -			printf("Sequence number check fail, pkt_seq = %ud, prev_seq = %ud\n", -					pkt_seq, prev_seq); -		first = 0; -		prev_seq = pkt_seq; - -		for (i = 0; i < cnt-4; i++) { -			ck_sum += p[i]; - -			crc = ((crc >> 8) & 0x00FFFFFF) ^ -				crc_tab[(crc ^ p[i]) & 0xFF]; -//printf("idx = %d, data = %X, crc = %X, ck_sum = %X\n", i, p[i], crc, ck_sum); -//			crc = ((crc >> 8) & 0x00FFFFFF) ^ -//				crc_tab[(crc ^ p[i+1]) & 0xFF]; -//printf("idx = %d, data = %X, crc = %X\n", i, p[i+1],crc); -		} - -		(*rxi)[rb_read].flags = RB_KERNEL; -		write(fp, NULL, 1); - -		if (rx_crc != ck_sum) -			printf("Ck_sum eror, calc ck_sum = %lX, rx ck_sum = %X\n", -					ck_sum, rx_crc); - -#if 0 -		if (rx_crc != (crc & 0xFFFFFFFF)) { -			printf("CRC Error, calc crc: %X, rx_crc: %X\n", -				(crc & 0xFFFFFFFF), rx_crc); -		} -#endif - -		rb_read++; -		if (rb_read == rb_size.num_rx_frames) -			rb_read = 0; - -		bytes_transfered += cnt; - -		if (bytes_transfered > (100 * 1000000)) { -			struct timeval finish_time, d_time; -			float elapsed_seconds; - -			gettimeofday(&finish_time, NULL); - -			printf("sec = %ld, usec = %ld\n", finish_time.tv_sec, finish_time.tv_usec); - -			d_time = delta_time(finish_time, start_time); - -			elapsed_seconds = (float)d_time.tv_sec + ((float)d_time.tv_usec * 1e-6f); - -			printf("Bytes transfered = %ld, elapsed seconds = %f\n", bytes_transfered, elapsed_seconds); -			printf("RX data transfer rate = %f K Samples/second\n", -				(float) bytes_transfered / (float) elapsed_seconds / 4000); - - -			start_time = finish_time; -			bytes_transfered = 0; -		} -	}	 -	return NULL; -} -	 -static void *write_thread(void *threadid) -{ -	int i, tx_pkt_cnt, rb_write; -	int tx_len; -	unsigned long crc; -	unsigned long bytes_transfered; -	struct timeval start_time; -	unsigned int pkt_seq = 0; -	__u8 *p; - -	printf("Greetings from the write thread!\n"); - -	rb_write = 0; -	tx_pkt_cnt = 0; - -	bytes_transfered = 0; -	gettimeofday(&start_time, NULL); - -	while (1) { - -		tx_pkt_cnt++; -		p = tx_buf + (rb_write * 2048); - -//		printf("p = %p\n", p); - -		if (packet_data_length > 0) -			tx_len = packet_data_length; -		else -			tx_len = (random() & 0x1ff) + (2044 - 512); - -#if 0 -		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; -		} -#endif - -//		printf("Checking for space at rb entry = %d\n", rb_write); -		while (!((*txi)[rb_write].flags & RB_KERNEL)) { -			struct pollfd pfd; -			pfd.fd = fp; -			pfd.events = POLLOUT; -			poll(&pfd, 1, -1); -		} -//		printf("Got space\n"); - -		for (i=8; i < tx_len-4; i++) { -			p[i] = i & 0xFF; -		} - -		*(unsigned int *) &p[0] = tx_len-4; -		*(unsigned int *) &p[4] = pkt_seq; - -		pkt_seq++; - -		crc = 0xFFFFFFFF; -		for (i = 0; i < tx_len-4; i++) { -//			printf("%X ", p[i]); -			crc = ((crc >> 8) & 0x00FFFFFF) ^ -				crc_tab[(crc ^ p[i]) & 0xFF]; - -		} -		*(unsigned int *) &p[tx_len-4] = crc; -//		printf("\n crc = %lX\n", crc); - -		(*txi)[rb_write].len = tx_len; -		(*txi)[rb_write].flags = RB_USER; - -		rb_write++; -		if (rb_write == rb_size.num_tx_frames) -			rb_write = 0; - -		bytes_transfered += tx_len; - -		if (bytes_transfered > (100 * 1000000)) { -			struct timeval finish_time, d_time; -			float elapsed_seconds; - -			gettimeofday(&finish_time, NULL); - -			d_time = delta_time(finish_time, start_time); - -			elapsed_seconds = (float)d_time.tv_sec - ((float)d_time.tv_usec * 1e-6f); - -			printf("Bytes transfered = %ld, elapsed seconds = %f\n", bytes_transfered, elapsed_seconds); -			printf("TX data transfer rate = %f K Samples/second\n", -				(float) bytes_transfered / (float) elapsed_seconds / 4000); - - -			start_time = finish_time; -			bytes_transfered = 0; -		} - -//		sleep(1); -	} -	return NULL; -} - - -int main(int argc, char *argv[]) -{ -	pthread_t tx, rx; -	long int t=0; -	int fpga_config_flag ,decimation; -	int ret, map_size, page_size; -	void *rb; - -	struct usrp_e_ctl16 d; -	struct sched_param s = { -		.sched_priority = 1 -	}; - -	if (argc < 4) { -		printf("%s r|w|rw decimation data_size\n", argv[0]); -		return -1; -	} - -	chksum_crc32_gentab(); - -	decimation = atoi(argv[2]); -	packet_data_length = atoi(argv[3]); - -	fp = open("/dev/usrp_e0", O_RDWR); -	printf("fp = %d\n", fp); - -	page_size = getpagesize(); - -	ret = ioctl(fp, USRP_E_GET_RB_INFO, &rb_size); - -	map_size = (rb_size.num_pages_rx_flags + rb_size.num_pages_tx_flags) * page_size + -		(rb_size.num_rx_frames + rb_size.num_tx_frames) * (page_size >> 1); - -	rb = mmap(0, map_size, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0); -	if (rb == MAP_FAILED) { -		perror("mmap failed"); -		return -1; -	} - -	printf("rb = %p\n", rb); - -	rxi = rb; -	rx_buf = rb + (rb_size.num_pages_rx_flags * page_size); -	txi = rb + (rb_size.num_pages_rx_flags * page_size) + -		(rb_size.num_rx_frames * page_size >> 1); -	tx_buf = rb + (rb_size.num_pages_rx_flags * page_size) + -		(rb_size.num_rx_frames * page_size >> 1) + -		(rb_size.num_pages_tx_flags * page_size); - -	fpga_config_flag = (1<<8); -	if (strcmp(argv[1], "w") == 0) -		fpga_config_flag |= (1 << 11); -	else if (strcmp(argv[1], "r") == 0) -		fpga_config_flag |= (1 << 10); -	else if (strcmp(argv[1], "rw") == 0) -		fpga_config_flag |= ((1 << 10) | (1 << 11)); - -	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 << 10)) { -		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 << 11)) { -		if (pthread_create(&tx, NULL, write_thread, (void *) t)) { -			printf("Failed to create tx thread\n"); -			exit(-1); -		} -	} - -	sleep(10000); - -	printf("Done sleeping\n"); - -	return 0; -} diff --git a/host/apps/omap_debug/usrp-e-loopback.c b/host/apps/omap_debug/usrp-e-loopback.c deleted file mode 100644 index d11cf7d09..000000000 --- a/host/apps/omap_debug/usrp-e-loopback.c +++ /dev/null @@ -1,194 +0,0 @@ -#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"); -} diff --git a/host/apps/omap_debug/usrp-e-mm-loopback.c b/host/apps/omap_debug/usrp-e-mm-loopback.c deleted file mode 100644 index 14f68a5c3..000000000 --- a/host/apps/omap_debug/usrp-e-mm-loopback.c +++ /dev/null @@ -1,273 +0,0 @@ -#include <stdio.h> -#include <string.h> -#include <sys/types.h> -#include <sys/ioctl.h> -#include <fcntl.h> -#include <pthread.h> -#include <stdlib.h> -#include <unistd.h> -#include <stddef.h> -#include <sys/mman.h> -#include <sys/time.h> -#include <poll.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[1024-6]; -}; - -struct ring_buffer_info (*rxi)[]; -struct ring_buffer_info (*txi)[]; -struct pkt (*rx_buf)[200]; -struct pkt (*tx_buf)[200]; - -static int fp; -static struct usrp_e_ring_buffer_size_t rb_size; - -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) -{ -	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; -	int rb_read; - -	printf("Greetings from the reading thread!\n"); -	printf("sizeof pkt = %d\n", sizeof(struct pkt)); - -	rb_read = 0; - -	bytes_transfered = 0; -	gettimeofday(&start_time, NULL); - -	prev_seq_num = 0; -	pkt_count = 0; -	seq_num_failure = 0; - -	while (1) { - -		if (!((*rxi)[rb_read].flags & RB_USER)) { -//			printf("Waiting for data\n"); -			struct pollfd pfd; -			pfd.fd = fp; -			pfd.events = POLLIN; -			poll(&pfd, 1, -1); -		} - -		(*rxi)[rb_read].flags = RB_USER_PROCESS; - -//		printf("pkt received, rb_read = %d\n", rb_read); - -		cnt = (*rxi)[rb_read].len; -		p = &(*rx_buf)[rb_read]; - -//		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 = %X, p->seq_num = %d p->len = %d\n", p, p->seq_num, p->len); - - -		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); -			printf("pkt received, rb_read = %d\n", rb_read); -			printf("p = %p, p->seq_num = %d p->len = %d\n", p, p->seq_num, p->len); - -			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; -		} - -		(*rxi)[rb_read].flags = RB_KERNEL; - -		rb_read++; -		if (rb_read == rb_size.num_rx_frames) -			rb_read = 0; - -		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"); -	} -	return NULL; -} - -static void *write_thread(void *threadid) -{ -	int seq_number, i, cnt, rb_write; -	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; -	rb_write = 0; - -	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); - -		if (!((*txi)[rb_write].flags & RB_KERNEL)) { -//			printf("Waiting for space\n"); -			struct pollfd pfd; -			pfd.fd = fp; -			pfd.events = POLLOUT; -			poll(&pfd, 1, -1); -		} - -		memcpy(&(*tx_buf)[rb_write], tx_data, p->len * 2 + 12); - -		(*txi)[rb_write].len = p->len * 2 + 12; -		(*txi)[rb_write].flags = RB_USER; - -		rb_write++; -		if (rb_write == rb_size.num_tx_frames) -			rb_write = 0; - -		cnt = write(fp, NULL, 0); -//		if (cnt < 0) -//			printf("Error returned from write: %d\n", cnt); -//		sleep(1); -	} -	return NULL; -} - - -int main(int argc, char *argv[]) -{ -	pthread_t tx, rx; -	long int t = 0; -	struct sched_param s = { -		.sched_priority = 1 -	}; -	int ret, map_size, page_size; -	void *rb; -	struct usrp_e_ctl16 d; - -	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); - -	d.offset = 14; -	d.count = 1; -	d.buf[0] = (1<<8) | (1<<9); -	ioctl(fp, USRP_E_WRITE_CTL16, &d); - -	page_size = getpagesize(); - -	ret = ioctl(fp, USRP_E_GET_RB_INFO, &rb_size); - -	map_size = (rb_size.num_pages_rx_flags + rb_size.num_pages_tx_flags) * page_size + -		(rb_size.num_rx_frames + rb_size.num_tx_frames) * (page_size >> 1); - -	rb = mmap(0, map_size, PROT_READ|PROT_WRITE, MAP_SHARED, fp, 0); -	if (rb == MAP_FAILED) { -		perror("mmap failed"); -		return -1; -	} - -	printf("rb = %p\n", rb); - -	rxi = rb; -	rx_buf = rb + (rb_size.num_pages_rx_flags * page_size); -	txi = rb +  (rb_size.num_pages_rx_flags * page_size) + -		(rb_size.num_rx_frames * page_size >> 1); -	tx_buf = rb +  (rb_size.num_pages_rx_flags * page_size) + -		(rb_size.num_rx_frames * page_size >> 1) + -		(rb_size.num_pages_tx_flags * page_size); - -	printf("rxi = %p, rx_buf = %p, txi = %p, tx_buf = %p\n", rxi, rx_buf, txi, tx_buf); - -	if ((ret = sched_setscheduler(0, SCHED_RR, &s))) -		perror("sched_setscheduler"); - -	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"); - -	return 0; -} diff --git a/host/apps/omap_debug/usrp-e-random-loopback.c b/host/apps/omap_debug/usrp-e-random-loopback.c deleted file mode 100644 index 5960b8fbd..000000000 --- a/host/apps/omap_debug/usrp-e-random-loopback.c +++ /dev/null @@ -1,149 +0,0 @@ -#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, 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) -			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("."); -		fflush(stdout); -//		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->status = 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, tx_data->len + 8); -		} -		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(1000000000); - -	printf("Done sleeping\n"); -} | 
