From d8052db8e5614935241a4824a3f9711bfe34507d Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Fri, 2 Apr 2010 19:49:45 +0000
Subject: Convert to use register include file. Fix peek/poke16 program. Add
 program to cycle through LED's and test buttons. Only pushbuttons tested at
 the moment.

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

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

diff --git a/host/apps/omap_debug/usrp-e-button.c b/host/apps/omap_debug/usrp-e-button.c
new file mode 100644
index 000000000..fca501833
--- /dev/null
+++ b/host/apps/omap_debug/usrp-e-button.c
@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include "usrp_e.h"
+#include "usrp_e_regs.hpp"
+
+// Usage: usrp_e_uart <string>
+
+#define PB1 (1<<8)
+#define PB2 (1<<9)
+#define PB3 (1<<10)
+#define P1 (0)
+#define P2 (0xFF)
+#define P3 (0xAA)
+#define P4 (0x55)
+
+int main(int argc, char *argv[])
+{
+	int fp, ret;
+	struct usrp_e_ctl16 d;
+	int pb1=0, pb2=0, pb3=0, p1=0, p2=0, p3=0, p4=0;
+
+	fp = open("/dev/usrp_e0", O_RDWR);
+	printf("fp = %d\n", fp);
+
+	d.offset = 6;
+	d.count = 1;
+
+	do {
+		ret = ioctl(fp, USRP_E_READ_CTL16, &d);
+		if (d.buf[0] & PB1) {
+			pb1 = 1;
+			printf("Pushbutton 1 hit\n");
+		}
+
+		if (d.buf[0] & PB2) {
+			pb2 = 1;
+			printf("Pushbutton 2 hit\n");
+		}
+
+		if (d.buf[0] & PB3) {
+			pb3 = 1;
+			printf("Pushbutton 3 hit\n");
+		}
+
+		sleep(1);
+
+	} while (!(pb1 && pb2 && pb3));
+
+	return 0;
+}
-- 
cgit v1.2.3


From d4e9f3629021736b1330b4a9f22ee60336a53e0e Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@opensdr.com>
Date: Fri, 2 Apr 2010 21:58:55 +0000
Subject: Update to use register definitions from header file.

---
 host/apps/omap_debug/usrp-e-button.c | 2 +-
 host/apps/omap_debug/usrp-e-led.c    | 2 +-
 host/apps/omap_debug/usrp-e-uart.c   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/host/apps/omap_debug/usrp-e-button.c b/host/apps/omap_debug/usrp-e-button.c
index fca501833..f13291491 100644
--- a/host/apps/omap_debug/usrp-e-button.c
+++ b/host/apps/omap_debug/usrp-e-button.c
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
 	fp = open("/dev/usrp_e0", O_RDWR);
 	printf("fp = %d\n", fp);
 
-	d.offset = 6;
+	d.offset = UE_REG_MISC_SW;
 	d.count = 1;
 
 	do {
diff --git a/host/apps/omap_debug/usrp-e-led.c b/host/apps/omap_debug/usrp-e-led.c
index 159251c8a..d1b6c8996 100644
--- a/host/apps/omap_debug/usrp-e-led.c
+++ b/host/apps/omap_debug/usrp-e-led.c
@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
 	fp = open("/dev/usrp_e0", O_RDWR);
 	printf("fp = %d\n", fp);
 
-	d.offset = 4;
+	d.offset = UE_REG_MISC_BASE;
 	d.count = 1;
 
 	while (1) {
diff --git a/host/apps/omap_debug/usrp-e-uart.c b/host/apps/omap_debug/usrp-e-uart.c
index 239df9444..b0b14626a 100644
--- a/host/apps/omap_debug/usrp-e-uart.c
+++ b/host/apps/omap_debug/usrp-e-uart.c
@@ -6,10 +6,10 @@
 #include <sys/ioctl.h>
 
 #include "usrp_e.h"
+#include "usrp_e_regs.hpp"
 
 // Usage: usrp_e_uart <string>
 
-#define UART_WRITE_ADDR (0x80 + 12) 
 
 int main(int argc, char *argv[])
 {
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
 	printf("fp = %d\n", fp);
 
 	for (i=0; i<strlen(str); i++) {
-		d.offset = UART_WRITE_ADDR;
+		d.offset = UE_REG_UART_TXCHAR;
 		d.count = 1;
 		d.buf[0] = str[i];
 		ret = ioctl(fp, USRP_E_WRITE_CTL16, &d);
-- 
cgit v1.2.3