From 61f2f0214c5999ea42a368a4fc99f03d8eb28d1e Mon Sep 17 00:00:00 2001 From: jcorgan Date: Mon, 8 Sep 2008 01:00:12 +0000 Subject: Merged r9433:9527 from features/gr-usrp2 into trunk. Adds usrp2 and gr-usrp2 top-level components. Trunk passes distcheck with mb-gcc installed, but currently not without them. The key issue is that when mb-gcc is not installed, the build system skips over the usrp2/firmware directory, and the firmware include files don't get put into the dist tarball. But we can't do the usual DIST_SUBDIRS method as the firmware is a subpackage. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9528 221aa14e-8319-0410-a670-987f0aec2ac5 --- opencores/i2c/software/CVS/Entries | 2 + opencores/i2c/software/CVS/Repository | 1 + opencores/i2c/software/CVS/Root | 1 + opencores/i2c/software/CVS/Template | 0 opencores/i2c/software/drivers/CVS/Entries | 1 + opencores/i2c/software/drivers/CVS/Repository | 1 + opencores/i2c/software/drivers/CVS/Root | 1 + opencores/i2c/software/drivers/CVS/Template | 0 opencores/i2c/software/include/CVS/Entries | 2 + opencores/i2c/software/include/CVS/Repository | 1 + opencores/i2c/software/include/CVS/Root | 1 + opencores/i2c/software/include/CVS/Template | 0 opencores/i2c/software/include/oc_i2c_master.h | 102 +++++++++++++++++++++++++ 13 files changed, 113 insertions(+) create mode 100644 opencores/i2c/software/CVS/Entries create mode 100644 opencores/i2c/software/CVS/Repository create mode 100644 opencores/i2c/software/CVS/Root create mode 100644 opencores/i2c/software/CVS/Template create mode 100644 opencores/i2c/software/drivers/CVS/Entries create mode 100644 opencores/i2c/software/drivers/CVS/Repository create mode 100644 opencores/i2c/software/drivers/CVS/Root create mode 100644 opencores/i2c/software/drivers/CVS/Template create mode 100644 opencores/i2c/software/include/CVS/Entries create mode 100644 opencores/i2c/software/include/CVS/Repository create mode 100644 opencores/i2c/software/include/CVS/Root create mode 100644 opencores/i2c/software/include/CVS/Template create mode 100644 opencores/i2c/software/include/oc_i2c_master.h (limited to 'opencores/i2c/software') diff --git a/opencores/i2c/software/CVS/Entries b/opencores/i2c/software/CVS/Entries new file mode 100644 index 000000000..934613477 --- /dev/null +++ b/opencores/i2c/software/CVS/Entries @@ -0,0 +1,2 @@ +D/drivers//// +D/include//// diff --git a/opencores/i2c/software/CVS/Repository b/opencores/i2c/software/CVS/Repository new file mode 100644 index 000000000..1b4c9f0bb --- /dev/null +++ b/opencores/i2c/software/CVS/Repository @@ -0,0 +1 @@ +i2c/software diff --git a/opencores/i2c/software/CVS/Root b/opencores/i2c/software/CVS/Root new file mode 100644 index 000000000..44b2aa23b --- /dev/null +++ b/opencores/i2c/software/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/opencores/i2c/software/CVS/Template b/opencores/i2c/software/CVS/Template new file mode 100644 index 000000000..e69de29bb diff --git a/opencores/i2c/software/drivers/CVS/Entries b/opencores/i2c/software/drivers/CVS/Entries new file mode 100644 index 000000000..178481050 --- /dev/null +++ b/opencores/i2c/software/drivers/CVS/Entries @@ -0,0 +1 @@ +D diff --git a/opencores/i2c/software/drivers/CVS/Repository b/opencores/i2c/software/drivers/CVS/Repository new file mode 100644 index 000000000..260d7873c --- /dev/null +++ b/opencores/i2c/software/drivers/CVS/Repository @@ -0,0 +1 @@ +i2c/software/drivers diff --git a/opencores/i2c/software/drivers/CVS/Root b/opencores/i2c/software/drivers/CVS/Root new file mode 100644 index 000000000..44b2aa23b --- /dev/null +++ b/opencores/i2c/software/drivers/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/opencores/i2c/software/drivers/CVS/Template b/opencores/i2c/software/drivers/CVS/Template new file mode 100644 index 000000000..e69de29bb diff --git a/opencores/i2c/software/include/CVS/Entries b/opencores/i2c/software/include/CVS/Entries new file mode 100644 index 000000000..ef11b0c73 --- /dev/null +++ b/opencores/i2c/software/include/CVS/Entries @@ -0,0 +1,2 @@ +/oc_i2c_master.h/1.1/Thu Nov 22 10:02:19 2001// +D diff --git a/opencores/i2c/software/include/CVS/Repository b/opencores/i2c/software/include/CVS/Repository new file mode 100644 index 000000000..2ea08eeec --- /dev/null +++ b/opencores/i2c/software/include/CVS/Repository @@ -0,0 +1 @@ +i2c/software/include diff --git a/opencores/i2c/software/include/CVS/Root b/opencores/i2c/software/include/CVS/Root new file mode 100644 index 000000000..44b2aa23b --- /dev/null +++ b/opencores/i2c/software/include/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/opencores/i2c/software/include/CVS/Template b/opencores/i2c/software/include/CVS/Template new file mode 100644 index 000000000..e69de29bb diff --git a/opencores/i2c/software/include/oc_i2c_master.h b/opencores/i2c/software/include/oc_i2c_master.h new file mode 100644 index 000000000..7f7cfc417 --- /dev/null +++ b/opencores/i2c/software/include/oc_i2c_master.h @@ -0,0 +1,102 @@ +/* +///////////////////////////////////////////////////////////////////// +//// //// +//// Include file for OpenCores I2C Master core //// +//// //// +//// File : oc_i2c_master.h //// +//// Function: c-include file //// +//// //// +//// Authors: Richard Herveille (richard@asics.ws) //// +//// Filip Miletic //// +//// //// +//// www.opencores.org //// +//// //// +///////////////////////////////////////////////////////////////////// +//// //// +//// Copyright (C) 2001 Richard Herveille //// +//// Filip Miletic //// +//// //// +//// This source file may be used and distributed without //// +//// restriction provided that this copyright statement is not //// +//// removed from the file and that any derivative work contains //// +//// the original copyright notice and the associated disclaimer.//// +//// //// +//// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY //// +//// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED //// +//// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS //// +//// FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL THE AUTHOR //// +//// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, //// +//// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES //// +//// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE //// +//// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR //// +//// BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF //// +//// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT //// +//// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT //// +//// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE //// +//// POSSIBILITY OF SUCH DAMAGE. //// +//// //// +///////////////////////////////////////////////////////////////////// +*/ + +/* + * Definitions for the Opencores i2c master core + */ + +/* --- Definitions for i2c master's registers --- */ + +/* ----- Read-write access */ + +#define OC_I2C_PRER_LO 0x00 /* Low byte clock prescaler register */ +#define OC_I2C_PRER_HI 0x01 /* High byte clock prescaler register */ +#define OC_I2C_CTR 0x02 /* Control register */ + +/* ----- Write-only registers */ + +#define OC_I2C_TXR 0x03 /* Transmit byte register */ +#define OC_I2C_CR 0x04 /* Command register */ + +/* ----- Read-only registers */ + +#define OC_I2C_RXR 0x03 /* Receive byte register */ +#define OC_I2C_SR 0x04 /* Status register */ + +/* ----- Bits definition */ + +/* ----- Control register */ + +#define OC_I2C_EN (1<<7) /* Core enable bit: */ + /* 1 - core is enabled */ + /* 0 - core is disabled */ +#define OC_I2C_IEN (1<<6) /* Interrupt enable bit */ + /* 1 - Interrupt enabled */ + /* 0 - Interrupt disabled */ + /* Other bits in CR are reserved */ + +/* ----- Command register bits */ + +#define OC_I2C_STA (1<<7) /* Generate (repeated) start condition*/ +#define OC_I2C_STO (1<<6) /* Generate stop condition */ +#define OC_I2C_RD (1<<5) /* Read from slave */ +#define OC_I2C_WR (1<<4) /* Write to slave */ +#define OC_I2C_ACK (1<<3) /* Acknowledge from slave */ + /* 1 - ACK */ + /* 0 - NACK */ +#define OC_I2C_IACK (1<<0) /* Interrupt acknowledge */ + +/* ----- Status register bits */ + +#define OC_I2C_RXACK (1<<7) /* ACK received from slave */ + /* 1 - ACK */ + /* 0 - NACK */ +#define OC_I2C_BUSY (1<<6) /* Busy bit */ +#define OC_I2C_TIP (1<<1) /* Transfer in progress */ +#define OC_I2C_IF (1<<0) /* Interrupt flag */ + +/* bit testing and setting macros */ + +#define OC_ISSET(reg,bitmask) ((reg)&(bitmask)) +#define OC_ISCLEAR(reg,bitmask) (!(OC_ISSET(reg,bitmask))) +#define OC_BITSET(reg,bitmask) ((reg)|(bitmask)) +#define OC_BITCLEAR(reg,bitmask) ((reg)|(~(bitmask))) +#define OC_BITTOGGLE(reg,bitmask) ((reg)^(bitmask)) +#define OC_REGMOVE(reg,value) ((reg)=(value)) \ No newline at end of file -- cgit v1.2.3