diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2014-01-10 15:16:35 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2014-01-10 15:16:35 -0500 |
| commit | 0ff27e6588a0997f34d0ac7009fb525f818660ae (patch) | |
| tree | 2db2a68f2c1dd79d66cc7a1cc1a9452d21d1d7b4 /libmaple/include/libmaple | |
| parent | 3400e7bec16a9a7c80b52b304da2311cb3932ded (diff) | |
| download | librambutan-0ff27e6588a0997f34d0ac7009fb525f818660ae.tar.gz librambutan-0ff27e6588a0997f34d0ac7009fb525f818660ae.zip | |
Revert "I2C slave support cleanups."
This reverts commit 39cd07a640ee87b7937738d36f17019b2865bfae.
Reverting pull request #54, which breaks examples/i2c-mcp4725-dac.cpp.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/include/libmaple')
| -rw-r--r-- | libmaple/include/libmaple/i2c.h | 13 | ||||
| -rw-r--r-- | libmaple/include/libmaple/i2c_common.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/libmaple/include/libmaple/i2c.h b/libmaple/include/libmaple/i2c.h index 5a9da58..d4eac61 100644 --- a/libmaple/include/libmaple/i2c.h +++ b/libmaple/include/libmaple/i2c.h @@ -29,19 +29,12 @@ * @file libmaple/include/libmaple/i2c.h * @brief Inter-Integrated Circuit (I2C) peripheral support * - * Supports Master and Slave. - * Master Usage notes: + * Currently master-only. Usage notes: * * - Enable an I2C device with i2c_master_enable(). * - Initialize an array of struct i2c_msg to suit the bus * transactions (reads/writes) you wish to perform. * - Call i2c_master_xfer() to do the work. - * - * Slave Usage notes: - * - Enable I2C slave by calling i2c_slave_enable(). - * Check flags for usage. Enabling master also enabled slave. - * - initialise the i2c_msg struct and the data buffer - * - initialise the callback functions */ #ifndef _LIBMAPLE_I2C_H_ @@ -208,7 +201,7 @@ typedef struct i2c_msg { #define I2C_SLAVE_USE_RX_BUFFER 0x10 // Use a buffered message when doing a slave recv #define I2C_SLAVE_USE_TX_BUFFER 0x20 // Use a buffered message when doing a slave transmit #define I2C_SLAVE_DUAL_ADDRESS 0x40 // Enable the dual slave address scheme -#define I2C_SLAVE_GENERAL_CALL 0x80 // Enable the general call on address 0x00 +#define I2C_SLAVE_GENERAL_CALL 0x80 // Enable the dual slave address scheme void i2c_master_enable(i2c_dev *dev, uint32 flags); #define I2C_ERROR_PROTOCOL (-1) @@ -418,7 +411,7 @@ static inline void i2c_set_trise(i2c_dev *dev, uint32 trise) { dev->regs->TRISE = trise; } -/* +/* Barry Carter * Slave support */ diff --git a/libmaple/include/libmaple/i2c_common.h b/libmaple/include/libmaple/i2c_common.h index 93e17e2..5debcb8 100644 --- a/libmaple/include/libmaple/i2c_common.h +++ b/libmaple/include/libmaple/i2c_common.h @@ -93,7 +93,7 @@ typedef struct i2c_dev { volatile i2c_state state; /**< Device state */ uint32 config_flags; /**< Configuration flags */ - /* + /* Barry Carter * Slave implementation. Callback functions in this struct allow * for a separate callback function for each I2C unit available onboard */ |