Merge branch 'revert-pull-54'

2 files changed, 1 insertions, 75 deletions

diff --git a/libmaple/include/libmaple/i2c.h b/libmaple/include/libmaple/i2c.h
index fbb4c09..ff1c313 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_
@@ -100,7 +93,6 @@ typedef struct i2c_msg {
 
 #define I2C_MSG_READ            0x1
 #define I2C_MSG_10BIT_ADDR      0x2
-
     /**
      * Bitwise OR of:
      * - I2C_MSG_READ (write is default)
@@ -205,12 +197,7 @@ typedef struct i2c_msg {
 #define I2C_DUTY_16_9           0x2           // 16/9 duty ratio
 /* Flag 0x4 is reserved; DO NOT USE. */
 #define I2C_BUS_RESET           0x8           // Perform a bus reset
-#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
 void i2c_master_enable(i2c_dev *dev, uint32 flags);
-void i2c_slave_enable(i2c_dev *dev, uint32 flags);
 
 #define I2C_ERROR_PROTOCOL      (-1)
 #define I2C_ERROR_TIMEOUT       (-2)
@@ -419,53 +406,6 @@ static inline void i2c_set_trise(i2c_dev *dev, uint32 trise) {
     dev->regs->TRISE = trise;
 }
 
-/*
- * Slave support
- */
-
-/**
- * @brief Enable Dual addressing mode to allow peripheral to have 2 addresses
- * @param dev I2C device
-  */
-static inline void i2c_slave_dual_address_enable(i2c_dev *dev) {
-    dev->regs->OAR2 |= I2C_OAR2_ENDUAL;
-}
-
-/**
- * @brief Enable General Call to allow the  unit to respond on addr 0x00
- * @param dev I2C device
-  */
-static inline void i2c_slave_general_call_enable(i2c_dev *dev) {
-    dev->regs->CR1 |= I2C_CR1_ENGC;
-}
-
-/* callback functions */
-/* Callback handler for data received over the bus */
-void i2c_slave_attach_recv_handler(i2c_dev *dev, i2c_msg *msg, i2c_slave_recv_callback_func func);
-
-/* Callback handler for data being requested over the bus
- * The callback function must call i2c_write to get the data over the bus
- */
-void i2c_slave_attach_transmit_handler(i2c_dev *dev, i2c_msg *msg, i2c_slave_transmit_callback_func func);
-
-/**
- * @brief Set the primary I2c slave address
- * @param dev I2C device
- * @param address the 8 or 10 bit i2c address
-  */
-static inline void i2c_slave_set_own_address(i2c_dev *dev, uint16 address) {
-    dev->regs->OAR1 = address <<1;
-}
-
-/**
- * @brief Set the secondary I2c slave address
- * @param dev I2C device
- * @param address the 8 or 10 bit i2c address
-  */
-static inline void i2c_slave_set_own_address2(i2c_dev *dev, uint16 address) {
-dev->regs->OAR2 = (address <<1 ) | I2C_OAR2_ENDUAL;
-}
-
 #ifdef __cplusplus
 }
 #endif
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