diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2014-01-10 15:17:48 -0500 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2014-01-10 15:17:48 -0500 |
commit | 55f51b2bb2e2cf82883ddd1ea39132eb06ea8773 (patch) | |
tree | 906b87d8653a4a10acf206ac8073f8fa08fdec68 /libmaple/include/libmaple/i2c_common.h | |
parent | 644d05beb7c32c2823615948217ffec4c5daf878 (diff) | |
parent | 424fff7a7613e9d27c1f4e4e13955dd95faa2112 (diff) | |
download | librambutan-55f51b2bb2e2cf82883ddd1ea39132eb06ea8773.tar.gz librambutan-55f51b2bb2e2cf82883ddd1ea39132eb06ea8773.zip |
Merge branch 'revert-pull-54'
Diffstat (limited to 'libmaple/include/libmaple/i2c_common.h')
-rw-r--r-- | libmaple/include/libmaple/i2c_common.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libmaple/include/libmaple/i2c_common.h b/libmaple/include/libmaple/i2c_common.h index 93e17e2..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 */ - - /* - * 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 |