aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/include/libmaple/i2c_common.h
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2014-01-10 15:17:12 -0500
committerMarti Bolivar <mbolivar@leaflabs.com>2014-01-10 15:17:12 -0500
commit424fff7a7613e9d27c1f4e4e13955dd95faa2112 (patch)
tree906b87d8653a4a10acf206ac8073f8fa08fdec68 /libmaple/include/libmaple/i2c_common.h
parent0ff27e6588a0997f34d0ac7009fb525f818660ae (diff)
downloadlibrambutan-424fff7a7613e9d27c1f4e4e13955dd95faa2112.tar.gz
librambutan-424fff7a7613e9d27c1f4e4e13955dd95faa2112.zip
Revert "- tx and rx callbacks for each module"
This reverts commit da01c80f24dc9c43ff951ea9fd283abb4628ceb7. 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/i2c_common.h')
-rw-r--r--libmaple/include/libmaple/i2c_common.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/libmaple/include/libmaple/i2c_common.h b/libmaple/include/libmaple/i2c_common.h
index 5debcb8..17cabe3 100644
--- a/libmaple/include/libmaple/i2c_common.h
+++ b/libmaple/include/libmaple/i2c_common.h
@@ -52,12 +52,9 @@ typedef enum i2c_state {
I2C_STATE_IDLE = 1, /**< Idle */
I2C_STATE_XFER_DONE = 2, /**< Done with transfer */
I2C_STATE_BUSY = 3, /**< Busy */
- I2C_STATE_SL_RX = 4, /**< Slave receiving */
I2C_STATE_ERROR = -1 /**< Error occurred */
} i2c_state;
-typedef void (*i2c_slave_recv_callback_func)(struct i2c_msg *);
-typedef void (*i2c_slave_transmit_callback_func)(struct i2c_msg *);
/**
* @brief I2C device type.
*/
@@ -91,17 +88,6 @@ typedef struct i2c_dev {
nvic_irq_num ev_nvic_line; /**< Event IRQ number */
nvic_irq_num er_nvic_line; /**< Error IRQ number */
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
- */
- i2c_slave_transmit_callback_func i2c_slave_transmit_callback;
- i2c_slave_recv_callback_func i2c_slave_recv_callback;
-
- struct i2c_msg *i2c_slave_msg; /* the message that the i2c slave will use */
-
} i2c_dev;
#endif