summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2011-01-26 15:51:54 -0800
committerPhilip Balister <philip@opensdr.com>2011-01-26 15:51:54 -0800
commitb0ecd1c7d323eeb94754db7cbfef362e390a32d3 (patch)
tree8cd6e087e1039a6564a8c31ccb95b2a67f2a827f
parent0f75a69fa0a71879e2bf1a3a8a95152d633c6ad1 (diff)
downloaduhd-b0ecd1c7d323eeb94754db7cbfef362e390a32d3.tar.gz
uhd-b0ecd1c7d323eeb94754db7cbfef362e390a32d3.tar.bz2
uhd-b0ecd1c7d323eeb94754db7cbfef362e390a32d3.zip
Update header from in e100 test programs from main uhd.
-rw-r--r--host/apps/omap_debug/usrp_e.h11
1 files changed, 6 insertions, 5 deletions
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;