Merge branch 'usrp_e100_devel' into next

Conflicts:
	host/lib/usrp/usrp_e100/io_impl.cpp

3 files changed, 100 insertions, 62 deletions

diff --git a/host/apps/omap_debug/usrp-e-crc-rw.c b/host/apps/omap_debug/usrp-e-crc-rw.c
index c3ae45cc1..c6f3427f0 100644
--- a/host/apps/omap_debug/usrp-e-crc-rw.c
+++ b/host/apps/omap_debug/usrp-e-crc-rw.c
@@ -8,11 +8,19 @@
 #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];
 
@@ -44,8 +52,7 @@ static u_int32_t chksum_crc32_gentab(void)
 static void *read_thread(void *threadid)
 {
 	int cnt;
-	struct usrp_transfer_frame *rx_data;
-	int rx_pkt_cnt;
+	int rx_pkt_cnt, rb_read;
 	int i;
 	unsigned long crc;
 	unsigned int rx_crc;
@@ -53,70 +60,56 @@ static void *read_thread(void *threadid)
 	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
-	rx_data = malloc(2048);
-
+	
 	rx_pkt_cnt = 0;
+	rb_read = 0;
 
 	bytes_transfered = 0;
 	gettimeofday(&start_time, NULL);
 
 	while (1) {
 		
-		cnt = read(fp, rx_data, 2048);
-		if (cnt < 0)
-			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;
+		while (!((*rxi)[rb_read].flags & RB_USER)) {
+			struct pollfd pfd;
+			pfd.fd = fp;
+			pfd.events = POLLIN;
+			ssize_t ret = poll(&pfd, 1, -1);
 		}
-#endif
+		(*rxi)[rb_read].flags = RB_USER_PROCESS;
 
-		if (rx_data->status & RB_OVERRUN)
-			printf("O");
-
-		printf("rx_data->len = %d\n", rx_data->len);
+		rx_pkt_cnt++;
+		cnt = (*rxi)[rb_read].len;
+		p = rx_buf + (rb_read * 2048);
 
-	
+		rx_crc = *(int *) &p[cnt-4];
 		crc = 0xFFFFFFFF;
-		for (i = 0; i < rx_data->len - 4; i+=2) {
+		for (i = 0; i < cnt - 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_tab[(crc ^ p[i+1]) & 0xFF];
+//printf("idx = %d, data = %X, crc = %X\n", i, p[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);
+				crc_tab[(crc ^ p[i]) & 0xFF];
+//printf("idx = %d, data = %X, crc = %X\n", i, p[i],crc);
 		}
 
-		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->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); 
-		fflush(stdout);
-		break;
-#endif
+		(*rxi)[rb_read].flags = RB_KERNEL;
 
+#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 += rx_data->len;
+		bytes_transfered += cnt;
 
 		if (bytes_transfered > (100 * 1000000)) {
 			gettimeofday(&finish_time, NULL);
@@ -124,7 +117,7 @@ printf("idx = %d, data = %X, crc = %X\n", i, rx_data->buf[i],crc);
 
 			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);
+				(float) bytes_transfered / (float) elapsed_seconds / 4000);
 
 
 			start_time = finish_time;
@@ -135,17 +128,17 @@ printf("idx = %d, data = %X, crc = %X\n", i, rx_data->buf[i],crc);
 	
 static void *write_thread(void *threadid)
 {
-	int seq_number, i, cnt, tx_pkt_cnt;
+	int i, tx_pkt_cnt, rb_write;
 	int tx_len;
 	unsigned long crc;
-	struct usrp_transfer_frame *tx_data;
 	unsigned long bytes_transfered, elapsed_seconds;
 	struct timeval start_time, finish_time;
+	__u8 *p;
 
 	printf("Greetings from the write thread!\n");
 
+	rb_write = 0;
 	tx_pkt_cnt = 0;
-	tx_data = malloc(2048);
 
 	bytes_transfered = 0;
 	gettimeofday(&start_time, NULL);
@@ -153,6 +146,14 @@ static void *write_thread(void *threadid)
 	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) {
@@ -170,25 +171,33 @@ static void *write_thread(void *threadid)
 		}
 #endif
 
-		tx_len = 2048 - sizeof(struct usrp_transfer_frame) - sizeof(int);
-		tx_data->len = tx_len + sizeof(int);
+//		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;
+			ssize_t ret = poll(&pfd, 1, -1);
+		}
+//		printf("Got space\n");
 
 		crc = 0xFFFFFFFF;
