diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-07-19 20:45:57 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-07-19 20:45:57 +0000 |
| commit | b569145b24a59d0741a26885767efa04146f78a5 (patch) | |
| tree | 0a0b28c584bef6703c71db57efdcbe0d282f9d78 /os/hal/src/i2c.c | |
| parent | e02d3607dc1dc88966a78cefc7aadb5eba941908 (diff) | |
| download | ChibiOS-b569145b24a59d0741a26885767efa04146f78a5.tar.gz ChibiOS-b569145b24a59d0741a26885767efa04146f78a5.tar.bz2 ChibiOS-b569145b24a59d0741a26885767efa04146f78a5.zip | |
I2C. STOP waitings was replaced by GPT callback functions. Need much of testing.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3166 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/src/i2c.c')
| -rw-r--r-- | os/hal/src/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os/hal/src/i2c.c b/os/hal/src/i2c.c index b169fb70d..b233764f5 100644 --- a/os/hal/src/i2c.c +++ b/os/hal/src/i2c.c @@ -176,7 +176,7 @@ void i2cMasterTransmit(I2CDriver *i2cp, chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterTransmit(), #1", "not ready");
- i2cp->id_state = I2C_ACTIVE;
+ i2cp->id_state = I2C_ACTIVE_TRANSMIT;
i2c_lld_master_transmit(i2cp, slave_addr, txbuf, txbytes, rxbuf, rxbytes);
_i2c_wait_s(i2cp);
}
@@ -214,7 +214,7 @@ void i2cMasterReceive(I2CDriver *i2cp, chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterReceive(), #1", "not ready");
- i2cp->id_state = I2C_ACTIVE;
+ i2cp->id_state = I2C_ACTIVE_RECEIVE;
i2c_lld_master_receive(i2cp, slave_addr, rxbuf, rxbytes);
_i2c_wait_s(i2cp);
}
|