projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer: change timer_delayTicks() to use generic events
[bertos.git]
/
bertos
/
cpu
/
cortex-m3
/
io
/
stm32_i2c.h
diff --git
a/bertos/cpu/cortex-m3/io/stm32_i2c.h
b/bertos/cpu/cortex-m3/io/stm32_i2c.h
index 0ac306947c8f3346d8a76f4009b2b9e413f0935a..a7e375fb7df70599186a3481ee7aac8a2719612b 100644
(file)
--- a/
bertos/cpu/cortex-m3/io/stm32_i2c.h
+++ b/
bertos/cpu/cortex-m3/io/stm32_i2c.h
@@
-239,9
+239,19
@@
/* I2C CCR mask */
#define CCR_CCR_SET ((uint16_t)0x0FFF)
/* I2C CCR mask */
#define CCR_CCR_SET ((uint16_t)0x0FFF)
+
+/* I2C CR1 */
+#define CR1_POS_SET ((uint16_t)0x800)
+#define CR1_POS_RESET (~CR1_POS_SET)
+
/* I2C Status */
/* I2C Status */
+#define SR1_PECERR 12
+#define SR1_OVR 11
+#define SR1_AF 10
+#define SR1_ARLO 9
+#define SR1_BERR 8
#define SR1_TXE 7
#define SR1_TXE 7
-#define SR1_RX
E
6
+#define SR1_RX
NE
6
#define SR1_ADDR 1
#define SR1_BTF 2
#define SR1_SB 0
#define SR1_ADDR 1
#define SR1_BTF 2
#define SR1_SB 0
@@
-251,7
+261,11
@@
#define SR2_MSL 0
#define SR2_MSL 0
-
+#define SR1_ERR_MASK (BV(SR1_PECERR) | \
+ BV(SR1_OVR) | \
+ BV(SR1_AF) | \
+ BV(SR1_ARLO) | \
+ BV(SR1_BERR))
struct stm32_i2c
{
struct stm32_i2c
{