aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/include
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-06-21 18:30:50 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-06-21 18:30:50 +0000
commitb54133ab1beba9d2923450d1d5f1b2c73dc2afa3 (patch)
tree035bf75674c3919bf7c5d870b11ed6eb3ad2f597 /os/hal/include
parent30c130dc10cd5f890c2ad534b97de1ceb2182d0a (diff)
downloadChibiOS-b54133ab1beba9d2923450d1d5f1b2c73dc2afa3.tar.gz
ChibiOS-b54133ab1beba9d2923450d1d5f1b2c73dc2afa3.tar.bz2
ChibiOS-b54133ab1beba9d2923450d1d5f1b2c73dc2afa3.zip
I2C. Some fields from I2CSlaveConfig moved to driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3066 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include')
-rw-r--r--os/hal/include/i2c.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/os/hal/include/i2c.h b/os/hal/include/i2c.h
index b59644588..c46e7f096 100644
--- a/os/hal/include/i2c.h
+++ b/os/hal/include/i2c.h
@@ -143,8 +143,8 @@ struct I2CSlaveConfig{
*/
i2cerrorcallback_t id_err_callback;
- size_t txbytes; /*!< Number of bytes to transmitted. */
- size_t rxbytes; /*!< Number of bytes to received. */
+// size_t txbytes; /*!< Number of bytes to transmitted. */
+// size_t rxbytes; /*!< Number of bytes to received. */
i2cblock_t *rxbuf; /*!< Pointer to receive buffer. */
i2cblock_t *txbuf; /*!< Pointer to transmit buffer.*/
/**
@@ -157,8 +157,7 @@ struct I2CSlaveConfig{
* Bits 10-14 unused.
*/
uint16_t slave_addr;
- i2cflags_t errors; /*!< Error flags.*/
- i2cflags_t flags; /*!< State flags.*/
+
/* Status Change @p EventSource.*/
EventSource sevent;
};
@@ -241,8 +240,8 @@ extern "C" {
void i2cObjectInit(I2CDriver *i2cp);
void i2cStart(I2CDriver *i2cp, const I2CConfig *config);
void i2cStop(I2CDriver *i2cp);
- void i2cMasterTransmit(I2CDriver *i2cp, I2CSlaveConfig *i2cscfg);
- void i2cMasterReceive(I2CDriver *i2cp, I2CSlaveConfig *i2cscfg);
+ void i2cMasterTransmit(I2CDriver *i2cp, I2CSlaveConfig *i2cscfg, size_t txbytes, size_t rxbytes);
+ void i2cMasterReceive(I2CDriver *i2cp, I2CSlaveConfig *i2cscfg, size_t rxbytes);
void i2cMasterStart(I2CDriver *i2cp);
void i2cMasterStop(I2CDriver *i2cp);
void i2cAddFlagsI(I2CDriver *i2cp, i2cflags_t mask);