aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2010-04-02 21:58:55 +0000
committerPhilip Balister <philip@opensdr.com>2010-04-02 21:58:55 +0000
commitd4e9f3629021736b1330b4a9f22ee60336a53e0e (patch)
tree7639602f3c8ea303a7a45734fde921cf95a80b90
parent5d7a5e66c05290c5e3957457680313a2e427af08 (diff)
downloaduhd-d4e9f3629021736b1330b4a9f22ee60336a53e0e.tar.gz
uhd-d4e9f3629021736b1330b4a9f22ee60336a53e0e.tar.bz2
uhd-d4e9f3629021736b1330b4a9f22ee60336a53e0e.zip
Update to use register definitions from header file.
-rw-r--r--host/apps/omap_debug/usrp-e-button.c2
-rw-r--r--host/apps/omap_debug/usrp-e-led.c2
-rw-r--r--host/apps/omap_debug/usrp-e-uart.c4
3 files changed, 4 insertions, 4 deletions
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);