-		for (i = 0; i < tx_len; i++) {
-			tx_data->buf[i] = i & 0xFF;
+		for (i = 0; i < tx_len-4; i++) {
+			p[i] = i & 0xFF;
 
 			crc = ((crc >> 8) & 0x00FFFFFF) ^
-				crc_tab[(crc ^ tx_data->buf[i]) & 0xFF];
+				crc_tab[(crc ^ p[i]) & 0xFF];
 
 		}
-		*((int *) &tx_data[tx_len]) = crc;
+		*(int *) &p[tx_len-4] = crc;
 
-		cnt = write(fp, tx_data, 2048);
-		if (cnt < 0)
-			printf("Error returned from write: %d\n", cnt);
+		(*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_data->len;
+		bytes_transfered += tx_len;
 
 		if (bytes_transfered > (100 * 1000000)) {
 			gettimeofday(&finish_time, NULL);
@@ -196,7 +205,7 @@ static void *write_thread(void *threadid)
 
 			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);
+				(float) bytes_transfered / (float) elapsed_seconds / 4000);
 
 
 			start_time = finish_time;
@@ -213,13 +222,16 @@ int main(int argc, char *argv[])
 	pthread_t tx, rx;
 	long int t;
 	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 t|w|rw decimation data_size\n", argv[0]);
+		printf("%s r|w|rw decimation data_size\n", argv[0]);
 		return -1;
 	}
 
@@ -231,6 +243,29 @@ int main(int argc, char *argv[])
 	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 = %X\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 = 0;
 	if (strcmp(argv[1], "w") == 0)
 		fpga_config_flag |= (1 << 15);
diff --git a/host/apps/omap_debug/usrp-e-mm-loopback.c b/host/apps/omap_debug/usrp-e-mm-loopback.c
index f5fc83c87..b67eecd21 100644
--- a/host/apps/omap_debug/usrp-e-mm-loopback.c
+++ b/host/apps/omap_debug/usrp-e-mm-loopback.c
@@ -75,6 +75,8 @@ static void *read_thread(void *threadid)
 			ssize_t ret = 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;
diff --git a/host/apps/omap_debug/usrp_e.h b/host/apps/omap_debug/usrp_e.h
index f96706c4a..4c6a5dd89 100644
--- a/host/apps/omap_debug/usrp_e.h
+++ b/host/apps/omap_debug/usrp_e.h
@@ -34,16 +34,13 @@ struct usrp_e_ctl32 {
 #define UE_SPI_TXRX	1
 
 /* Defines for spi ctrl register */
-#define UE_SPI_CTRL_TXNEG	(BIT(10))
-#define UE_SPI_CTRL_RXNEG	(BIT(9))
+#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
 #define UE_SPI_LATCH_RISE	0
 #define UE_SPI_LATCH_FALL	UE_SPI_CTRL_RXNEG
-#define USRP_E_GET_COMPAT_NUMBER _IO(USRP_E_IOC_MAGIC, 0x28)
-
-#define USRP_E_COMPAT_NUMBER 1
 
 struct usrp_e_spi {
 	__u8 readback;
@@ -68,12 +65,16 @@ 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)
 #define USRP_E_GET_RB_INFO      _IOR(USRP_E_IOC_MAGIC, 0x27, struct usrp_e_ring_buffer_size_t)
+#define USRP_E_GET_COMPAT_NUMBER _IO(USRP_E_IOC_MAGIC, 0x28)
+
+#define USRP_E_COMPAT_NUMBER 1
 
 /* Flag defines */
 #define RB_USER (1<<0)
 #define RB_KERNEL (1<<1)
 #define RB_OVERRUN (1<<2)
 #define RB_DMA_ACTIVE (1<<3)
+#define RB_USER_PROCESS (1<<4)
 
 struct ring_buffer_info {
 	int flags;