diff --git a/include/libopencm3/stm32/common/i2c_common_all.h b/include/libopencm3/stm32/common/i2c_common_all.h
index 9490a5a0..b12fd39a 100644
--- a/include/libopencm3/stm32/common/i2c_common_all.h
+++ b/include/libopencm3/stm32/common/i2c_common_all.h
@@ -71,6 +71,347 @@ specific memorymap.h header before including this header file.*/
#define I2C1_OAR2 I2C_OAR2(I2C1)
#define I2C2_OAR2 I2C_OAR2(I2C2)
+#ifdef STM32F3
+
+/**@{*/
+
+/* Timing register (I2Cx_TIMINGR) */
+#define I2C_TIMINGR(i2c_base) MMIO32(i2c_base + 0x10)
+#define I2C1_TIMINGR I2C_TIMINGR(I2C1)
+#define I2C2_TIMINGR I2C_TIMINGR(I2C2)
+
+/* Timeout register (I2Cx_TIMEOUTR) */
+#define I2C_TIMEOUTR(i2c_base) MMIO32(i2c_base + 0x14)
+#define I2C1_TIMEOUTR I2C_TIMEOUTR(I2C1)
+#define I2C2_TIMEOUTR I2C_TIMEOUTR(I2C2)
+
+/* Interrupt and Status register (I2Cx_ISR) */
+#define I2C_ISR(i2c_base) MMIO32(i2c_base + 0x18)
+#define I2C1_ISR I2C_ISR(I2C1)
+#define I2C2_ISR I2C_ISR(I2C2)
+
+/* Interrupt clear register (I2Cx_ICR) */
+#define I2C_ICR(i2c_base) MMIO32(i2c_base + 0x1C)
+#define I2C1_ICR I2C_ICR(I2C1)
+#define I2C2_ICR I2C_ICR(I2C2)
+
+/* PEC register (I2Cx_PECR) */
+#define I2C_PECR(i2c_base) MMIO32(i2c_base + 0x20)
+#define I2C1_PECR I2C_PECR(I2C1)
+#define I2C2_PECR I2C_PECR(I2C2)
+
+/* Receive data register (I2Cx_RXDR) */
+#define I2C_RXDR(i2c_base) MMIO32(i2c_base + 0x24)
+#define I2C1_RXDR I2C_RXDR(I2C1)
+#define I2C2_RXDR I2C_RXDR(I2C2)
+
+/* Transmit data register (I2Cx_TXDR) */
+#define I2C_TXDR(i2c_base) MMIO32(i2c_base + 0x28)
+#define I2C1_TXDR I2C_TXDR(I2C1)
+#define I2C2_TXDR I2C_TXDR(I2C2)
+
+
+/* --- I2Cx_CR1 values ----------------------------------------------------- */
+
+/* PECEN: PEC enable */
+#define I2C_CR1_PECEN (1 << 23)
+
+/* ALERTEN: SMBus alert enable */
+#define I2C_CR1_ALERTEN (1 << 22)
+
+/* SMBDEN: SMBus Device Default address enable */
+#define I2C_CR1_SMBDEN (1 << 21)
+
+/* SMBHEN: SMBus Host address enable */
+#define I2C_CR1_SMBHEN (1 << 20)
+
+/* GCEN: General call enable */
+#define I2C_CR1_GCEN (1 << 19)
+
+/* WUPEN: Wakeup from STOP enable */
+#define I2C_CR1_WUPEN (1 << 18)
+
+/* NOSTRETCH: Clock stretching disable */
+#define I2C_CR1_NOSTRETCH (1 << 17)
+
+/* SBC: Slave byte control */
+#define I2C_CR1_SBC (1 << 16)
+
+/* RXDMAEN: DMA reception requests enable */
+#define I2C_CR1_RXDMAEN (1 << 15)
+
+/* TXDMAEN: DMA transmission requests enable */
+#define I2C_CR1_TXDMAEN (1 << 14)
+
+/* ANFOFF: Analog noise filter OFF */
+#define I2C_CR1_ANFOFF (1 << 12)
+
+/* DNF[3:0]: Digital noise filter */
+#define I2C_CR1_DNF_DISABLED (0x0 << 8)
+#define I2C_CR1_DNF_UP_1_TI2CCLK (0x1 << 8)
+#define I2C_CR1_DNF_UP_2_TI2CCLK (0x2 << 8)
+#define I2C_CR1_DNF_UP_3_TI2CCLK (0x3 << 8)
+#define I2C_CR1_DNF_UP_4_TI2CCLK (0x4 << 8)
+#define I2C_CR1_DNF_UP_5_TI2CCLK (0x5 << 8)
+#define I2C_CR1_DNF_UP_6_TI2CCLK (0x6 << 8)
+#define I2C_CR1_DNF_UP_7_TI2CCLK (0x7 << 8)
+#define I2C_CR1_DNF_UP_8_TI2CCLK (0x8 << 8)
+#define I2C_CR1_DNF_UP_9_TI2CCLK (0x9 << 8)
+#define I2C_CR1_DNF_UP_10_TI2CCLK (0xA << 8)
+#define I2C_CR1_DNF_UP_11_TI2CCLK (0xB << 8)
+#define I2C_CR1_DNF_UP_12_TI2CCLK (0xC << 8)
+#define I2C_CR1_DNF_UP_13_TI2CCLK (0xD << 8)
+#define I2C_CR1_DNF_UP_14_TI2CCLK (0xE << 8)
+#define I2C_CR1_DNF_UP_15_TI2CCLK (0xF << 8)
+
+/* ERRIE: Error interrupts enable */
+#define I2C_CR1_ERRIE (1 << 7)
+
+/* TCIE: Transfer Complete interrupt enable */
+#define I2C_CR1_TCIE (1 << 6)
+
+/* STOPIE: STOP detection Interrupt enable */
+#define I2C_CR1_STOPIE (1 << 5)
+
+/* NACKIE: Not acknowledge received Interrupt enable */
+#define I2C_CR1_NACKIE (1 << 4)
+
+/* ADDRIE: Address match Interrupt enable (slave only) */
+#define I2C_CR1_DDRIE (1 << 3)
+
+/* RXIE: RX Interrupt enable */
+#define I2C_CR1_RXIE (1 << 2)
+
+/* TXIE: TX Interrupt enable */
+#define I2C_CR1_TXIE (1 << 1)
+
+/* PE: Peripheral enable */
+#define I2C_CR1_PE (1 << 0)
+
+
+/* --- I2Cx_CR2 values ----------------------------------------------------- */
+
+/* PECBYTE: Packet error checking byte */
+#define I2C_CR2_PECBYTE (1 << 26)
+
+/* AUTOEND: Automatic end mode (master mode) */
+#define I2C_CR2_AUTOEND (1 << 25)
+
+/* RELOAD: NBYTES reload mode */
+#define I2C_CR2_RELOAD (1 << 24)
+
+/* NBYTES[7:0]: Number of bytes (23,16) */
+
+/* NACK: NACK generation (slave mode) */
+#define I2C_CR2_NACK (1 << 15)
+
+/* STOP: Stop generation (master mode) */
+#define I2C_CR2_STOP (1 << 14)
+
+/* START: Start generation */
+#define I2C_CR2_START (1 << 13)
+
+/* HEAD10R: 10-bit address header only read direction (master receiver mode) */
+#define I2C_CR2_HEAD10R (1 << 12)
+
+/* ADD10: 10-bit addressing mode (master mode) */
+#define I2C_CR2_ADD10 (1 << 11)
+
+/* RD_WRN: Transfer direction (master mode) */
+#define I2C_CR2_RD_WRN (1 << 10)
+
+//preguntar
+
+/* SADD[9:8]: Slave address bit 9:8 (master mode) */
+#define I2C_CR2_SADD1_7BIT (0x0 << 8)
+#define I2C_CR2_SADD1_10BIT (0x1 << 8)
+
+/* SADD[7:1]: Slave address bit 7:1 (master mode) */
+#define I2C_CR2_SADD2_7BIT (0x0 << 1)
+#define I2C_CR2_SADD2_10BIT (0x1 << 1)
+
+/* SADD0: Slave address bit 0 (master mode) */
+#define I2C_CR2_SADD0_7BIT (0 << 0)
+#define I2C_CR2_SADD0_10BIT (1 << 0)
+
+
+/* --- I2Cx_OAR1 values ---------------------------------------------------- */
+
+/* OA1EN: Own Address 1 enable */
+#define I2C_OAR1_OA1EN_DISABLE (0x0 << 15)
+#define I2C_OAR1_OA1EN_ENABLE (0x1 <<15)
+
+/* OA1MODE Own Address 1 10-bit mode */
+#define I2C_OAR1_OA1MODE (1 << 10)
+#define I2C_OAR1_OA1MODE_7BIT 0
+#define I2C_OAR1_OA1MODE_10BIT 1
+
+//preguntar
+
+/* OA1[9:8]: Interface address */
+
+/* OA1[7:1]: Interface address */
+
+/* OA1[0]: Interface address */
+#define I2C_OAR1_OA1 (1 << 10)
+#define I2C_OAR1_OA1_7BIT 0
+#define I2C_OAR1_OA1_10BIT 1
+
+
+/* --- I2Cx_OAR2 values ---------------------------------------------------- */
+
+/* OA2EN: Own Address 2 enable */
+#define I2C_OAR2_OA2EN (1 << 15)
+
+/* OA2MSK[2:0]: Own Address 2 masks */
+#define I2C_OAR2_OA2MSK_NO_MASK (0x0 << 8)
+#define I2C_OAR2_OA2MSK_OA2_7_OA2_2 (0x1 << 8)
+#define I2C_OAR2_OA2MSK_OA2_7_OA2_3 (0x2 << 8)
+#define I2C_OAR2_OA2MSK_OA2_7_OA2_4 (0x3 << 8)
+#define I2C_OAR2_OA2MSK_OA2_7_OA2_5 (0x4 << 8)
+#define I2C_OAR2_OA2MSK_OA2_7_OA2_6 (0x5 << 8)
+#define I2C_OAR2_OA2MSK_OA2_7 (0x6 << 8)
+#define I2C_OAR2_OA2MSK_NO_CMP (0x7 << 8)
+
+/* OA2[7:1]: Interface address */
+
+
+/* --- I2Cx_TIMINGR values ---------------------------------------------------- */
+
+//Not clear yet.
+/* PRESC[3:0]: Timing prescaler (31,28) */
+
+/* SCLDEL[3:0]: Data setup time (23,20) */
+
+/* SDADEL[3:0]: Data hold time (19,16) */
+
+/* SCLH[7:0]: SCL high period (master mode) (15,8) */
+
+/* SCLL[7:0]: SCL low period (master mode) (7,0) */
+
+
+/* --- I2Cx_TIEMOUTR values ---------------------------------------------------- */
+
+/* TEXTEN: Extended clock timeout enable */
+#define I2C_TIEMOUTR_TEXTEN (1 << 31)
+
+//Not clear yet.
+/* TIMEOUTB[11:0]: Bus timeout B */
+
+/* TIMOUTEN: Clock timeout enable */
+#define I2C_TIEMOUTR_TIMOUTEN (1 << 15)
+
+/* TIDLE: Idle clock timeout detection */
+#define I2C_TIEMOUTR_TIDLE_SCL_LOW (0x0 << 12)
+#define I2C_TIEMOUTR_TIDLE_SCL_SDA_HIGH (0x1 << 12)
+
+//Not clear yet.
+/* TIMEOUTA[11:0]: Bus Timeout A */
+
+
+/* --- I2Cx_ISR values ---------------------------------------------------- */
+
+/* Bits 31:24 Reserved, must be kept at reset value */
+
+//Not clear yet.
+/* ADDCODE[6:0]: Address match code (Slave mode) */
+
+/* DIR: Transfer direction (Slave mode) */
+#define I2C_ISR_DIR_READ (0x1 << 16)
+#define I2C_ISR_DIR_WRITE (0x0 << 16)
+
+/* BUSY: Bus busy */
+#define I2C_ISR_BUSY (1 << 15)
+
+/* ALERT: SMBus alert */
+#define I2C_ISR_ALERT (1 << 13)
+
+/* TIMEOUT: Timeout or tLOW detection flag */
+#define I2C_ISR_TIMEOUT (1 << 12)
+
+/* PECERR: PEC Error in reception */
+#define I2C_ISR_PECERR (1 << 11)
+
+/* OVR: Overrun/Underrun (slave mode) */
+#define I2C_ISR_OVR (1 << 10)
+
+/* ARLO: Arbitration lost */
+#define I2C_ISR_ARLO (1 << 9)
+
+/* BERR: Bus error */
+#define I2C_ISR_BERR (1 << 8)
+
+/* TCR: Transfer Complete Reload */
+#define I2C_ISR_TCR (1 << 7)
+
+/* TC: Transfer Complete (master mode) */
+#define I2C_ISR_TC (1 << 6)
+
+/* STOPF: Stop detection flag */
+#define I2C_ISR_STOPF (1 << 5)
+
+/* NACKF: Not Acknowledge received flag */
+#define I2C_ISR_NACKF (1 << 4)
+
+/* ADDR: Address matched (slave mode) */
+#define I2C_ISR_ADDR (1 << 3)
+
+/* RXNE: Receive data register not empty (receivers) */
+#define I2C_ISR_RXNE (1 << 2)
+
+/* TXIS: Transmit interrupt status (transmitters) */
+#define I2C_ISR_TXIS (1 << 1)
+
+/* TXE: Transmit data register empty (transmitters) */
+#define I2C_ISR_TXE (1 << 0)
+
+
+/* --- I2Cx_ICR values ---------------------------------------------------- */
+
+/* ALERTCF: Alert flag clear */
+#define I2C_ICR_ALERTCF (1 << 13)
+
+/* TIMOUTCF: Timeout detection flag clear */
+#define I2C_ICR_TIMOUTCF (1 << 12)
+
+/* PECCF: PEC Error flag clear */
+#define I2C_ICR_PECCF (1 << 11)
+
+/* OVRCF: Overrun/Underrun flag clear */
+#define I2C_ICR_OVRCF (1 << 10)
+
+/* ARLOCF: Arbitration Lost flag clear */
+#define I2C_ICR_ARLOCF (1 << 9)
+
+/* BERRCF: Bus error flag clear */
+#define I2C_ICR_BERRCF (1 << 8)
+
+/* STOPCF: Stop detection flag clear */
+#define I2C_ICR_STOPCF (1 << 5)
+
+/* NACKCF: Not Acknowledge flag clear */
+#define I2C_ICR_NACKCF (1 << 4)
+
+/* ADDRCF: Address Matched flag clear */
+#define I2C_ICR_ADDRCF (1 << 3)
+
+
+/* --- I2Cx_PECR values ---------------------------------------------------- */
+
+/* PEC[7:0] Packet error checking register */
+
+
+/* --- I2Cx_RXDR values ---------------------------------------------------- */
+
+/* RXDATA[7:0] 8-bit receive data */
+
+
+/* --- I2Cx_TXDR values ---------------------------------------------------- */
+
+/* TXDATA[7:0] 8-bit transmit data */
+
+#else
+
/* Data register (I2Cx_DR) */
#define I2C_DR(i2c_base) MMIO32(i2c_base + 0x10)
#define I2C1_DR I2C_DR(I2C1)
@@ -342,6 +683,8 @@ specific memorymap.h header before including this header file.*/
* TRISE[5:0]: Maximum rise time in Fast/Standard mode (master mode)
*/
+#endif
+
/* --- I2C constant definitions -------------------------------------------- */
/****************************************************************************/
@@ -355,6 +698,17 @@ specific memorymap.h header before including this header file.*/
/* --- I2C function prototypes---------------------------------------------- */
+/* void i2c_reset(uint32_t i2c); */
+/* void i2c_peripheral_enable(uint32_t i2c); */
+/* void i2c_peripheral_disable(uint32_t i2c); */
+/* void i2c_send_start(uint32_t i2c); */
+/* void i2c_send_stop(uint32_t i2c); */
+/* void i2c_clear_stop(uint32_t i2c); */
+/* void i2c_set_own_7bit_slave_address(uint32_t i2c, uint8_t slave); */
+/* void i2c_set_own_10bit_slave_address(uint32_t i2c, uint16_t slave); */
+/* void i2c_set_clock_frequency(uint32_t i2c, uint8_t freq); */
+/* void i2c_send_data(uint32_t i2c, uint8_t data); */
+
BEGIN_DECLS
void i2c_reset(uint32_t i2c);
@@ -365,13 +719,16 @@ void i2c_send_stop(uint32_t i2c);
void i2c_clear_stop(uint32_t i2c);
void i2c_set_own_7bit_slave_address(uint32_t i2c, uint8_t slave);
void i2c_set_own_10bit_slave_address(uint32_t i2c, uint16_t slave);
+void i2c_set_clock_frequency(uint32_t i2c, uint8_t freq);
+void i2c_send_data(uint32_t i2c, uint8_t data);
+
+#ifndef STM32F3
+
void i2c_set_fast_mode(uint32_t i2c);
void i2c_set_standard_mode(uint32_t i2c);
-void i2c_set_clock_frequency(uint32_t i2c, uint8_t freq);
void i2c_set_ccr(uint32_t i2c, uint16_t freq);
void i2c_set_trise(uint32_t i2c, uint16_t trise);
void i2c_send_7bit_address(uint32_t i2c, uint8_t slave, uint8_t readwrite);
-void i2c_send_data(uint32_t i2c, uint8_t data);
uint8_t i2c_get_data(uint32_t i2c);
void i2c_enable_interrupt(uint32_t i2c, uint32_t interrupt);
void i2c_disable_interrupt(uint32_t i2c, uint32_t interrupt);
@@ -385,6 +742,8 @@ void i2c_disable_dma(uint32_t i2c);
void i2c_set_dma_last_transfer(uint32_t i2c);
void i2c_clear_dma_last_transfer(uint32_t i2c);
+#endif
+
END_DECLS
#endif
diff --git a/include/libopencm3/stm32/f3/i2c.h b/include/libopencm3/stm32/f3/i2c.h
new file mode 100644
index 00000000..8bf810c5
--- /dev/null
+++ b/include/libopencm3/stm32/f3/i2c.h
@@ -0,0 +1,38 @@
+/** @defgroup i2c_defines I2C Defines
+
+@brief Defined Constants and Types for the STM32F4xx I2C
+
+@ingroup STM32F4xx_defines
+
+@version 1.0.0
+
+@date 12 October 2012
+
+LGPL License Terms @ref lgpl_license
+ */
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see .
+ */
+
+#ifndef LIBOPENCM3_I2C_H
+#define LIBOPENCM3_I2C_H
+
+#include
+#include
+
+#endif
+
diff --git a/include/libopencm3/stm32/i2c.h b/include/libopencm3/stm32/i2c.h
index c1d07930..8e372670 100644
--- a/include/libopencm3/stm32/i2c.h
+++ b/include/libopencm3/stm32/i2c.h
@@ -21,6 +21,8 @@
# include
#elif defined(STM32F2)
# include
+#elif defined(STM32F3)
+# include
#elif defined(STM32F4)
# include
#elif defined(STM32L1)
diff --git a/include/libopencm3/stm32/rcc.h b/include/libopencm3/stm32/rcc.h
index 2f2c9f32..bbb2f394 100644
--- a/include/libopencm3/stm32/rcc.h
+++ b/include/libopencm3/stm32/rcc.h
@@ -21,6 +21,8 @@
# include
#elif defined(STM32F2)
# include
+#elif defined(STM32F3)
+# include
#elif defined(STM32F4)
# include
#elif defined(STM32L1)
diff --git a/lib/stm32/common/i2c_common_all.c b/lib/stm32/common/i2c_common_all.c
index 48b549f0..5f19e0a1 100644
--- a/lib/stm32/common/i2c_common_all.c
+++ b/lib/stm32/common/i2c_common_all.c
@@ -100,7 +100,11 @@ when the current bus activity is completed.
void i2c_send_start(uint32_t i2c)
{
+#ifdef STM32F3
+ I2C_CR2(i2c) |= I2C_CR2_START;
+#else
I2C_CR1(i2c) |= I2C_CR1_START;
+#endif
}
/*---------------------------------------------------------------------------*/
@@ -114,7 +118,11 @@ mode, or simply release the bus if in Slave mode.
void i2c_send_stop(uint32_t i2c)
{
+#ifdef STM32F3
+ I2C_CR2(i2c) |= I2C_CR2_STOP;
+#else
I2C_CR1(i2c) |= I2C_CR1_STOP;
+#endif
}
/*---------------------------------------------------------------------------*/
@@ -126,7 +134,11 @@ Clear the "Send Stop" flag in the I2C config register
*/
void i2c_clear_stop(uint32_t i2c)
{
+#ifdef STM32F3
+ I2C_CR2(i2c) &= ~I2C_CR2_STOP;
+#else
I2C_CR1(i2c) &= ~I2C_CR1_STOP;
+#endif
}
/*---------------------------------------------------------------------------*/
@@ -141,7 +153,11 @@ This sets an address for Slave mode operation, in 7 bit form.
void i2c_set_own_7bit_slave_address(uint32_t i2c, uint8_t slave)
{
I2C_OAR1(i2c) = (uint16_t)(slave << 1);
+#ifdef STM32F3
+ I2C_OAR1(i2c) &= ~I2C_OAR1_OA1MODE;
+#else
I2C_OAR1(i2c) &= ~I2C_OAR1_ADDMODE;
+#endif
I2C_OAR1(i2c) |= (1 << 14); /* Datasheet: always keep 1 by software. */
}
@@ -158,9 +174,52 @@ This sets an address for Slave mode operation, in 10 bit form.
void i2c_set_own_10bit_slave_address(uint32_t i2c, uint16_t slave)
{
+#ifdef STM32F3
+ I2C_OAR1(i2c) = (uint16_t)(I2C_OAR1_OA1MODE | slave);
+#else
I2C_OAR1(i2c) = (uint16_t)(I2C_OAR1_ADDMODE | slave);
+#endif
}
+
+/*---------------------------------------------------------------------------*/
+/** @brief I2C Set Peripheral Clock Frequency.
+
+Set the peripheral clock frequency: 2MHz to 36MHz (the APB frequency). Note
+that this is not the I2C bus clock. This is set in conjunction with
+the Clock Control register to generate the Master bus clock, see @ref
+i2c_set_ccr
+
+@param[in] i2c Unsigned int32. I2C register base address @ref i2c_reg_base.
+@param[in] freq Unsigned int8. Clock Frequency Setting @ref i2c_clock.
+*/
+
+void i2c_set_clock_frequency(uint32_t i2c, uint8_t freq)
+{
+ uint16_t reg16;
+ reg16 = I2C_CR2(i2c) & 0xffc0; /* Clear bits [5:0]. */
+ reg16 |= freq;
+ I2C_CR2(i2c) = reg16;
+}
+
+/*---------------------------------------------------------------------------*/
+/** @brief I2C Send Data.
+
+@param[in] i2c Unsigned int32. I2C register base address @ref i2c_reg_base.
+@param[in] data Unsigned int8. Byte to send.
+*/
+
+void i2c_send_data(uint32_t i2c, uint8_t data)
+{
+#if defined(STM32F3)
+ I2C_TXDR(i2c) = data;
+#else
+ I2C_DR(i2c) = data;
+#endif
+}
+
+#ifndef STM32F3
+
/*---------------------------------------------------------------------------*/
/** @brief I2C Set Fast Mode.
@@ -189,26 +248,6 @@ void i2c_set_standard_mode(uint32_t i2c)
I2C_CCR(i2c) &= ~I2C_CCR_FS;
}
-/*---------------------------------------------------------------------------*/
-/** @brief I2C Set Peripheral Clock Frequency.
-
-Set the peripheral clock frequency: 2MHz to 36MHz (the APB frequency). Note
-that this is not the I2C bus clock. This is set in conjunction with
-the Clock Control register to generate the Master bus clock, see @ref
-i2c_set_ccr
-
-@param[in] i2c Unsigned int32. I2C register base address @ref i2c_reg_base.
-@param[in] freq Unsigned int8. Clock Frequency Setting @ref i2c_clock.
-*/
-
-void i2c_set_clock_frequency(uint32_t i2c, uint8_t freq)
-{
- uint16_t reg16;
- reg16 = I2C_CR2(i2c) & 0xffc0; /* Clear bits [5:0]. */
- reg16 |= freq;
- I2C_CR2(i2c) = reg16;
-}
-
/*---------------------------------------------------------------------------*/
/** @brief I2C Set Bus Clock Frequency.
@@ -264,18 +303,6 @@ void i2c_send_7bit_address(uint32_t i2c, uint8_t slave, uint8_t readwrite)
I2C_DR(i2c) = (uint8_t)((slave << 1) | readwrite);
}
-/*---------------------------------------------------------------------------*/
-/** @brief I2C Send Data.
-
-@param[in] i2c Unsigned int32. I2C register base address @ref i2c_reg_base.
-@param[in] data Unsigned int8. Byte to send.
-*/
-
-void i2c_send_data(uint32_t i2c, uint8_t data)
-{
- I2C_DR(i2c) = data;
-}
-
/*---------------------------------------------------------------------------*/
/** @brief I2C Get Data.
@@ -409,3 +436,5 @@ void i2c_clear_dma_last_transfer(uint32_t i2c)
}
/**@}*/
+
+#endif
diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile
index 1e7c92d2..dc60cfe6 100644
--- a/lib/stm32/f3/Makefile
+++ b/lib/stm32/f3/Makefile
@@ -36,7 +36,7 @@ ARFLAGS = rcs
OBJS = rcc.o gpio.o flash.o
-OBJS += gpio_common_all.o gpio_common_f234.o
+OBJS += gpio_common_all.o gpio_common_f234.o i2c_common_all.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f3/i2c.c b/lib/stm32/f3/i2c.c
new file mode 100644
index 00000000..a22b4e51
--- /dev/null
+++ b/lib/stm32/f3/i2c.c
@@ -0,0 +1,33 @@
+/** @defgroup i2c_file I2C
+
+@ingroup STM32F3xx
+
+@brief libopencm3 STM32F3xx I2C
+
+@version 1.0.0
+
+@date 15 October 2012
+
+LGPL License Terms @ref lgpl_license
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see .
+ */
+
+#include
+#include
+