diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-02 14:08:12 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-16 20:44:49 -0700 |
| commit | 58484632eb793b1ee1ffd06b9807023551133a1b (patch) | |
| tree | a4b1d223e9d7f3036ff57c268e8a1e45fac82ad8 /host/lib/usrp/e100/include | |
| parent | 9d30b8fc24dc7efa8973a4d305b240c245133fe6 (diff) | |
| download | uhd-58484632eb793b1ee1ffd06b9807023551133a1b.tar.gz uhd-58484632eb793b1ee1ffd06b9807023551133a1b.tar.bz2 uhd-58484632eb793b1ee1ffd06b9807023551133a1b.zip | |
e100: squashed host code for fifo control/timed commands
This uses the new b100/e100 common core and FIFO control modules.
Subsequent commit will be the compatible FPGA merge.
Conflicts:
host/lib/usrp/e100/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/e100/include')
| -rw-r--r-- | host/lib/usrp/e100/include/linux/usrp_e.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/e100/include/linux/usrp_e.h b/host/lib/usrp/e100/include/linux/usrp_e.h index 37e9ee31a..f0512a40c 100644 --- a/host/lib/usrp/e100/include/linux/usrp_e.h +++ b/host/lib/usrp/e100/include/linux/usrp_e.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2010 Ettus Research, LLC + * Copyright (C) 2010-2012 Ettus Research, LLC * * Written by Philip Balister <philip@opensdr.com> * @@ -36,7 +36,7 @@ struct usrp_e_ctl32 { #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 3 +#define USRP_E_COMPAT_NUMBER 4 /* Flag defines */ #define RB_USER (1<<0) |