Updates for header file change from usrp1_e.h to usrp_e.h.

4 files changed, 16 insertions, 16 deletions

diff --git a/host/apps/omap_debug/fetch-module.sh b/host/apps/omap_debug/fetch-module.sh
index 101ea9aef..45cf1f052 100755
--- a/host/apps/omap_debug/fetch-module.sh
+++ b/host/apps/omap_debug/fetch-module.sh
@@ -1,3 +1,3 @@
-scp balister@192.168.1.167:src/git/kernel_usrp/drivers/misc/usrp1_e.ko /lib/modules/2.6.33-rc3/kernel/drivers/misc
-scp balister@192.168.1.167:src/git/kernel_usrp/include/linux/usrp1_e.h .
+scp balister@192.168.1.167:src/git/kernel_usrp/drivers/misc/usrp_e.ko /lib/modules/2.6.33-rc3/kernel/drivers/misc
+scp balister@192.168.1.167:src/git/kernel_usrp/include/linux/usrp_e.h .
 sync
diff --git a/host/apps/omap_debug/usrp-e-i2c.c b/host/apps/omap_debug/usrp-e-i2c.c
index dce1ae153..417d6d580 100644
--- a/host/apps/omap_debug/usrp-e-i2c.c
+++ b/host/apps/omap_debug/usrp-e-i2c.c
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "usrp1_e.h"
+#include "usrp_e.h"
 
 // Usage: usrp_e_i2c w address data0 data1 data 2 ....
 // Usage: usrp_e_i2c r address count
@@ -17,8 +17,8 @@ int main(int argc, char *argv[])
 	int direction, address, count;
 
 	if (argc < 3) {
-		printf("Usage: usrp1_e_i2c w address data0 data1 data2 ...\n");
-		printf("Usage: usrp1_e_i2c r address count\n");
+		printf("Usage: usrp_e_i2c w address data0 data1 data2 ...\n");
+		printf("Usage: usrp_e_i2c r address count\n");
 		exit(-1);
 	}
 
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 
 	address = atoi(argv[2]);
 
-	fp = open("/dev/usrp1_e0", O_RDWR);
+	fp = open("/dev/usrp_e0", O_RDWR);
 	printf("fp = %d\n", fp);
 
 	if (direction) {
diff --git a/host/apps/omap_debug/usrp-e-spi.c b/host/apps/omap_debug/usrp-e-spi.c
index e10e72b80..1af47b172 100644
--- a/host/apps/omap_debug/usrp-e-spi.c
+++ b/host/apps/omap_debug/usrp-e-spi.c
@@ -4,9 +4,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "usrp1_e.h"
+#include "usrp_e.h"
 
-// Usage: usrp1_e_spi w|rb slave data
+// Usage: usrp_e_spi w|rb slave data
 
 int main(int argc, char *argv[])
 {
@@ -14,14 +14,14 @@ int main(int argc, char *argv[])
 	struct usrp_e_spi spi_dat;
 
 	if (argc < 4) {
-		printf("Usage: usrp1_e_spi w|rb slave data\n");
+		printf("Usage: usrp_e_spi w|rb slave data\n");
 		exit(-1);
 	}
 
 	slave = atoi(argv[2]);
 	data = atoi(argv[3]);
 
-	fp = open("/dev/usrp1_e0", O_RDWR);
+	fp = open("/dev/usrp_e0", O_RDWR);
 	printf("fp = %d\n", fp);
 
 	spi_dat.slave = slave;
diff --git a/host/apps/omap_debug/usrp1_e.h b/host/apps/omap_debug/usrp_e.h
index b34446b01..aa8ef3d57 100644
--- a/host/apps/omap_debug/usrp1_e.h
+++ b/host/apps/omap_debug/usrp_e.h
@@ -15,13 +15,13 @@
 #include <linux/types.h>
 #include <linux/ioctl.h>
 
-struct usrp1_e_ctl16 {
+struct usrp_e_ctl16 {
 	__u32 offset;
 	__u32 count;
 	__u16 buf[20];
 };
 
-struct usrp1_e_ctl32 {
+struct usrp_e_ctl32 {
 	__u32 offset;
 	__u32 count;
 	__u32 buf[10];
@@ -61,10 +61,10 @@ struct usrp_e_i2c {
 };
 
 #define USRP_E_IOC_MAGIC	'u'
-#define USRP_E_WRITE_CTL16	_IOW(USRP_E_IOC_MAGIC, 0x20, struct usrp1_e_ctl16)
-#define USRP_E_READ_CTL16	_IOWR(USRP_E_IOC_MAGIC, 0x21, struct usrp1_e_ctl16)
-#define USRP_E_WRITE_CTL32	_IOW(USRP_E_IOC_MAGIC, 0x22, struct usrp1_e_ctl32)
-#define USRP_E_READ_CTL32	_IOWR(USRP_E_IOC_MAGIC, 0x23, struct usrp1_e_ctl32)
+#define USRP_E_WRITE_CTL16	_IOW(USRP_E_IOC_MAGIC, 0x20, struct usrp_e_ctl16)
+#define USRP_E_READ_CTL16	_IOWR(USRP_E_IOC_MAGIC, 0x21, struct usrp_e_ctl16)
+#define USRP_E_WRITE_CTL32	_IOW(USRP_E_IOC_MAGIC, 0x22, struct usrp_e_ctl32)
+#define USRP_E_READ_CTL32	_IOWR(USRP_E_IOC_MAGIC, 0x23, struct usrp_e_ctl32)
 #define USRP_E_SPI		_IOW(USRP_E_IOC_MAGIC, 0x24, struct usrp_e_spi)
 #define USRP_E_I2C_READ		_IOR(USRP_E_IOC_MAGIC, 0x25, struct usrp_e_i2c)
 #define USRP_E_I2C_WRITE	_IOW(USRP_E_IOC_MAGIC, 0x26, struct usrp_e_i2c)