aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/include/libmaple
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2012-06-20 13:47:47 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2012-06-22 14:06:09 -0400
commitbcd28f11c2e7adfd488a10e59ed9dfad7877746d (patch)
treed48367ef93fc78c7238479c6c2ed6991c5159a95 /libmaple/include/libmaple
parent041a1c28d3ec5e99793a7afab340ae53e68ea1cf (diff)
downloadlibrambutan-bcd28f11c2e7adfd488a10e59ed9dfad7877746d.tar.gz
librambutan-bcd28f11c2e7adfd488a10e59ed9dfad7877746d.zip
I2C: Restore on F1, refactoring prep for F2.
Bring back <libmaple/i2c.h> support on STM32F1 with a view towards how it'll be implemented on STM32F2. There are still many F1-isms in libmaple/i2c.c and <libmaple/i2c.h>, to be dealt with subsequently. Move device declarations and base pointer definitions to a new F1 <series/i2c.h>. The register maps and bit definitions themselves are identical on both series, so leave them in the libmaple header. Add i2c_private.h, which contains: - I2C_DEV(), a convenience macro for defining an i2c_dev, and - declarations for the event and error IRQ handlers. The IRQ handlers are large, and I2C is slow anyway, so I see no reason to make them inline in the private header (as we do for some other peripherals). We just expose the existing ones that were formerly static in libmaple/i2c.c, but prefix the names with underscore. Move the device declarations and IRQ handlers into new stm32f1/i2c.c. These use the i2c_private.h API. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/include/libmaple')
-rw-r--r--libmaple/include/libmaple/i2c.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/libmaple/include/libmaple/i2c.h b/libmaple/include/libmaple/i2c.h
index 7ee0b9a..2b36404 100644
--- a/libmaple/include/libmaple/i2c.h
+++ b/libmaple/include/libmaple/i2c.h
@@ -37,6 +37,7 @@
extern "C" {
#endif
+#include <series/i2c.h>
#include <libmaple/libmaple_types.h>
#include <libmaple/rcc.h>
#include <libmaple/nvic.h>
@@ -97,22 +98,6 @@ typedef struct i2c_dev {
} i2c_dev;
/*
- * Devices
- */
-
-extern i2c_dev* const I2C1;
-extern i2c_dev* const I2C2;
-
-/*
- * Register map base pointers
- */
-
-/** I2C1 register map base pointer */
-#define I2C1_BASE ((struct i2c_reg_map*)0x40005400)
-/** I2C2 register map base pointer */
-#define I2C2_BASE ((struct i2c_reg_map*)0x40005800)
-
-/*
* Register bit definitions
*/