diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-09-07 16:08:34 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-09-07 23:34:23 -0400 |
| commit | d91cadb11a9fcf046e80ba398812ee3f285158c0 (patch) | |
| tree | 3078936a35a22a204dfa127df909084662ac8d71 /libmaple/i2c.c | |
| parent | d2575d27e944905626f36f926a13a40d4832373e (diff) | |
| download | librambutan-d91cadb11a9fcf046e80ba398812ee3f285158c0.tar.gz librambutan-d91cadb11a9fcf046e80ba398812ee3f285158c0.zip | |
Update outdated stm32.h usages.
stm32.h has been updated to prefix its definitions. Update the rest
of libmaple to take this into account.
Diffstat (limited to 'libmaple/i2c.c')
| -rw-r--r-- | libmaple/i2c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmaple/i2c.c b/libmaple/i2c.c index 8f6967b..e3f3199 100644 --- a/libmaple/i2c.c +++ b/libmaple/i2c.c @@ -393,7 +393,7 @@ void i2c_init(i2c_dev *dev) { * I2C_REMAP: Remap I2C1 to SCL/PB8 SDA/PB9. */ void i2c_master_enable(i2c_dev *dev, uint32 flags) { -#define I2C_CLK (PCLK1/1000000) +#define I2C_CLK (STM32_PCLK1/1000000) uint32 ccr = 0; uint32 trise = 0; @@ -425,16 +425,16 @@ void i2c_master_enable(i2c_dev *dev, uint32 flags) { if (flags & I2C_DUTY_16_9) { /* Tlow/Thigh = 16/9 */ ccr |= I2C_CCR_DUTY; - ccr |= PCLK1/(400000 * 25); + ccr |= STM32_PCLK1/(400000 * 25); } else { /* Tlow/Thigh = 2 */ - ccr |= PCLK1/(400000 * 3); + ccr |= STM32_PCLK1/(400000 * 3); } trise = (300 * (I2C_CLK)/1000) + 1; } else { /* Tlow/Thigh = 1 */ - ccr = PCLK1/(100000 * 2); + ccr = STM32_PCLK1/(100000 * 2); trise = I2C_CLK + 1; } |