aboutsummaryrefslogtreecommitdiffstats
path: root/host/apps
diff options
context:
space:
mode:
Diffstat (limited to 'host/apps')
-rw-r--r--host/apps/omap_debug/usrp-e-crc-rw.c230
-rw-r--r--host/apps/omap_debug/usrp-e-mm-loopback.c2
-rw-r--r--host/apps/omap_debug/usrp_e.h11
3 files changed, 170 insertions, 73 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..f91c4fa85 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];
@@ -24,7 +32,7 @@ static u_int32_t chksum_crc32_gentab(void)
unsigned long crc, poly;
unsigned long i, j;
- poly = 0xEDB88320L;
+ poly = 0x04C11DB7L;
for (i = 0; i < 256; i++) {
crc = i;
@@ -36,95 +44,132 @@ static u_int32_t chksum_crc32_gentab(void)
}
}
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;
- 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;
- unsigned long bytes_transfered, elapsed_seconds;
- struct timeval start_time, finish_time;
+ 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;
- __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);
+ while (!((*rxi)[rb_read].flags & RB_USER)) {
+ struct pollfd pfd;
+ pfd.fd = fp;
+ pfd.events = POLLIN;
+ ssize_t ret = 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);
-#if 0
- if (rx_pkt_cnt == 512) {
- printf(".");
- fflush(stdout);
- rx_pkt_cnt = 0;
- }
-#endif
+ rx_crc = *(int *) &p[cnt-4];
+ crc = 0xFFFFFFFF;
+ ck_sum = 0;
- if (rx_data->status & RB_OVERRUN)
- printf("O");
+ pkt_len = *(unsigned int *) &p[0];
+ pkt_seq = *(unsigned int *) &p[4];
- printf("rx_data->len = %d\n", rx_data->len);
+// 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 = 0xFFFFFFFF;
- 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);
+ 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);
}
- 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 (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 += rx_data->len;
+ bytes_transfered += cnt;
if (bytes_transfered > (100 * 1000000)) {
+ struct timeval finish_time, d_time;
+ float elapsed_seconds;
+
gettimeofday(&finish_time, NULL);
- elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
- printf("Bytes transfered = %ld, elapsed seconds = %ld\n", bytes_transfered, elapsed_seconds);
+ 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 / 250);
+ (float) bytes_transfered / (float) elapsed_seconds / 4000);
start_time = finish_time;
@@ -135,17 +180,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;
+ unsigned long bytes_transfered;
+ struct timeval start_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 +198,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,33 +223,48 @@ 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;
+// printf("%X ", p[i]);
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;
+// printf("\n crc = %lX\n", 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)) {
+ struct timeval finish_time, d_time;
+ float elapsed_seconds;
+
gettimeofday(&finish_time, NULL);
- elapsed_seconds = finish_time.tv_sec - start_time.tv_sec;
- printf("Bytes transfered = %d, elapsed seconds = %d\n", bytes_transfered, elapsed_seconds);
+ 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 / 250);
+ (float) bytes_transfered / (float) elapsed_seconds / 4000);
start_time = finish_time;
@@ -213,13 +281,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 +302,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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 15:34:07 +0000