summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Balister <balister@moose.(none)>2010-03-24 15:13:02 -0400
committerPhilip Balister <balister@moose.(none)>2010-03-24 15:13:02 -0400
commitac482c5a469d6a02c8a83e0c0c7e10ce4eaf5718 (patch)
tree5004dac406672ed816ec3dd0a77d19c83f08121e
parent5463912c324639791b354dea0d6af5e42c1eae77 (diff)
parent46c0c6ca62296ad86e9e302e85577dc4b800c6cb (diff)
downloaduhd-ac482c5a469d6a02c8a83e0c0c7e10ce4eaf5718.tar.gz
uhd-ac482c5a469d6a02c8a83e0c0c7e10ce4eaf5718.tar.bz2
uhd-ac482c5a469d6a02c8a83e0c0c7e10ce4eaf5718.zip
Merge branch 'u1e_uhd' of git@ettus.sourcerepo.com:ettus/uhd into u1e_uhd
-rw-r--r--host/apps/omap_debug/usrp1_e.h26
1 files changed, 21 insertions, 5 deletions
diff --git a/host/apps/omap_debug/usrp1_e.h b/host/apps/omap_debug/usrp1_e.h
index b49b526dc..b34446b01 100644
--- a/host/apps/omap_debug/usrp1_e.h
+++ b/host/apps/omap_debug/usrp1_e.h
@@ -15,10 +15,16 @@
#include <linux/types.h>
#include <linux/ioctl.h>
-struct usrp1_e_ctl {
+struct usrp1_e_ctl16 {
__u32 offset;
__u32 count;
- __u16 buf[];
+ __u16 buf[20];
+};
+
+struct usrp1_e_ctl32 {
+ __u32 offset;
+ __u32 count;
+ __u32 buf[10];
};
// SPI interface
@@ -48,9 +54,19 @@ struct usrp_e_spi {
__u32 flags;
};
+struct usrp_e_i2c {
+ __u8 addr;
+ __u32 len;
+ __u8 data[];
+};
+
#define USRP_E_IOC_MAGIC 'u'
-#define USRP_E_WRITE_CTL _IOW(USRP_E_IOC_MAGIC, 0x20, struct usrp1_e_ctl)
-#define USRP_E_READ_CTL _IOWR(USRP_E_IOC_MAGIC, 0x21, struct usrp1_e_ctl)
-#define USRP_E_SPI _IOW(USRP_E_IOC_MAGIC, 0x22, struct usrp_e_spi)
+#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_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)
#endif